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

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: ddorwin comments Created 4 years, 7 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 '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)" ,
67 "ENABLE_MP4_VP9_DEMUXING=0", 72 "ENABLE_MP4_VP9_DEMUXING=0",
73 "ENABLE_HLS_SAMPLE_AES=<(enable_hls_sample_aes)",
68 ], 74 ],
69 }, 75 },
70 }, 76 },
71 { 77 {
72 # GN version: //media 78 # GN version: //media
73 'target_name': 'media', 79 'target_name': 'media',
74 'type': '<(component)', 80 'type': '<(component)',
75 'dependencies': [ 81 'dependencies': [
76 'media_features', 82 'media_features',
77 '../base/base.gyp:base', 83 '../base/base.gyp:base',
(...skipping 931 matching lines...) Expand 10 before | Expand all | Expand 10 after
1009 'formats/mpeg/adts_stream_parser.cc', 1015 'formats/mpeg/adts_stream_parser.cc',
1010 'formats/mpeg/adts_stream_parser.h', 1016 'formats/mpeg/adts_stream_parser.h',
1011 'formats/mpeg/mpeg1_audio_stream_parser.cc', 1017 'formats/mpeg/mpeg1_audio_stream_parser.cc',
1012 'formats/mpeg/mpeg1_audio_stream_parser.h', 1018 'formats/mpeg/mpeg1_audio_stream_parser.h',
1013 'formats/mpeg/mpeg_audio_stream_parser_base.cc', 1019 'formats/mpeg/mpeg_audio_stream_parser_base.cc',
1014 'formats/mpeg/mpeg_audio_stream_parser_base.h', 1020 'formats/mpeg/mpeg_audio_stream_parser_base.h',
1015 ], 1021 ],
1016 }], 1022 }],
1017 ['proprietary_codecs==1 and enable_mse_mpeg2ts_stream_parser==1', { 1023 ['proprietary_codecs==1 and enable_mse_mpeg2ts_stream_parser==1', {
1018 'sources': [ 1024 'sources': [
1025 'formats/mp2t/descriptors.cc',
1026 'formats/mp2t/descriptors.h',
1019 'formats/mp2t/es_adapter_video.cc', 1027 'formats/mp2t/es_adapter_video.cc',
1020 'formats/mp2t/es_adapter_video.h', 1028 'formats/mp2t/es_adapter_video.h',
1021 'formats/mp2t/es_parser.cc', 1029 'formats/mp2t/es_parser.cc',
1022 'formats/mp2t/es_parser.h', 1030 'formats/mp2t/es_parser.h',
1023 'formats/mp2t/es_parser_adts.cc', 1031 'formats/mp2t/es_parser_adts.cc',
1024 'formats/mp2t/es_parser_adts.h', 1032 'formats/mp2t/es_parser_adts.h',
1025 'formats/mp2t/es_parser_h264.cc', 1033 'formats/mp2t/es_parser_h264.cc',
1026 'formats/mp2t/es_parser_h264.h', 1034 'formats/mp2t/es_parser_h264.h',
1027 'formats/mp2t/es_parser_mpeg1audio.cc', 1035 'formats/mp2t/es_parser_mpeg1audio.cc',
1028 'formats/mp2t/es_parser_mpeg1audio.h', 1036 'formats/mp2t/es_parser_mpeg1audio.h',
(...skipping 22 matching lines...) Expand all
1051 'formats/mp4/hevc.cc', 1059 'formats/mp4/hevc.cc',
1052 'formats/mp4/hevc.h', 1060 'formats/mp4/hevc.h',
1053 ], 1061 ],
1054 }], 1062 }],
1055 ['proprietary_codecs==1 and enable_hevc_demuxing==1 and media_use_ffmpeg ==1', { 1063 ['proprietary_codecs==1 and enable_hevc_demuxing==1 and media_use_ffmpeg ==1', {
1056 'sources': [ 1064 'sources': [
1057 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc', 1065 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc',
1058 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.h', 1066 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.h',
1059 ], 1067 ],
1060 }], 1068 }],
1069 ['proprietary_codecs==1 and enable_hls_sample_aes==1', {
1070 'sources': [
1071 'formats/mp2t/ts_section_cat.cc',
1072 'formats/mp2t/ts_section_cat.h',
1073 'formats/mp2t/ts_section_cets_ecm.cc',
1074 'formats/mp2t/ts_section_cets_ecm.h',
1075 'formats/mp2t/ts_section_cets_pssh.cc',
1076 'formats/mp2t/ts_section_cets_pssh.h',
1077 ],
1078 }],
1061 ['target_arch=="ia32" or target_arch=="x64"', { 1079 ['target_arch=="ia32" or target_arch=="x64"', {
1062 'dependencies': [ 1080 'dependencies': [
1063 'media_asm', 1081 'media_asm',
1064 ], 1082 ],
1065 'sources': [ 1083 'sources': [
1066 'base/simd/convert_rgb_to_yuv_sse2.cc', 1084 'base/simd/convert_rgb_to_yuv_sse2.cc',
1067 'base/simd/convert_rgb_to_yuv_ssse3.cc', 1085 'base/simd/convert_rgb_to_yuv_ssse3.cc',
1068 'base/simd/convert_yuv_to_rgb_x86.cc', 1086 'base/simd/convert_yuv_to_rgb_x86.cc',
1069 'base/simd/filter_yuv_sse2.cc', 1087 'base/simd/filter_yuv_sse2.cc',
1070 ], 1088 ],
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
1114 'media_test_support', 1132 'media_test_support',
1115 'shared_memory_support', 1133 'shared_memory_support',
1116 '../base/base.gyp:base', 1134 '../base/base.gyp:base',
1117 '../base/base.gyp:base_i18n', 1135 '../base/base.gyp:base_i18n',
1118 '../base/base.gyp:test_support_base', 1136 '../base/base.gyp:test_support_base',
1119 '../gpu/gpu.gyp:command_buffer_common', 1137 '../gpu/gpu.gyp:command_buffer_common',
1120 '../gpu/gpu.gyp:gpu_unittest_utils', 1138 '../gpu/gpu.gyp:gpu_unittest_utils',
1121 '../skia/skia.gyp:skia', 1139 '../skia/skia.gyp:skia',
1122 '../testing/gmock.gyp:gmock', 1140 '../testing/gmock.gyp:gmock',
1123 '../testing/gtest.gyp:gtest', 1141 '../testing/gtest.gyp:gtest',
1142 '../third_party/boringssl/boringssl.gyp:boringssl',
1124 '../third_party/libwebm/libwebm.gyp:libwebm', 1143 '../third_party/libwebm/libwebm.gyp:libwebm',
1125 '../third_party/libyuv/libyuv.gyp:libyuv', 1144 '../third_party/libyuv/libyuv.gyp:libyuv',
1126 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', 1145 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
1127 '../ui/gfx/gfx.gyp:gfx', 1146 '../ui/gfx/gfx.gyp:gfx',
1128 '../ui/gfx/gfx.gyp:gfx_geometry', 1147 '../ui/gfx/gfx.gyp:gfx_geometry',
1129 '../ui/gfx/gfx.gyp:gfx_test_support', 1148 '../ui/gfx/gfx.gyp:gfx_test_support',
1130 '../url/url.gyp:url_lib', 1149 '../url/url.gyp:url_lib',
1131 ], 1150 ],
1132 'sources': [ 1151 'sources': [
1133 '<@(capture_unittests_sources)', 1152 '<@(capture_unittests_sources)',
(...skipping 1149 matching lines...) Expand 10 before | Expand all | Expand 10 after
2283 'dependencies': [ 2302 'dependencies': [
2284 '../build/linux/system.gyp:libdrm', 2303 '../build/linux/system.gyp:libdrm',
2285 ] 2304 ]
2286 }], 2305 }],
2287 ], 2306 ],
2288 } 2307 }
2289 ] 2308 ]
2290 }], 2309 }],
2291 ], 2310 ],
2292 } 2311 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698