Index: media/media.gyp |
diff --git a/media/media.gyp b/media/media.gyp |
index a5ea8fb4a86dbaf11a65eda00679a695c0e9326d..a82bcf5203f9685255b2f28fcbd3a4fdf979085a 100644 |
--- a/media/media.gyp |
+++ b/media/media.gyp |
@@ -37,8 +37,10 @@ |
# Enable HEVC/H265 demuxing. Actual decoding must be provided by the |
# platform. |
'enable_hevc_demuxing%': 1, |
+ 'enable_hls_sample_aes%': 1, |
}, { |
'enable_hevc_demuxing%': 0, |
+ 'enable_hls_sample_aes%': 0, |
}], |
], |
}, |
@@ -1054,6 +1056,8 @@ |
'filters/ffmpeg_h264_to_annex_b_bitstream_converter.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', |
@@ -1127,6 +1131,19 @@ |
'filters/ffmpeg_h265_to_annex_b_bitstream_converter.h', |
], |
}], |
+ ['proprietary_codecs==1 and enable_hls_sample_aes==1', { |
+ 'defines': [ |
+ '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', |
+ ], |
+ }], |
['target_arch=="ia32" or target_arch=="x64"', { |
'dependencies': [ |
'media_asm', |
@@ -1189,6 +1206,7 @@ |
'../skia/skia.gyp:skia', |
'../testing/gmock.gyp:gmock', |
'../testing/gtest.gyp:gtest', |
+ '../third_party/boringssl/boringssl.gyp:boringssl', |
ddorwin
2015/12/10 20:10:59
ditto
dougsteed
2015/12/14 22:51:46
See my earlier comment.
|
'../third_party/libyuv/libyuv.gyp:libyuv', |
'../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', |
'../ui/gfx/gfx.gyp:gfx', |
@@ -1447,6 +1465,11 @@ |
'formats/mpeg/mpeg1_audio_stream_parser_unittest.cc', |
], |
}], |
+ ['proprietary_codecs==1 and enable_hls_sample_aes==1', { |
+ 'defines': [ |
+ 'ENABLE_HLS_SAMPLE_AES' |
+ ] |
+ }], |
['OS=="mac"', { |
'sources': [ |
'capture/video/mac/video_capture_device_factory_mac_unittest.mm', |