Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(446)

Unified Diff: media/media.gyp

Issue 1517473002: Support HLS MPEG2 TS with SAMPLE-AES encryption. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@encryption_scheme
Patch Set: ddorwin comments Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 3d7bf9970b69ca9ff3292fff025bce50b431d507..ab916717ba592907bb28396c000c109f978bad33 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': [
@@ -65,6 +70,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)",
],
},
},
@@ -1016,6 +1022,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',
@@ -1058,6 +1066,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',
@@ -1121,6 +1139,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',

Powered by Google App Engine
This is Rietveld 408576698