Index: media/BUILD.gn |
diff --git a/media/BUILD.gn b/media/BUILD.gn |
index eb4c38fe50eca0d4f9c52608d7c44060090a0cb7..cf27ff1f64ec9fd4d3f3a0a1d1640adfd312ab5f 100644 |
--- a/media/BUILD.gn |
+++ b/media/BUILD.gn |
@@ -38,6 +38,9 @@ config("media_config") { |
if (proprietary_codecs && enable_hevc_demuxing) { |
defines += [ "ENABLE_HEVC_DEMUXING" ] |
} |
+ if (proprietary_codecs && enable_hls_sample_aes) { |
+ defines += [ "ENABLE_HLS_SAMPLE_AES" ] |
+ } |
} |
config("media_implementation") { |
@@ -361,6 +364,17 @@ component("media") { |
} |
} |
+ if (proprietary_codecs && 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", |
+ ] |
+ } |
+ |
if (current_cpu == "arm" && arm_use_neon) { |
defines += [ "USE_NEON" ] |
} |
@@ -480,6 +494,8 @@ component("media") { |
"cdm/cenc_utils.h", |
"filters/h264_to_annex_b_bitstream_converter.cc", |
"filters/h264_to_annex_b_bitstream_converter.h", |
+ "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", |
@@ -770,6 +786,9 @@ test("media_unittests") { |
if (enable_hevc_demuxing) { |
sources += [ "filters/h265_parser_unittest.cc" ] |
} |
+ if (enable_hls_sample_aes) { |
+ deps += [ "//third_party/boringssl" ] |
ddorwin
2015/12/10 20:10:58
Is there a reason to use boringssl directly instea
dougsteed
2015/12/14 22:51:45
Yes. The code in //crypto doesn't support CBC mode
|
+ } |
} |
if (is_mac || is_ios) { |