Parse VPCodecConfiguration and extract VP9 profile

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 <memory>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 547 matching lines @@
   pps_list.resize(num_pps);
   for (int i = 0; i < num_pps; i++) {
     uint16_t pps_length;
     RCHECK(reader->Read2(&pps_length) &&
            reader->ReadVec(&pps_list[i], pps_length));
   }
 
   return true;
 }
 
+VPCodecConfigurationRecord::VPCodecConfigurationRecord()
+    : profile(VIDEO_CODEC_PROFILE_UNKNOWN) {}
+
+VPCodecConfigurationRecord::VPCodecConfigurationRecord(

[tinskip, 2016/06/06 20:13:34]

If using the default copy constructor, why bother making this explicit?

[kqyang, 2016/06/06 20:30:18]

The box methods are declared using macro:
https://cs.chromium.org/chromium/src/media/formats/mp4/box_definitions.h?rcl=...

The copy constructor needs to be explicitly implemented.

+    const VPCodecConfigurationRecord& other) = default;
+
+VPCodecConfigurationRecord::~VPCodecConfigurationRecord() {}
+
+FourCC VPCodecConfigurationRecord::BoxType() const {
+  return FOURCC_VPCC;
+}
+
+bool VPCodecConfigurationRecord::Parse(BoxReader* reader) {
+  uint8_t profile_indication = 0;
+  RCHECK(reader->ReadFullBoxHeader() && reader->Read1(&profile_indication));
+  // The remaining fields are not parsed as we don't care about them for now.
+
+  RCHECK(profile_indication < 4);

[tinskip, 2016/06/06 20:13:34]

There are, and will only be 2 VP9 profiles: 0 and 2.

[kqyang, 2016/06/06 20:30:18]

There are actually four profiles: https://en.wikipedia.org/wiki/VP9#Profiles

Also see
https://storage.googleapis.com/downloads.webmproject.org/docs/vp9/vp9-bitstre...
7.2 Uncompressed header semantics

+  switch (profile_indication) {
+    case 0:
+      profile = VP9PROFILE_PROFILE0;
+      break;
+    case 1:
+      profile = VP9PROFILE_PROFILE1;
+      break;
+    case 2:
+      profile = VP9PROFILE_PROFILE2;
+      break;
+    case 3:
+      profile = VP9PROFILE_PROFILE3;
+      break;
+  }

[ddorwin, 2016/06/14 18:58:22]

maybe DVLOG(WARNING) all other cases.

[kqyang, 2016/06/14 21:02:32]

Removed line 585 and add a default case here.

+  return true;
+}
+
 PixelAspectRatioBox::PixelAspectRatioBox() : h_spacing(1), v_spacing(1) {}
 PixelAspectRatioBox::PixelAspectRatioBox(const PixelAspectRatioBox& other) =
     default;
 PixelAspectRatioBox::~PixelAspectRatioBox() {}
 FourCC PixelAspectRatioBox::BoxType() const { return FOURCC_PASP; }
 
 bool PixelAspectRatioBox::Parse(BoxReader* reader) {
   RCHECK(reader->Read4(&h_spacing) &&
          reader->Read4(&v_spacing));
   return true;
@@ skipping 61 matching lines @@
       std::unique_ptr<HEVCDecoderConfigurationRecord> hevcConfig(
           new HEVCDecoderConfigurationRecord());
       RCHECK(reader->ReadChild(hevcConfig.get()));
       frame_bitstream_converter =
           make_scoped_refptr(new HEVCBitstreamConverter(std::move(hevcConfig)));
       video_codec = kCodecHEVC;
       break;
     }
 #endif
 #if BUILDFLAG(ENABLE_MP4_VP9_DEMUXING)
-    case FOURCC_VP09:
+    case FOURCC_VP09: {
       frame_bitstream_converter = NULL;
       video_codec = kCodecVP9;
-      // TODO(kqyang): Read VPCodecConfiguration and extract profile
-      // (crbug.com/604863).
+
+      DVLOG(2) << __FUNCTION__ << " parsing VPCodecConfigurationRecord (vpcC)";

[ddorwin, 2016/06/14 18:58:22]

nit: Log at the top of the block for consistency.

[kqyang, 2016/06/14 21:02:32]

Done.

+      std::unique_ptr<VPCodecConfigurationRecord> vp_config(
+          new VPCodecConfigurationRecord());
+      RCHECK(reader->ReadChild(vp_config.get()));
+      video_codec_profile = vp_config->profile;
       break;
+    }
 #endif
     default:
       // Unknown/unsupported format
       MEDIA_LOG(ERROR, reader->media_log()) << __FUNCTION__
                                             << " unsupported video format "
                                             << FourCCToString(actual_format);
       return false;
   }
 
   return true;
@@ skipping 559 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