Index: media/media.gyp |
diff --git a/media/media.gyp b/media/media.gyp |
index 4d826dcaa9053eb0709de33caa40ca87d483ed8d..740e47b4e7aa85e9f72c14fd99644b153c1c0417 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': [ |
@@ -64,6 +69,7 @@ |
"ENABLE_AC3_EAC3_AUDIO_DEMUXING=<(enable_ac3_eac3_audio_demuxing)", |
"ENABLE_HEVC_DEMUXING=<(enable_hevc_demuxing)", |
"ENABLE_MSE_MPEG2TS_STREAM_PARSER=<(enable_mse_mpeg2ts_stream_parser)", |
+ "ENABLE_HLS_SAMPLE_AES=<(enable_hls_sample_aes)", |
], |
}, |
}, |
@@ -1050,6 +1056,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', |
@@ -1092,6 +1100,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', |
@@ -1154,6 +1172,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', |