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

Unified Diff: media/BUILD.gn

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
« no previous file with comments | « no previous file | media/base/bit_reader.h » ('j') | media/formats/mp2t/descriptors.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/BUILD.gn
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 11a48e1dd104b70c935e9f1f864a7883734b489c..5e638e55ead014d3db1007623a5e00b270411a1e 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -20,6 +20,7 @@ buildflag_header("media_features") {
"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",
]
}
@@ -405,6 +406,8 @@ component("media") {
]
if (enable_mse_mpeg2ts_stream_parser) {
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",
@@ -432,6 +435,16 @@ component("media") {
"formats/mp2t/ts_section_psi.cc",
"formats/mp2t/ts_section_psi.h",
]
+ if (enable_hls_sample_aes) {
+ 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",
+ ]
+ }
}
}
@@ -668,6 +681,9 @@ test("media_unittests") {
if (enable_hevc_demuxing) {
sources += [ "filters/h265_parser_unittest.cc" ]
}
+ if (enable_hls_sample_aes) {
+ deps += [ "//third_party/boringssl" ]
+ }
}
if (is_mac || is_ios) {
« no previous file with comments | « no previous file | media/base/bit_reader.h » ('j') | media/formats/mp2t/descriptors.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698