Implemented HEVC video demuxing and parsing

media/formats/mp4/box_definitions.h

 // 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.
 
 #ifndef MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_
 #define MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "media/base/media_export.h"
 #include "media/base/media_log.h"
+#include "media/base/video_decoder_config.h"

[ddorwin, 2015/09/08 18:55:44]

Is this necessary?

[servolk, 2015/09/08 19:22:02]

Yes, this is necessary, since media::VideoCodec and media::VideoCodecProfile
enums are defined in that header and we now have those in VideoSampleEntry box.

[ddorwin, 2015/09/08 19:54:36]

Hmm. We should consider extracting those into a video_codecs.h file, especially
if they are similarly used where we don't need the actual config. (The first
step would be to start a thread.)

[servolk, 2015/09/08 20:27:25]

Ok, I'll do that in a follow up CL.

 #include "media/formats/mp4/aac.h"
 #include "media/formats/mp4/avc.h"
 #include "media/formats/mp4/box_reader.h"
 #include "media/formats/mp4/fourccs.h"
 
 namespace media {
 namespace mp4 {
 
 enum TrackType {
   kInvalid = 0,
@@ skipping 157 matching lines @@
   typedef std::vector<uint8> PPS;
 
   std::vector<SPS> sps_list;
   std::vector<PPS> pps_list;
 
  private:
   bool ParseInternal(BufferReader* reader,
                      const scoped_refptr<MediaLog>& media_log);
 };
 
+#if defined(ENABLE_HEVC_DEMUXING)
+struct MEDIA_EXPORT HEVCDecoderConfigurationRecord : Box {

[ddorwin, 2015/09/08 18:55:44]

Can we put this in an HEVC-specific file? It's not actually used here.

Can it just be in the .cc file? As we have discussed, not using the #ifdef in
header files is preferred.

[servolk, 2015/09/08 19:22:02]

Yeah, I was pondering which path to take - put this in here, to ensure all
supported mp4 boxes are defined in the same .h/.cc files, or put it into
hevc.h/.cc to ensure all HEVC-related code is grouped together. I've put it into
hevc.h/.cc files now, in the latest patchset. I'll rerun the trybots to make
sure this works everywhere.

+  DECLARE_BOX_METHODS(HEVCDecoderConfigurationRecord);
+
+  // Parses HEVCDecoderConfigurationRecord data encoded in |data|.
+  // Note: This method is intended to parse data outside the MP4StreamParser
+  //       context and therefore the box header is not expected to be present
+  //       in |data|.
+  // Returns true if |data| was successfully parsed.
+  bool Parse(const uint8* data, int data_size);
+
+  uint8 configurationVersion;
+  uint8 general_profile_space;
+  uint8 general_tier_flag;
+  uint8 general_profile_idc;
+  uint32 general_profile_compatibility_flags;
+  uint64 general_constraint_indicator_flags;
+  uint8 general_level_idc;
+  uint16 min_spatial_segmentation_idc;
+  uint8 parallelismType;
+  uint8 chromaFormat;
+  uint8 bitDepthLumaMinus8;
+  uint8 bitDepthChromaMinus8;
+  uint16 avgFrameRate;
+  uint8 constantFrameRate;
+  uint8 numTemporalLayers;
+  uint8 temporalIdNested;
+  uint8 lengthSizeMinusOne;
+  uint8 numOfArrays;
+
+  typedef std::vector<uint8> HVCCNALUnit;
+  struct HVCCNALArray {
+    HVCCNALArray();
+    ~HVCCNALArray();
+    uint8 first_byte;
+    std::vector<HVCCNALUnit> units;
+  };
+  std::vector<HVCCNALArray> arrays;
+
+ private:
+  bool ParseInternal(BufferReader* reader,
+                     const scoped_refptr<MediaLog>& media_log);
+};
+#endif
+
 struct MEDIA_EXPORT PixelAspectRatioBox : Box {
   DECLARE_BOX_METHODS(PixelAspectRatioBox);
 
   uint32 h_spacing;
   uint32 v_spacing;
 };
 
 struct MEDIA_EXPORT VideoSampleEntry : Box {
   DECLARE_BOX_METHODS(VideoSampleEntry);
 
   FourCC format;
   uint16 data_reference_index;
   uint16 width;
   uint16 height;
 
   PixelAspectRatioBox pixel_aspect;
   ProtectionSchemeInfo sinf;
 
+  VideoCodec video_codec;
+  VideoCodecProfile video_codec_profile;
+
   bool IsFormatValid() const;
 
   scoped_refptr<BitstreamConverter> frame_bitstream_converter;
 };
 
 struct MEDIA_EXPORT ElementaryStreamDescriptor : Box {
   DECLARE_BOX_METHODS(ElementaryStreamDescriptor);
 
   uint8 object_type;
   AAC aac;
@@ skipping 208 matching lines @@
   std::vector<TrackFragment> tracks;
   std::vector<ProtectionSystemSpecificHeader> pssh;
 };
 
 #undef DECLARE_BOX
 
 }  // namespace mp4
 }  // namespace media
 
 #endif  // MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_