Support HLS MPEG2 TS with SAMPLE-AES encryption.

media/formats/mp2t/es_parser_h264.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_MP2T_ES_PARSER_H264_H_
 #define MEDIA_FORMATS_MP2T_ES_PARSER_H264_H_
 
 #include <stdint.h>
 
 #include <utility>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "media/base/media_export.h"
+#include "media/base/ranges.h"
 #include "media/base/video_decoder_config.h"
 #include "media/formats/mp2t/es_adapter_video.h"
 #include "media/formats/mp2t/es_parser.h"
+#include "media/media_features.h"
 
 namespace media {
 class EncryptionScheme;
 class H264Parser;
 struct H264SPS;
 class OffsetByteQueue;
 }
 
 namespace media {
 namespace mp2t {
 
 // A few remarks:
 // - In this h264 parser, frame splitting is based on AUD nals.
 // Mpeg2 TS spec: "2.14 Carriage of Rec. ITU-T H.264 | ISO/IEC 14496-10 video"
 // "Each AVC access unit shall contain an access unit delimiter NAL Unit;"
 // - PES packets do not necessarily map to an H264 access unit although the HLS
 // recommendation is to use one PES for each access unit. In this parser,
 // we handle the general case and do not make any assumption about the access
 // unit organization within PES packets.
 //
 class MEDIA_EXPORT EsParserH264 : public EsParser {
  public:
   typedef base::Callback<void(const VideoDecoderConfig&)> NewVideoConfigCB;
 
   EsParserH264(const NewVideoConfigCB& new_video_config_cb,
                const EmitBufferCB& emit_buffer_cb);
+#if BUILDFLAG(ENABLE_HLS_SAMPLE_AES)
+  EsParserH264(const NewVideoConfigCB& new_video_config_cb,
+               const EmitBufferCB& emit_buffer_cb,
+               const GetDecryptConfigCB& get_decrypt_config_cb,
+               bool use_hls_sample_aes);

[ddorwin, 2016/04/12 00:40:47]

ditto on ordering

[dougsteed, 2016/05/08 23:18:44]

Done.

+#endif
   ~EsParserH264() override;
 
   // EsParser implementation.
   void Flush() override;
 
  private:
   // EsParser implementation.
   bool ParseFromEsQueue() override;
   void ResetInternal() override;
 
@@ skipping 17 matching lines @@
                                 const EncryptionScheme& scheme);
 
   EsAdapterVideo es_adapter_;
 
   // H264 parser state.
   // - |current_access_unit_pos_| is pointing to an annexB syncword
   // representing the first NALU of an H264 access unit.
   scoped_ptr<H264Parser> h264_parser_;
   int64_t current_access_unit_pos_;
   int64_t next_access_unit_pos_;
+#if BUILDFLAG(ENABLE_HLS_SAMPLE_AES)
+  Ranges<int> protected_blocks_;
+  // Callback to obtain the current decrypt_config.
+  // Only called if use_hls_sample_aes_ is true.
+  GetDecryptConfigCB get_decrypt_config_cb_;
+  bool use_hls_sample_aes_;
+#endif
 
   // Last video decoder config.
   VideoDecoderConfig last_video_decoder_config_;
 
   DISALLOW_COPY_AND_ASSIGN(EsParserH264);
 };
 
 }  // namespace mp2t
 }  // namespace media
 
 #endif