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

Side by Side 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: tidying up prior to review Created 5 years 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 unified diff | Download patch
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # Override to dynamically link the cras (ChromeOS audio) library. 8 # Override to dynamically link the cras (ChromeOS audio) library.
9 'use_cras%': 0, 9 'use_cras%': 0,
10 # Option e.g. for Linux distributions to link pulseaudio directly 10 # Option e.g. for Linux distributions to link pulseaudio directly
(...skipping 19 matching lines...) Expand all
30 # low memory buffer is used in non-Android based chromecast build due to h ardware limitation. 30 # low memory buffer is used in non-Android based chromecast build due to h ardware limitation.
31 ['chromecast==1 and OS!="android"', { 31 ['chromecast==1 and OS!="android"', {
32 'use_low_memory_buffer%': 1, 32 'use_low_memory_buffer%': 1,
33 }, { 33 }, {
34 'use_low_memory_buffer%': 0, 34 'use_low_memory_buffer%': 0,
35 }], 35 }],
36 ['chromecast==1', { 36 ['chromecast==1', {
37 # Enable HEVC/H265 demuxing. Actual decoding must be provided by the 37 # Enable HEVC/H265 demuxing. Actual decoding must be provided by the
38 # platform. 38 # platform.
39 'enable_hevc_demuxing%': 1, 39 'enable_hevc_demuxing%': 1,
40 'enable_hls_sample_aes%': 1,
40 }, { 41 }, {
41 'enable_hevc_demuxing%': 0, 42 'enable_hevc_demuxing%': 0,
43 'enable_hls_sample_aes%': 0,
42 }], 44 }],
43 ], 45 ],
44 }, 46 },
45 'includes': [ 47 'includes': [
46 'media_cdm.gypi', 48 'media_cdm.gypi',
47 'media_variables.gypi', 49 'media_variables.gypi',
48 ], 50 ],
49 'targets': [ 51 'targets': [
50 { 52 {
51 # GN version: //media 53 # GN version: //media
(...skipping 995 matching lines...) Expand 10 before | Expand all | Expand 10 after
1047 ['proprietary_codecs==1', { 1049 ['proprietary_codecs==1', {
1048 'sources': [ 1050 'sources': [
1049 'cdm/cenc_utils.cc', 1051 'cdm/cenc_utils.cc',
1050 'cdm/cenc_utils.h', 1052 'cdm/cenc_utils.h',
1051 'filters/ffmpeg_aac_bitstream_converter.cc', 1053 'filters/ffmpeg_aac_bitstream_converter.cc',
1052 'filters/ffmpeg_aac_bitstream_converter.h', 1054 'filters/ffmpeg_aac_bitstream_converter.h',
1053 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc', 1055 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc',
1054 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.h', 1056 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.h',
1055 'filters/h264_to_annex_b_bitstream_converter.cc', 1057 'filters/h264_to_annex_b_bitstream_converter.cc',
1056 'filters/h264_to_annex_b_bitstream_converter.h', 1058 'filters/h264_to_annex_b_bitstream_converter.h',
1059 'formats/mp2t/descriptors.cc',
1060 'formats/mp2t/descriptors.h',
1057 'formats/mp2t/es_adapter_video.cc', 1061 'formats/mp2t/es_adapter_video.cc',
1058 'formats/mp2t/es_adapter_video.h', 1062 'formats/mp2t/es_adapter_video.h',
1059 'formats/mp2t/es_parser.cc', 1063 'formats/mp2t/es_parser.cc',
1060 'formats/mp2t/es_parser.h', 1064 'formats/mp2t/es_parser.h',
1061 'formats/mp2t/es_parser_adts.cc', 1065 'formats/mp2t/es_parser_adts.cc',
1062 'formats/mp2t/es_parser_adts.h', 1066 'formats/mp2t/es_parser_adts.h',
1063 'formats/mp2t/es_parser_h264.cc', 1067 'formats/mp2t/es_parser_h264.cc',
1064 'formats/mp2t/es_parser_h264.h', 1068 'formats/mp2t/es_parser_h264.h',
1065 'formats/mp2t/es_parser_mpeg1audio.cc', 1069 'formats/mp2t/es_parser_mpeg1audio.cc',
1066 'formats/mp2t/es_parser_mpeg1audio.h', 1070 'formats/mp2t/es_parser_mpeg1audio.h',
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
1120 'formats/mp4/hevc.cc', 1124 'formats/mp4/hevc.cc',
1121 'formats/mp4/hevc.h', 1125 'formats/mp4/hevc.h',
1122 ], 1126 ],
1123 }], 1127 }],
1124 ['proprietary_codecs==1 and enable_hevc_demuxing==1 and media_use_ffmpeg ==1', { 1128 ['proprietary_codecs==1 and enable_hevc_demuxing==1 and media_use_ffmpeg ==1', {
1125 'sources': [ 1129 'sources': [
1126 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc', 1130 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc',
1127 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.h', 1131 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.h',
1128 ], 1132 ],
1129 }], 1133 }],
1134 ['proprietary_codecs==1 and enable_hls_sample_aes==1', {
1135 'defines': [
1136 'ENABLE_HLS_SAMPLE_AES'
1137 ],
1138 'sources': [
1139 'formats/mp2t/ts_section_cat.cc',
1140 'formats/mp2t/ts_section_cat.h',
1141 'formats/mp2t/ts_section_cets_ecm.cc',
1142 'formats/mp2t/ts_section_cets_ecm.h',
1143 'formats/mp2t/ts_section_cets_pssh.cc',
1144 'formats/mp2t/ts_section_cets_pssh.h',
1145 ],
1146 }],
1130 ['target_arch=="ia32" or target_arch=="x64"', { 1147 ['target_arch=="ia32" or target_arch=="x64"', {
1131 'dependencies': [ 1148 'dependencies': [
1132 'media_asm', 1149 'media_asm',
1133 ], 1150 ],
1134 'sources': [ 1151 'sources': [
1135 'base/simd/convert_rgb_to_yuv_sse2.cc', 1152 'base/simd/convert_rgb_to_yuv_sse2.cc',
1136 'base/simd/convert_rgb_to_yuv_ssse3.cc', 1153 'base/simd/convert_rgb_to_yuv_ssse3.cc',
1137 'base/simd/convert_yuv_to_rgb_x86.cc', 1154 'base/simd/convert_yuv_to_rgb_x86.cc',
1138 'base/simd/filter_yuv_sse2.cc', 1155 'base/simd/filter_yuv_sse2.cc',
1139 ], 1156 ],
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
1182 'media_test_support', 1199 'media_test_support',
1183 'shared_memory_support', 1200 'shared_memory_support',
1184 '../base/base.gyp:base', 1201 '../base/base.gyp:base',
1185 '../base/base.gyp:base_i18n', 1202 '../base/base.gyp:base_i18n',
1186 '../base/base.gyp:test_support_base', 1203 '../base/base.gyp:test_support_base',
1187 '../gpu/gpu.gyp:command_buffer_common', 1204 '../gpu/gpu.gyp:command_buffer_common',
1188 '../gpu/gpu.gyp:gpu_unittest_utils', 1205 '../gpu/gpu.gyp:gpu_unittest_utils',
1189 '../skia/skia.gyp:skia', 1206 '../skia/skia.gyp:skia',
1190 '../testing/gmock.gyp:gmock', 1207 '../testing/gmock.gyp:gmock',
1191 '../testing/gtest.gyp:gtest', 1208 '../testing/gtest.gyp:gtest',
1209 '../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.
1192 '../third_party/libyuv/libyuv.gyp:libyuv', 1210 '../third_party/libyuv/libyuv.gyp:libyuv',
1193 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', 1211 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
1194 '../ui/gfx/gfx.gyp:gfx', 1212 '../ui/gfx/gfx.gyp:gfx',
1195 '../ui/gfx/gfx.gyp:gfx_geometry', 1213 '../ui/gfx/gfx.gyp:gfx_geometry',
1196 '../ui/gfx/gfx.gyp:gfx_test_support', 1214 '../ui/gfx/gfx.gyp:gfx_test_support',
1197 '../url/url.gyp:url_lib', 1215 '../url/url.gyp:url_lib',
1198 ], 1216 ],
1199 'sources': [ 1217 'sources': [
1200 'base/android/access_unit_queue_unittest.cc', 1218 'base/android/access_unit_queue_unittest.cc',
1201 'base/android/media_codec_bridge_unittest.cc', 1219 'base/android/media_codec_bridge_unittest.cc',
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
1440 'formats/mp4/avc_unittest.cc', 1458 'formats/mp4/avc_unittest.cc',
1441 'formats/mp4/box_reader_unittest.cc', 1459 'formats/mp4/box_reader_unittest.cc',
1442 'formats/mp4/es_descriptor_unittest.cc', 1460 'formats/mp4/es_descriptor_unittest.cc',
1443 'formats/mp4/mp4_stream_parser_unittest.cc', 1461 'formats/mp4/mp4_stream_parser_unittest.cc',
1444 'formats/mp4/sample_to_group_iterator_unittest.cc', 1462 'formats/mp4/sample_to_group_iterator_unittest.cc',
1445 'formats/mp4/track_run_iterator_unittest.cc', 1463 'formats/mp4/track_run_iterator_unittest.cc',
1446 'formats/mpeg/adts_stream_parser_unittest.cc', 1464 'formats/mpeg/adts_stream_parser_unittest.cc',
1447 'formats/mpeg/mpeg1_audio_stream_parser_unittest.cc', 1465 'formats/mpeg/mpeg1_audio_stream_parser_unittest.cc',
1448 ], 1466 ],
1449 }], 1467 }],
1468 ['proprietary_codecs==1 and enable_hls_sample_aes==1', {
1469 'defines': [
1470 'ENABLE_HLS_SAMPLE_AES'
1471 ]
1472 }],
1450 ['OS=="mac"', { 1473 ['OS=="mac"', {
1451 'sources': [ 1474 'sources': [
1452 'capture/video/mac/video_capture_device_factory_mac_unittest.mm', 1475 'capture/video/mac/video_capture_device_factory_mac_unittest.mm',
1453 ] 1476 ]
1454 }], 1477 }],
1455 ['use_x11==1', { 1478 ['use_x11==1', {
1456 'dependencies': [ 1479 'dependencies': [
1457 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1480 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1458 ], 1481 ],
1459 }], 1482 }],
(...skipping 676 matching lines...) Expand 10 before | Expand all | Expand 10 after
2136 'dependencies': [ 2159 'dependencies': [
2137 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2160 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2138 ], 2161 ],
2139 }], 2162 }],
2140 ], 2163 ],
2141 }, 2164 },
2142 ], 2165 ],
2143 }], 2166 }],
2144 ], 2167 ],
2145 } 2168 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698