Change H264AnnexBBitstreamConverter to use AVCDecoderConfigurationRecord.

media/formats/mp4/box_definitions.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/formats/mp4/box_definitions.h"
 
 #include "base/logging.h"
 #include "media/formats/mp4/es_descriptor.h"
 #include "media/formats/mp4/rcheck.h"
 
@@ skipping 331 matching lines @@
     : version(0),
       profile_indication(0),
       profile_compatibility(0),
       avc_level(0),
       length_size(0) {}
 
 AVCDecoderConfigurationRecord::~AVCDecoderConfigurationRecord() {}
 FourCC AVCDecoderConfigurationRecord::BoxType() const { return FOURCC_AVCC; }
 
 bool AVCDecoderConfigurationRecord::Parse(BoxReader* reader) {
+  return ParseInternal(reader);
+}
+
+bool AVCDecoderConfigurationRecord::Parse(const uint8* data, int data_size) {
+  DCHECK(data);

[scherkus (not reviewing), 2014/05/05 18:22:17]

you DCHECK here but BufferReader CHECK()s

remove?

[acolwell GONE FROM CHROMIUM, 2014/05/05 18:49:02]

Done.

+  DCHECK_GE(data_size, 0);
+
+  BufferReader reader(data, data_size);
+  return ParseInternal(&reader);
+}
+
+bool AVCDecoderConfigurationRecord::ParseInternal(BufferReader* reader) {
   RCHECK(reader->Read1(&version) && version == 1 &&
          reader->Read1(&profile_indication) &&
          reader->Read1(&profile_compatibility) &&
          reader->Read1(&avc_level));
 
   uint8 length_size_minus_one;
   RCHECK(reader->Read1(&length_size_minus_one) &&
          (length_size_minus_one & 0xfc) == 0xfc);
   length_size = (length_size_minus_one & 0x3) + 1;
 
+  RCHECK(length_size != 3); // Only values of 1, 2, and 4 are valid.
+
   uint8 num_sps;
   RCHECK(reader->Read1(&num_sps) && (num_sps & 0xe0) == 0xe0);
   num_sps &= 0x1f;
 
   sps_list.resize(num_sps);
   for (int i = 0; i < num_sps; i++) {
     uint16 sps_length;
     RCHECK(reader->Read2(&sps_length) &&
            reader->ReadVec(&sps_list[i], sps_length));
   }
@@ skipping 442 matching lines @@
 SampleDependsOn IndependentAndDisposableSamples::sample_depends_on(
     size_t i) const {
   if (i >= sample_depends_on_.size())
     return kSampleDependsOnUnknown;
 
   return sample_depends_on_[i];
 }
 
 }  // namespace mp4
 }  // namespace media