Support HLS MPEG2 TS with SAMPLE-AES encryption.

media/formats/mp2t/es_parser_adts.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_ADTS_H_
 #define MEDIA_FORMATS_MP2T_ES_PARSER_ADTS_H_
 
 #include <stdint.h>
 
 #include <list>
 #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/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;
 class BitReader;
 class OffsetByteQueue;
 class StreamParserBuffer;
 }
 
 namespace media {
 namespace mp2t {
 
 class MEDIA_EXPORT EsParserAdts : public EsParser {
  public:
   typedef base::Callback<void(const AudioDecoderConfig&)> NewAudioConfigCB;
 
   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.
   void Flush() override;
 
  private:
   struct AdtsFrame;
 
   // EsParser implementation.
   bool ParseFromEsQueue() override;
   void ResetInternal() override;
 
   // Synchronize the stream on an ADTS syncword (consuming bytes from
   // |es_queue_| if needed).
   // Returns true when a full ADTS frame has been found: in that case
   // |adts_frame| structure is filled up accordingly.
   // Returns false otherwise (no ADTS syncword found or partial ADTS frame).
   bool LookForAdtsFrame(AdtsFrame* adts_frame);
 
   // Skip an ADTS frame in the ES queue.
   void SkipAdtsFrame(const AdtsFrame& adts_frame);
 
   // Signal any audio configuration change (if any).
   // Return false if the current audio config is not
   // 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).
   bool sbr_in_mimetype_;
 
   // Interpolated PTS for frames that don't have one.
   scoped_ptr<AudioTimestampHelper> audio_timestamp_helper_;
 
   // Last audio config.
   AudioDecoderConfig last_audio_decoder_config_;
 
   DISALLOW_COPY_AND_ASSIGN(EsParserAdts);
 };
 
 }  // namespace mp2t
 }  // namespace media
 
 #endif