Support HLS MPEG2 TS with SAMPLE-AES encryption.

media/formats/mp2t/es_parser_adts.h

Index: media/formats/mp2t/es_parser_adts.h
diff --git a/media/formats/mp2t/es_parser_adts.h b/media/formats/mp2t/es_parser_adts.h
index 740e3ba66c2566d7d94c193a84a9b2179f1e84d8..09ec8b2d6a2a8ebb62b52f55cba217f96ba0df98 100644
--- a/media/formats/mp2t/es_parser_adts.h
+++ b/media/formats/mp2t/es_parser_adts.h
@@ -13,6 +13,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "media/base/audio_decoder_config.h"
+#include "media/base/decrypt_config.h"
 #include "media/base/media_export.h"
 #include "media/formats/mp2t/es_parser.h"
 
@@ -33,6 +34,14 @@ class MEDIA_EXPORT EsParserAdts : public EsParser {
   EsParserAdts(const NewAudioConfigCB& new_audio_config_cb,
                const EmitBufferCB& emit_buffer_cb,
                bool sbr_in_mimetype);
+#ifdef ENABLE_HLS_SAMPLE_AES
+  EsParserAdts(const NewAudioConfigCB& new_audio_config_cb,
+               const EmitBufferCB& emit_buffer_cb,
+               const GetDecryptConfigCB get_decrypt_config_cb,

[yucliu1, 2015/12/11 19:55:31]

const GetDecryptConfigCB&

[dougsteed, 2015/12/14 22:51:46]

Done.

+               bool use_hls_sample_aes,
+               bool sbr_in_mimetype);
+#endif
+
   ~EsParserAdts() override;
 
   // EsParser implementation.
@@ -60,11 +69,21 @@ class MEDIA_EXPORT EsParserAdts : public EsParser {
   // a supported ADTS audio config.
   bool UpdateAudioConfiguration(const uint8* adts_header);
 
+#ifdef ENABLE_HLS_SAMPLE_AES
+  void CalculateSubsamplesForAdtsFrame(const AdtsFrame& adts_frame,
+                                       std::vector<SubsampleEntry>* subsamples);
+#endif
+
   // Callbacks:
   // - to signal a new audio configuration,
   // - to send ES buffers.
   NewAudioConfigCB new_audio_config_cb_;
   EmitBufferCB emit_buffer_cb_;
+#ifdef ENABLE_HLS_SAMPLE_AES
+  // - to obtain the current decrypt_config. Only called if use_hls_sample_aes_.
+  GetDecryptConfigCB get_decrypt_config_cb_;
+  bool use_hls_sample_aes_;
+#endif
 
   // True when AAC SBR extension is signalled in the mimetype
   // (mp4a.40.5 in the codecs parameter).