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

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: rebase Created 4 years, 9 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 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 23 matching lines...) Expand all
34 'use_low_memory_buffer%': 0, 34 'use_low_memory_buffer%': 0,
35 }], 35 }],
36 ['proprietary_codecs==1 and chromecast==1', { 36 ['proprietary_codecs==1 and chromecast==1', {
37 # Enable AC3/EAC3 audio demuxing. Actual decoding must be provided by 37 # Enable AC3/EAC3 audio demuxing. Actual decoding must be provided by
38 # the platform (or HDMI sink in Chromecast for audio pass-through case). 38 # the platform (or HDMI sink in Chromecast for audio pass-through case).
39 'enable_ac3_eac3_audio_demuxing%': 1, 39 'enable_ac3_eac3_audio_demuxing%': 1,
40 # Enable HEVC/H265 demuxing. Actual decoding must be provided by the 40 # Enable HEVC/H265 demuxing. Actual decoding must be provided by the
41 # platform. 41 # platform.
42 'enable_hevc_demuxing%': 1, 42 'enable_hevc_demuxing%': 1,
43 'enable_mse_mpeg2ts_stream_parser%': 1, 43 'enable_mse_mpeg2ts_stream_parser%': 1,
44 'enable_hls_sample_aes%': 1,
44 }, { 45 }, {
45 'enable_ac3_eac3_audio_demuxing%': 0, 46 'enable_ac3_eac3_audio_demuxing%': 0,
46 'enable_hevc_demuxing%': 0, 47 'enable_hevc_demuxing%': 0,
47 'enable_mse_mpeg2ts_stream_parser%': 0, 48 'enable_mse_mpeg2ts_stream_parser%': 0,
49 'enable_hls_sample_aes%': 0,
50 }],
51 ['proprietary_codecs==1 and is_cast_desktop_build==1', {
52 'enable_hls_sample_aes%': 1,
53 }, {
54 'enable_hls_sample_aes%': 0,
48 }], 55 }],
49 ], 56 ],
50 }, 57 },
51 'includes': [ 58 'includes': [
52 'capture.gypi', 59 'capture.gypi',
53 'media_cdm.gypi', 60 'media_cdm.gypi',
54 'media_variables.gypi', 61 'media_variables.gypi',
55 ], 62 ],
56 'targets': [ 63 'targets': [
57 { 64 {
58 # GN version: //media:media_features 65 # GN version: //media:media_features
59 'target_name': 'media_features', 66 'target_name': 'media_features',
60 'includes': [ '../build/buildflag_header.gypi' ], 67 'includes': [ '../build/buildflag_header.gypi' ],
61 'variables': { 68 'variables': {
62 'buildflag_header_path': 'media/media_features.h', 69 'buildflag_header_path': 'media/media_features.h',
63 'buildflag_flags': [ 70 'buildflag_flags': [
64 "ENABLE_AC3_EAC3_AUDIO_DEMUXING=<(enable_ac3_eac3_audio_demuxing)", 71 "ENABLE_AC3_EAC3_AUDIO_DEMUXING=<(enable_ac3_eac3_audio_demuxing)",
65 "ENABLE_HEVC_DEMUXING=<(enable_hevc_demuxing)", 72 "ENABLE_HEVC_DEMUXING=<(enable_hevc_demuxing)",
66 "ENABLE_MSE_MPEG2TS_STREAM_PARSER=<(enable_mse_mpeg2ts_stream_parser)" , 73 "ENABLE_MSE_MPEG2TS_STREAM_PARSER=<(enable_mse_mpeg2ts_stream_parser)" ,
74 "ENABLE_HLS_SAMPLE_AES=<(enable_hls_sample_aes)",
67 ], 75 ],
68 }, 76 },
69 }, 77 },
70 { 78 {
71 # GN version: //media 79 # GN version: //media
72 'target_name': 'media', 80 'target_name': 'media',
73 'type': '<(component)', 81 'type': '<(component)',
74 'dependencies': [ 82 'dependencies': [
75 'media_features', 83 'media_features',
76 '../base/base.gyp:base', 84 '../base/base.gyp:base',
(...skipping 966 matching lines...) Expand 10 before | Expand all | Expand 10 after
1043 'formats/mpeg/adts_stream_parser.cc', 1051 'formats/mpeg/adts_stream_parser.cc',
1044 'formats/mpeg/adts_stream_parser.h', 1052 'formats/mpeg/adts_stream_parser.h',
1045 'formats/mpeg/mpeg1_audio_stream_parser.cc', 1053 'formats/mpeg/mpeg1_audio_stream_parser.cc',
1046 'formats/mpeg/mpeg1_audio_stream_parser.h', 1054 'formats/mpeg/mpeg1_audio_stream_parser.h',
1047 'formats/mpeg/mpeg_audio_stream_parser_base.cc', 1055 'formats/mpeg/mpeg_audio_stream_parser_base.cc',
1048 'formats/mpeg/mpeg_audio_stream_parser_base.h', 1056 'formats/mpeg/mpeg_audio_stream_parser_base.h',
1049 ], 1057 ],
1050 }], 1058 }],
1051 ['proprietary_codecs==1 and enable_mse_mpeg2ts_stream_parser==1', { 1059 ['proprietary_codecs==1 and enable_mse_mpeg2ts_stream_parser==1', {
1052 'sources': [ 1060 'sources': [
1061 'formats/mp2t/descriptors.cc',
1062 'formats/mp2t/descriptors.h',
1053 'formats/mp2t/es_adapter_video.cc', 1063 'formats/mp2t/es_adapter_video.cc',
1054 'formats/mp2t/es_adapter_video.h', 1064 'formats/mp2t/es_adapter_video.h',
1055 'formats/mp2t/es_parser.cc', 1065 'formats/mp2t/es_parser.cc',
1056 'formats/mp2t/es_parser.h', 1066 'formats/mp2t/es_parser.h',
1057 'formats/mp2t/es_parser_adts.cc', 1067 'formats/mp2t/es_parser_adts.cc',
1058 'formats/mp2t/es_parser_adts.h', 1068 'formats/mp2t/es_parser_adts.h',
1059 'formats/mp2t/es_parser_h264.cc', 1069 'formats/mp2t/es_parser_h264.cc',
1060 'formats/mp2t/es_parser_h264.h', 1070 'formats/mp2t/es_parser_h264.h',
1061 'formats/mp2t/es_parser_mpeg1audio.cc', 1071 'formats/mp2t/es_parser_mpeg1audio.cc',
1062 'formats/mp2t/es_parser_mpeg1audio.h', 1072 'formats/mp2t/es_parser_mpeg1audio.h',
(...skipping 22 matching lines...) Expand all
1085 'formats/mp4/hevc.cc', 1095 'formats/mp4/hevc.cc',
1086 'formats/mp4/hevc.h', 1096 'formats/mp4/hevc.h',
1087 ], 1097 ],
1088 }], 1098 }],
1089 ['proprietary_codecs==1 and enable_hevc_demuxing==1 and media_use_ffmpeg ==1', { 1099 ['proprietary_codecs==1 and enable_hevc_demuxing==1 and media_use_ffmpeg ==1', {
1090 'sources': [ 1100 'sources': [
1091 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc', 1101 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc',
1092 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.h', 1102 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.h',
1093 ], 1103 ],
1094 }], 1104 }],
1105 ['proprietary_codecs==1 and enable_hls_sample_aes==1', {
1106 'sources': [
1107 'formats/mp2t/ts_section_cat.cc',
1108 'formats/mp2t/ts_section_cat.h',
1109 'formats/mp2t/ts_section_cets_ecm.cc',
1110 'formats/mp2t/ts_section_cets_ecm.h',
1111 'formats/mp2t/ts_section_cets_pssh.cc',
1112 'formats/mp2t/ts_section_cets_pssh.h',
1113 ],
1114 }],
1095 ['target_arch=="ia32" or target_arch=="x64"', { 1115 ['target_arch=="ia32" or target_arch=="x64"', {
1096 'dependencies': [ 1116 'dependencies': [
1097 'media_asm', 1117 'media_asm',
1098 ], 1118 ],
1099 'sources': [ 1119 'sources': [
1100 'base/simd/convert_rgb_to_yuv_sse2.cc', 1120 'base/simd/convert_rgb_to_yuv_sse2.cc',
1101 'base/simd/convert_rgb_to_yuv_ssse3.cc', 1121 'base/simd/convert_rgb_to_yuv_ssse3.cc',
1102 'base/simd/convert_yuv_to_rgb_x86.cc', 1122 'base/simd/convert_yuv_to_rgb_x86.cc',
1103 'base/simd/filter_yuv_sse2.cc', 1123 'base/simd/filter_yuv_sse2.cc',
1104 ], 1124 ],
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
1147 'media_test_support', 1167 'media_test_support',
1148 'shared_memory_support', 1168 'shared_memory_support',
1149 '../base/base.gyp:base', 1169 '../base/base.gyp:base',
1150 '../base/base.gyp:base_i18n', 1170 '../base/base.gyp:base_i18n',
1151 '../base/base.gyp:test_support_base', 1171 '../base/base.gyp:test_support_base',
1152 '../gpu/gpu.gyp:command_buffer_common', 1172 '../gpu/gpu.gyp:command_buffer_common',
1153 '../gpu/gpu.gyp:gpu_unittest_utils', 1173 '../gpu/gpu.gyp:gpu_unittest_utils',
1154 '../skia/skia.gyp:skia', 1174 '../skia/skia.gyp:skia',
1155 '../testing/gmock.gyp:gmock', 1175 '../testing/gmock.gyp:gmock',
1156 '../testing/gtest.gyp:gtest', 1176 '../testing/gtest.gyp:gtest',
1177 '../third_party/boringssl/boringssl.gyp:boringssl',
1157 '../third_party/libwebm/libwebm.gyp:libwebm', 1178 '../third_party/libwebm/libwebm.gyp:libwebm',
1158 '../third_party/libyuv/libyuv.gyp:libyuv', 1179 '../third_party/libyuv/libyuv.gyp:libyuv',
1159 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', 1180 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
1160 '../ui/gfx/gfx.gyp:gfx', 1181 '../ui/gfx/gfx.gyp:gfx',
1161 '../ui/gfx/gfx.gyp:gfx_geometry', 1182 '../ui/gfx/gfx.gyp:gfx_geometry',
1162 '../ui/gfx/gfx.gyp:gfx_test_support', 1183 '../ui/gfx/gfx.gyp:gfx_test_support',
1163 '../url/url.gyp:url_lib', 1184 '../url/url.gyp:url_lib',
1164 ], 1185 ],
1165 'sources': [ 1186 'sources': [
1166 '<@(capture_unittests_sources)', 1187 '<@(capture_unittests_sources)',
(...skipping 947 matching lines...) Expand 10 before | Expand all | Expand 10 after
2114 'dependencies': [ 2135 'dependencies': [
2115 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2136 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2116 ], 2137 ],
2117 }], 2138 }],
2118 ], 2139 ],
2119 }, 2140 },
2120 ], 2141 ],
2121 }], 2142 }],
2122 ], 2143 ],
2123 } 2144 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698