Introduce Dolby Vision video codec and Demuxer support

media/formats/mp4/avc.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_AVC_H_
 #define MEDIA_FORMATS_MP4_AVC_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 13 matching lines @@
 
 class MEDIA_EXPORT AVC {
  public:
   static bool ConvertFrameToAnnexB(int length_size,
                                    std::vector<uint8_t>* buffer,
                                    std::vector<SubsampleEntry>* subsamples);
 
   // Inserts the SPS & PPS data from |avc_config| into |buffer|.
   // |buffer| is expected to contain AnnexB conformant data.
   // |subsamples| contains the SubsampleEntry info if |buffer| contains
   // encrypted data.

[wolenetz, 2017/01/25 23:42:41]

Please add comment for what |annexb_validation| means.

[erickung1, 2017/02/03 18:18:31]

Done.

   // Returns true if the param sets were successfully inserted.
   static bool InsertParamSetsAnnexB(
       const AVCDecoderConfigurationRecord& avc_config,
       std::vector<uint8_t>* buffer,
-      std::vector<SubsampleEntry>* subsamples);
+      std::vector<SubsampleEntry>* subsamples,
+      bool annexb_validation);
 
   static bool ConvertConfigToAnnexB(
       const AVCDecoderConfigurationRecord& avc_config,
       std::vector<uint8_t>* buffer);
 
   // Verifies that the contents of |buffer| conform to
   // Section 7.4.1.2.3 of ISO/IEC 14496-10.
   // |subsamples| contains the information about what parts of the buffer are
   // encrypted and which parts are clear.
   // Returns true if |buffer| contains conformant Annex B data
@@ skipping 13 matching lines @@
 };
 
 // AVCBitstreamConverter converts AVC/H.264 bitstream from MP4 container format
 // with embedded NALU lengths into AnnexB bitstream format (described in ISO/IEC
 // 14496-10) with 4-byte start codes. It also knows how to handle CENC-encrypted
 // streams and adjusts subsample data for those streams while converting.
 class AVCBitstreamConverter : public BitstreamConverter {
  public:
   explicit AVCBitstreamConverter(
       std::unique_ptr<AVCDecoderConfigurationRecord> avc_config);
+  void DisablePostAnnexbValidation() { post_annexb_validation_ = false; }

[wolenetz, 2017/01/25 23:42:41]

Please add comment describing the effect of this new method.

[erickung1, 2017/02/03 18:18:31]

Done.

 
   // BitstreamConverter interface
   bool ConvertFrame(std::vector<uint8_t>* frame_buf,
                     bool is_keyframe,
                     std::vector<SubsampleEntry>* subsamples) const override;
 
  private:
   ~AVCBitstreamConverter() override;
   std::unique_ptr<AVCDecoderConfigurationRecord> avc_config_;
+  bool post_annexb_validation_;

[wolenetz, 2017/01/25 23:42:41]

Please add comment describing this new field.

[erickung1, 2017/02/03 18:18:31]

Done.

 };
 
 }  // namespace mp4
 }  // namespace media
 
 #endif  // MEDIA_FORMATS_MP4_AVC_H_