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

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, 6 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 28 matching lines...) Expand all
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 }, { 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 'hard_dependency': 1, 66 'hard_dependency': 1,
62 'variables': { 67 'variables': {
63 'buildflag_header_path': 'media/media_features.h', 68 'buildflag_header_path': 'media/media_features.h',
64 'buildflag_flags': [ 69 'buildflag_flags': [
65 "ENABLE_AC3_EAC3_AUDIO_DEMUXING=<(enable_ac3_eac3_audio_demuxing)", 70 "ENABLE_AC3_EAC3_AUDIO_DEMUXING=<(enable_ac3_eac3_audio_demuxing)",
66 "ENABLE_HEVC_DEMUXING=<(enable_hevc_demuxing)", 71 "ENABLE_HEVC_DEMUXING=<(enable_hevc_demuxing)",
67 "ENABLE_MSE_MPEG2TS_STREAM_PARSER=<(enable_mse_mpeg2ts_stream_parser)" , 72 "ENABLE_MSE_MPEG2TS_STREAM_PARSER=<(enable_mse_mpeg2ts_stream_parser)" ,
68 "ENABLE_MP4_VP9_DEMUXING=0", 73 "ENABLE_MP4_VP9_DEMUXING=0",
74 "ENABLE_HLS_SAMPLE_AES=<(enable_hls_sample_aes)",
69 ], 75 ],
70 }, 76 },
71 }, 77 },
72 { 78 {
73 # GN version: //media 79 # GN version: //media
74 'target_name': 'media', 80 'target_name': 'media',
75 'type': '<(component)', 81 'type': '<(component)',
76 'dependencies': [ 82 'dependencies': [
77 'media_features', 83 'media_features',
78 '../base/base.gyp:base', 84 '../base/base.gyp:base',
(...skipping 934 matching lines...) Expand 10 before | Expand all | Expand 10 after
1013 'formats/mpeg/adts_stream_parser.cc', 1019 'formats/mpeg/adts_stream_parser.cc',
1014 'formats/mpeg/adts_stream_parser.h', 1020 'formats/mpeg/adts_stream_parser.h',
1015 'formats/mpeg/mpeg1_audio_stream_parser.cc', 1021 'formats/mpeg/mpeg1_audio_stream_parser.cc',
1016 'formats/mpeg/mpeg1_audio_stream_parser.h', 1022 'formats/mpeg/mpeg1_audio_stream_parser.h',
1017 'formats/mpeg/mpeg_audio_stream_parser_base.cc', 1023 'formats/mpeg/mpeg_audio_stream_parser_base.cc',
1018 'formats/mpeg/mpeg_audio_stream_parser_base.h', 1024 'formats/mpeg/mpeg_audio_stream_parser_base.h',
1019 ], 1025 ],
1020 }], 1026 }],
1021 ['proprietary_codecs==1 and enable_mse_mpeg2ts_stream_parser==1', { 1027 ['proprietary_codecs==1 and enable_mse_mpeg2ts_stream_parser==1', {
1022 'sources': [ 1028 'sources': [
1029 'formats/mp2t/descriptors.cc',
1030 'formats/mp2t/descriptors.h',
1023 'formats/mp2t/es_adapter_video.cc', 1031 'formats/mp2t/es_adapter_video.cc',
1024 'formats/mp2t/es_adapter_video.h', 1032 'formats/mp2t/es_adapter_video.h',
1025 'formats/mp2t/es_parser.cc', 1033 'formats/mp2t/es_parser.cc',
1026 'formats/mp2t/es_parser.h', 1034 'formats/mp2t/es_parser.h',
1027 'formats/mp2t/es_parser_adts.cc', 1035 'formats/mp2t/es_parser_adts.cc',
1028 'formats/mp2t/es_parser_adts.h', 1036 'formats/mp2t/es_parser_adts.h',
1029 'formats/mp2t/es_parser_h264.cc', 1037 'formats/mp2t/es_parser_h264.cc',
1030 'formats/mp2t/es_parser_h264.h', 1038 'formats/mp2t/es_parser_h264.h',
1031 'formats/mp2t/es_parser_mpeg1audio.cc', 1039 'formats/mp2t/es_parser_mpeg1audio.cc',
1032 'formats/mp2t/es_parser_mpeg1audio.h', 1040 'formats/mp2t/es_parser_mpeg1audio.h',
(...skipping 22 matching lines...) Expand all
1055 'formats/mp4/hevc.cc', 1063 'formats/mp4/hevc.cc',
1056 'formats/mp4/hevc.h', 1064 'formats/mp4/hevc.h',
1057 ], 1065 ],
1058 }], 1066 }],
1059 ['proprietary_codecs==1 and enable_hevc_demuxing==1 and media_use_ffmpeg ==1', { 1067 ['proprietary_codecs==1 and enable_hevc_demuxing==1 and media_use_ffmpeg ==1', {
1060 'sources': [ 1068 'sources': [
1061 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc', 1069 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc',
1062 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.h', 1070 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.h',
1063 ], 1071 ],
1064 }], 1072 }],
1073 ['proprietary_codecs==1 and enable_hls_sample_aes==1', {
1074 'sources': [
1075 'formats/mp2t/ts_section_cat.cc',
1076 'formats/mp2t/ts_section_cat.h',
1077 'formats/mp2t/ts_section_cets_ecm.cc',
1078 'formats/mp2t/ts_section_cets_ecm.h',
1079 'formats/mp2t/ts_section_cets_pssh.cc',
1080 'formats/mp2t/ts_section_cets_pssh.h',
1081 ],
1082 }],
1065 ['target_arch=="ia32" or target_arch=="x64"', { 1083 ['target_arch=="ia32" or target_arch=="x64"', {
1066 'dependencies': [ 1084 'dependencies': [
1067 'media_asm', 1085 'media_asm',
1068 ], 1086 ],
1069 'sources': [ 1087 'sources': [
1070 'base/simd/convert_rgb_to_yuv_sse2.cc', 1088 'base/simd/convert_rgb_to_yuv_sse2.cc',
1071 'base/simd/convert_rgb_to_yuv_ssse3.cc', 1089 'base/simd/convert_rgb_to_yuv_ssse3.cc',
1072 'base/simd/convert_yuv_to_rgb_x86.cc', 1090 'base/simd/convert_yuv_to_rgb_x86.cc',
1073 'base/simd/filter_yuv_sse2.cc', 1091 'base/simd/filter_yuv_sse2.cc',
1074 ], 1092 ],
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
1131 'media_test_support', 1149 'media_test_support',
1132 'shared_memory_support', 1150 'shared_memory_support',
1133 '../base/base.gyp:base', 1151 '../base/base.gyp:base',
1134 '../base/base.gyp:base_i18n', 1152 '../base/base.gyp:base_i18n',
1135 '../base/base.gyp:test_support_base', 1153 '../base/base.gyp:test_support_base',
1136 '../gpu/gpu.gyp:command_buffer_common', 1154 '../gpu/gpu.gyp:command_buffer_common',
1137 '../gpu/gpu.gyp:gpu_unittest_utils', 1155 '../gpu/gpu.gyp:gpu_unittest_utils',
1138 '../skia/skia.gyp:skia', 1156 '../skia/skia.gyp:skia',
1139 '../testing/gmock.gyp:gmock', 1157 '../testing/gmock.gyp:gmock',
1140 '../testing/gtest.gyp:gtest', 1158 '../testing/gtest.gyp:gtest',
1159 '../third_party/boringssl/boringssl.gyp:boringssl',
1141 '../third_party/libwebm/libwebm.gyp:libwebm', 1160 '../third_party/libwebm/libwebm.gyp:libwebm',
1142 '../third_party/libyuv/libyuv.gyp:libyuv', 1161 '../third_party/libyuv/libyuv.gyp:libyuv',
1143 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', 1162 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
1144 '../ui/gfx/gfx.gyp:gfx', 1163 '../ui/gfx/gfx.gyp:gfx',
1145 '../ui/gfx/gfx.gyp:gfx_geometry', 1164 '../ui/gfx/gfx.gyp:gfx_geometry',
1146 '../ui/gfx/gfx.gyp:gfx_test_support', 1165 '../ui/gfx/gfx.gyp:gfx_test_support',
1147 '../url/url.gyp:url_lib', 1166 '../url/url.gyp:url_lib',
1148 ], 1167 ],
1149 'sources': [ 1168 'sources': [
1150 '<@(capture_unittests_sources)', 1169 '<@(capture_unittests_sources)',
(...skipping 1164 matching lines...) Expand 10 before | Expand all | Expand 10 after
2315 'dependencies': [ 2334 'dependencies': [
2316 '../build/linux/system.gyp:libdrm', 2335 '../build/linux/system.gyp:libdrm',
2317 ] 2336 ]
2318 }], 2337 }],
2319 ], 2338 ],
2320 } 2339 }
2321 ] 2340 ]
2322 }], 2341 }],
2323 ], 2342 ],
2324 } 2343 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698