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

Side by Side Diff: media/media.gyp

Issue 1539983004: Convert enable_mpeg2ts into a new-style buildflag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove redundant ffmpeg_branding introduced by incorrect merge 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 30 matching lines...) Expand all
41 'enable_hevc_demuxing%': 0, 41 'enable_hevc_demuxing%': 0,
42 }], 42 }],
43 ], 43 ],
44 }, 44 },
45 'includes': [ 45 'includes': [
46 'media_cdm.gypi', 46 'media_cdm.gypi',
47 'media_variables.gypi', 47 'media_variables.gypi',
48 ], 48 ],
49 'targets': [ 49 'targets': [
50 { 50 {
51 # GN version: //media:media_features
52 'target_name': 'media_features',
53 'includes': [ '../build/buildflag_header.gypi' ],
54 'variables': {
55 'buildflag_header_path': 'media/media_features.h',
56 'variables': {
57 'conditions': [
58 ['chromecast == 1', {
59 'enable_mse_mpeg2ts_stream_parser%': 1,
60 }, {
61 'enable_mse_mpeg2ts_stream_parser%': 0,
62 }],
63 ],
64 },
65 'buildflag_flags': [
66 "ENABLE_MSE_MPEG2TS_STREAM_PARSER=<(enable_mse_mpeg2ts_stream_parser)" ,
67 ],
68 },
69 },
70 {
51 # GN version: //media 71 # GN version: //media
52 'target_name': 'media', 72 'target_name': 'media',
53 'type': '<(component)', 73 'type': '<(component)',
54 'dependencies': [ 74 'dependencies': [
75 'media_features',
55 '../base/base.gyp:base', 76 '../base/base.gyp:base',
56 '../base/base.gyp:base_i18n', 77 '../base/base.gyp:base_i18n',
57 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 78 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
58 '../crypto/crypto.gyp:crypto', 79 '../crypto/crypto.gyp:crypto',
59 '../gpu/gpu.gyp:command_buffer_common', 80 '../gpu/gpu.gyp:command_buffer_common',
60 '../skia/skia.gyp:skia', 81 '../skia/skia.gyp:skia',
61 '../third_party/libwebm/libwebm.gyp:libwebm', 82 '../third_party/libwebm/libwebm.gyp:libwebm',
62 '../third_party/libyuv/libyuv.gyp:libyuv', 83 '../third_party/libyuv/libyuv.gyp:libyuv',
63 '../third_party/opus/opus.gyp:opus', 84 '../third_party/opus/opus.gyp:opus',
64 '../ui/events/events.gyp:events_base', 85 '../ui/events/events.gyp:events_base',
(...skipping 967 matching lines...) Expand 10 before | Expand all | Expand 10 after
1032 ['proprietary_codecs==1', { 1053 ['proprietary_codecs==1', {
1033 'sources': [ 1054 'sources': [
1034 'cdm/cenc_utils.cc', 1055 'cdm/cenc_utils.cc',
1035 'cdm/cenc_utils.h', 1056 'cdm/cenc_utils.h',
1036 'filters/ffmpeg_aac_bitstream_converter.cc', 1057 'filters/ffmpeg_aac_bitstream_converter.cc',
1037 'filters/ffmpeg_aac_bitstream_converter.h', 1058 'filters/ffmpeg_aac_bitstream_converter.h',
1038 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc', 1059 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc',
1039 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.h', 1060 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.h',
1040 'filters/h264_to_annex_b_bitstream_converter.cc', 1061 'filters/h264_to_annex_b_bitstream_converter.cc',
1041 'filters/h264_to_annex_b_bitstream_converter.h', 1062 'filters/h264_to_annex_b_bitstream_converter.h',
1042 'formats/mp2t/es_adapter_video.cc', 1063 'formats/mp2t/es_adapter_video.cc',
ddorwin 2016/01/04 22:19:45 Ditto.
1043 'formats/mp2t/es_adapter_video.h', 1064 'formats/mp2t/es_adapter_video.h',
1044 'formats/mp2t/es_parser.cc', 1065 'formats/mp2t/es_parser.cc',
1045 'formats/mp2t/es_parser.h', 1066 'formats/mp2t/es_parser.h',
1046 'formats/mp2t/es_parser_adts.cc', 1067 'formats/mp2t/es_parser_adts.cc',
1047 'formats/mp2t/es_parser_adts.h', 1068 'formats/mp2t/es_parser_adts.h',
1048 'formats/mp2t/es_parser_h264.cc', 1069 'formats/mp2t/es_parser_h264.cc',
1049 'formats/mp2t/es_parser_h264.h', 1070 'formats/mp2t/es_parser_h264.h',
1050 'formats/mp2t/es_parser_mpeg1audio.cc', 1071 'formats/mp2t/es_parser_mpeg1audio.cc',
1051 'formats/mp2t/es_parser_mpeg1audio.h', 1072 'formats/mp2t/es_parser_mpeg1audio.h',
1052 'formats/mp2t/mp2t_common.h', 1073 'formats/mp2t/mp2t_common.h',
(...skipping 1089 matching lines...) Expand 10 before | Expand all | Expand 10 after
2142 'dependencies': [ 2163 'dependencies': [
2143 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2164 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2144 ], 2165 ],
2145 }], 2166 }],
2146 ], 2167 ],
2147 }, 2168 },
2148 ], 2169 ],
2149 }], 2170 }],
2150 ], 2171 ],
2151 } 2172 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698