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 ab45de801fe46c4f7025a563d8be68849c31977c..d5ea7fd6bed7ec2927d6ae7035acd673d2102471 100644
--- a/media/formats/mp2t/es_parser_adts.h
+++ b/media/formats/mp2t/es_parser_adts.h
@@ -16,8 +16,10 @@
 #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"
+#include "media/media_features.h"
 
 namespace media {
 class AudioTimestampHelper;
@@ -36,6 +38,14 @@ class MEDIA_EXPORT EsParserAdts : public EsParser {
   EsParserAdts(const NewAudioConfigCB& new_audio_config_cb,
                const EmitBufferCB& emit_buffer_cb,
                bool sbr_in_mimetype);
+#if BUILDFLAG(ENABLE_HLS_SAMPLE_AES)
+  EsParserAdts(const NewAudioConfigCB& new_audio_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]

nit: suggest putting this first since it controls the use of the cb_, right?

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

Done.

+               bool sbr_in_mimetype);

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

I think the order should be consistent between the overloads. Thus, this should
come before the two new parameters.

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

Done.

+#endif
+
   ~EsParserAdts() override;
 
   // EsParser implementation.
@@ -63,11 +73,21 @@ class MEDIA_EXPORT EsParserAdts : public EsParser {
   // a supported ADTS audio config.
   bool UpdateAudioConfiguration(const uint8_t* adts_header);
 
+#if BUILDFLAG(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_;
+#if BUILDFLAG(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_;

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

ditto on ordering

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

Done.

+#endif
 
   // True when AAC SBR extension is signalled in the mimetype
   // (mp4a.40.5 in the codecs parameter).