| Index: media/media.gyp
|
| diff --git a/media/media.gyp b/media/media.gyp
|
| index 8c14c59344044d192440b860ba10996e5536e6aa..d907794cee4d8c4d36436c53232f20ae6da1c2d9 100644
|
| --- a/media/media.gyp
|
| +++ b/media/media.gyp
|
| @@ -46,6 +46,11 @@
|
| 'enable_hevc_demuxing%': 0,
|
| 'enable_mse_mpeg2ts_stream_parser%': 0,
|
| }],
|
| + ['proprietary_codecs==1 and is_cast_desktop_build==1', {
|
| + 'enable_hls_sample_aes%': 1,
|
| + }, {
|
| + 'enable_hls_sample_aes%': 0,
|
| + }],
|
| ],
|
| },
|
| 'includes': [
|
| @@ -66,6 +71,7 @@
|
| "ENABLE_HEVC_DEMUXING=<(enable_hevc_demuxing)",
|
| "ENABLE_MSE_MPEG2TS_STREAM_PARSER=<(enable_mse_mpeg2ts_stream_parser)",
|
| "ENABLE_MP4_VP9_DEMUXING=0",
|
| + "ENABLE_HLS_SAMPLE_AES=<(enable_hls_sample_aes)",
|
| ],
|
| },
|
| },
|
| @@ -1020,6 +1026,8 @@
|
| }],
|
| ['proprietary_codecs==1 and enable_mse_mpeg2ts_stream_parser==1', {
|
| 'sources': [
|
| + 'formats/mp2t/descriptors.cc',
|
| + 'formats/mp2t/descriptors.h',
|
| 'formats/mp2t/es_adapter_video.cc',
|
| 'formats/mp2t/es_adapter_video.h',
|
| 'formats/mp2t/es_parser.cc',
|
| @@ -1062,6 +1070,16 @@
|
| 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.h',
|
| ],
|
| }],
|
| + ['proprietary_codecs==1 and enable_hls_sample_aes==1', {
|
| + 'sources': [
|
| + 'formats/mp2t/ts_section_cat.cc',
|
| + 'formats/mp2t/ts_section_cat.h',
|
| + 'formats/mp2t/ts_section_cets_ecm.cc',
|
| + 'formats/mp2t/ts_section_cets_ecm.h',
|
| + 'formats/mp2t/ts_section_cets_pssh.cc',
|
| + 'formats/mp2t/ts_section_cets_pssh.h',
|
| + ],
|
| + }],
|
| ['target_arch=="ia32" or target_arch=="x64"', {
|
| 'dependencies': [
|
| 'media_asm',
|
| @@ -1138,6 +1156,7 @@
|
| '../skia/skia.gyp:skia',
|
| '../testing/gmock.gyp:gmock',
|
| '../testing/gtest.gyp:gtest',
|
| + '../third_party/boringssl/boringssl.gyp:boringssl',
|
| '../third_party/libwebm/libwebm.gyp:libwebm',
|
| '../third_party/libyuv/libyuv.gyp:libyuv',
|
| '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
|
|
|