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

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: README file update Created 4 years, 8 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
« no previous file with comments | « media/formats/mpeg/adts_header_parser.cc ('k') | media/media_options.gni » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 22 matching lines...) Expand all
33 }, { 33 }, {
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,
ddorwin 2016/03/31 20:59:21 enable_hls_sample_aes was removed. Is that because
dougsteed 2016/04/01 01:19:28 No it was actually a rebasing error , it ended up
44 }, { 44 }, {
45 'enable_ac3_eac3_audio_demuxing%': 0, 45 'enable_ac3_eac3_audio_demuxing%': 0,
46 'enable_hevc_demuxing%': 0, 46 'enable_hevc_demuxing%': 0,
47 'enable_mse_mpeg2ts_stream_parser%': 0, 47 'enable_mse_mpeg2ts_stream_parser%': 0,
48 }], 48 }],
49 ['proprietary_codecs==1 and is_cast_desktop_build==1', {
50 'enable_hls_sample_aes%': 1,
51 }, {
52 'enable_hls_sample_aes%': 0,
53 }],
49 ], 54 ],
50 }, 55 },
51 'includes': [ 56 'includes': [
52 'capture.gypi', 57 'capture.gypi',
53 'media_cdm.gypi', 58 'media_cdm.gypi',
54 'media_variables.gypi', 59 'media_variables.gypi',
55 ], 60 ],
56 'targets': [ 61 'targets': [
57 { 62 {
58 # GN version: //media:media_features 63 # GN version: //media:media_features
59 'target_name': 'media_features', 64 'target_name': 'media_features',
60 'includes': [ '../build/buildflag_header.gypi' ], 65 'includes': [ '../build/buildflag_header.gypi' ],
61 'variables': { 66 'variables': {
62 'buildflag_header_path': 'media/media_features.h', 67 'buildflag_header_path': 'media/media_features.h',
63 'buildflag_flags': [ 68 'buildflag_flags': [
64 "ENABLE_AC3_EAC3_AUDIO_DEMUXING=<(enable_ac3_eac3_audio_demuxing)", 69 "ENABLE_AC3_EAC3_AUDIO_DEMUXING=<(enable_ac3_eac3_audio_demuxing)",
65 "ENABLE_HEVC_DEMUXING=<(enable_hevc_demuxing)", 70 "ENABLE_HEVC_DEMUXING=<(enable_hevc_demuxing)",
66 "ENABLE_MSE_MPEG2TS_STREAM_PARSER=<(enable_mse_mpeg2ts_stream_parser)" , 71 "ENABLE_MSE_MPEG2TS_STREAM_PARSER=<(enable_mse_mpeg2ts_stream_parser)" ,
72 "ENABLE_HLS_SAMPLE_AES=<(enable_hls_sample_aes)",
67 ], 73 ],
68 }, 74 },
69 }, 75 },
70 { 76 {
71 # GN version: //media 77 # GN version: //media
72 'target_name': 'media', 78 'target_name': 'media',
73 'type': '<(component)', 79 'type': '<(component)',
74 'dependencies': [ 80 'dependencies': [
75 'media_features', 81 'media_features',
76 '../base/base.gyp:base', 82 '../base/base.gyp:base',
(...skipping 966 matching lines...) Expand 10 before | Expand all | Expand 10 after
1043 'formats/mpeg/adts_stream_parser.cc', 1049 'formats/mpeg/adts_stream_parser.cc',
1044 'formats/mpeg/adts_stream_parser.h', 1050 'formats/mpeg/adts_stream_parser.h',
1045 'formats/mpeg/mpeg1_audio_stream_parser.cc', 1051 'formats/mpeg/mpeg1_audio_stream_parser.cc',
1046 'formats/mpeg/mpeg1_audio_stream_parser.h', 1052 'formats/mpeg/mpeg1_audio_stream_parser.h',
1047 'formats/mpeg/mpeg_audio_stream_parser_base.cc', 1053 'formats/mpeg/mpeg_audio_stream_parser_base.cc',
1048 'formats/mpeg/mpeg_audio_stream_parser_base.h', 1054 'formats/mpeg/mpeg_audio_stream_parser_base.h',
1049 ], 1055 ],
1050 }], 1056 }],
1051 ['proprietary_codecs==1 and enable_mse_mpeg2ts_stream_parser==1', { 1057 ['proprietary_codecs==1 and enable_mse_mpeg2ts_stream_parser==1', {
1052 'sources': [ 1058 'sources': [
1059 'formats/mp2t/descriptors.cc',
1060 'formats/mp2t/descriptors.h',
1053 'formats/mp2t/es_adapter_video.cc', 1061 'formats/mp2t/es_adapter_video.cc',
1054 'formats/mp2t/es_adapter_video.h', 1062 'formats/mp2t/es_adapter_video.h',
1055 'formats/mp2t/es_parser.cc', 1063 'formats/mp2t/es_parser.cc',
1056 'formats/mp2t/es_parser.h', 1064 'formats/mp2t/es_parser.h',
1057 'formats/mp2t/es_parser_adts.cc', 1065 'formats/mp2t/es_parser_adts.cc',
1058 'formats/mp2t/es_parser_adts.h', 1066 'formats/mp2t/es_parser_adts.h',
1059 'formats/mp2t/es_parser_h264.cc', 1067 'formats/mp2t/es_parser_h264.cc',
1060 'formats/mp2t/es_parser_h264.h', 1068 'formats/mp2t/es_parser_h264.h',
1061 'formats/mp2t/es_parser_mpeg1audio.cc', 1069 'formats/mp2t/es_parser_mpeg1audio.cc',
1062 'formats/mp2t/es_parser_mpeg1audio.h', 1070 'formats/mp2t/es_parser_mpeg1audio.h',
(...skipping 22 matching lines...) Expand all
1085 'formats/mp4/hevc.cc', 1093 'formats/mp4/hevc.cc',
1086 'formats/mp4/hevc.h', 1094 'formats/mp4/hevc.h',
1087 ], 1095 ],
1088 }], 1096 }],
1089 ['proprietary_codecs==1 and enable_hevc_demuxing==1 and media_use_ffmpeg ==1', { 1097 ['proprietary_codecs==1 and enable_hevc_demuxing==1 and media_use_ffmpeg ==1', {
1090 'sources': [ 1098 'sources': [
1091 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc', 1099 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc',
1092 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.h', 1100 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.h',
1093 ], 1101 ],
1094 }], 1102 }],
1103 ['proprietary_codecs==1 and enable_hls_sample_aes==1', {
1104 'sources': [
1105 'formats/mp2t/ts_section_cat.cc',
1106 'formats/mp2t/ts_section_cat.h',
1107 'formats/mp2t/ts_section_cets_ecm.cc',
1108 'formats/mp2t/ts_section_cets_ecm.h',
1109 'formats/mp2t/ts_section_cets_pssh.cc',
1110 'formats/mp2t/ts_section_cets_pssh.h',
1111 ],
1112 }],
1095 ['target_arch=="ia32" or target_arch=="x64"', { 1113 ['target_arch=="ia32" or target_arch=="x64"', {
1096 'dependencies': [ 1114 'dependencies': [
1097 'media_asm', 1115 'media_asm',
1098 ], 1116 ],
1099 'sources': [ 1117 'sources': [
1100 'base/simd/convert_rgb_to_yuv_sse2.cc', 1118 'base/simd/convert_rgb_to_yuv_sse2.cc',
1101 'base/simd/convert_rgb_to_yuv_ssse3.cc', 1119 'base/simd/convert_rgb_to_yuv_ssse3.cc',
1102 'base/simd/convert_yuv_to_rgb_x86.cc', 1120 'base/simd/convert_yuv_to_rgb_x86.cc',
1103 'base/simd/filter_yuv_sse2.cc', 1121 'base/simd/filter_yuv_sse2.cc',
1104 ], 1122 ],
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
1147 'media_test_support', 1165 'media_test_support',
1148 'shared_memory_support', 1166 'shared_memory_support',
1149 '../base/base.gyp:base', 1167 '../base/base.gyp:base',
1150 '../base/base.gyp:base_i18n', 1168 '../base/base.gyp:base_i18n',
1151 '../base/base.gyp:test_support_base', 1169 '../base/base.gyp:test_support_base',
1152 '../gpu/gpu.gyp:command_buffer_common', 1170 '../gpu/gpu.gyp:command_buffer_common',
1153 '../gpu/gpu.gyp:gpu_unittest_utils', 1171 '../gpu/gpu.gyp:gpu_unittest_utils',
1154 '../skia/skia.gyp:skia', 1172 '../skia/skia.gyp:skia',
1155 '../testing/gmock.gyp:gmock', 1173 '../testing/gmock.gyp:gmock',
1156 '../testing/gtest.gyp:gtest', 1174 '../testing/gtest.gyp:gtest',
1175 '../third_party/boringssl/boringssl.gyp:boringssl',
1157 '../third_party/libwebm/libwebm.gyp:libwebm', 1176 '../third_party/libwebm/libwebm.gyp:libwebm',
1158 '../third_party/libyuv/libyuv.gyp:libyuv', 1177 '../third_party/libyuv/libyuv.gyp:libyuv',
1159 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', 1178 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
1160 '../ui/gfx/gfx.gyp:gfx', 1179 '../ui/gfx/gfx.gyp:gfx',
1161 '../ui/gfx/gfx.gyp:gfx_geometry', 1180 '../ui/gfx/gfx.gyp:gfx_geometry',
1162 '../ui/gfx/gfx.gyp:gfx_test_support', 1181 '../ui/gfx/gfx.gyp:gfx_test_support',
1163 '../url/url.gyp:url_lib', 1182 '../url/url.gyp:url_lib',
1164 ], 1183 ],
1165 'sources': [ 1184 'sources': [
1166 '<@(capture_unittests_sources)', 1185 '<@(capture_unittests_sources)',
(...skipping 947 matching lines...) Expand 10 before | Expand all | Expand 10 after
2114 'dependencies': [ 2133 'dependencies': [
2115 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2134 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2116 ], 2135 ],
2117 }], 2136 }],
2118 ], 2137 ],
2119 }, 2138 },
2120 ], 2139 ],
2121 }], 2140 }],
2122 ], 2141 ],
2123 } 2142 }
OLDNEW
« no previous file with comments | « media/formats/mpeg/adts_header_parser.cc ('k') | media/media_options.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698