| Index: media/formats/mp2t/es_parser_h264.h
|
| diff --git a/media/formats/mp2t/es_parser_h264.h b/media/formats/mp2t/es_parser_h264.h
|
| index 184ac0798fb428e6d4fdc9b2deb0042495a0fea8..646a8071b6cc7ea17152a1894af4cb9166aecf6e 100644
|
| --- a/media/formats/mp2t/es_parser_h264.h
|
| +++ b/media/formats/mp2t/es_parser_h264.h
|
| @@ -15,9 +15,11 @@
|
| #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;
|
| @@ -44,6 +46,12 @@ class MEDIA_EXPORT EsParserH264 : public EsParser {
|
|
|
| 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);
|
| +#endif
|
| ~EsParserH264() override;
|
|
|
| // EsParser implementation.
|
| @@ -81,6 +89,13 @@ class MEDIA_EXPORT EsParserH264 : public EsParser {
|
| 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_;
|
|
|