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

Side by Side Diff: media/media.gyp

Issue 478043005: Add the mp2t mimetype to the list of supported mime types. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address CR comments from patch set #1. Created 6 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « media/BUILD.gn ('k') | net/base/mime_util.cc » ('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 950 matching lines...) Expand 10 before | Expand all | Expand 10 after
961 'formats/mp4/track_run_iterator.h', 961 'formats/mp4/track_run_iterator.h',
962 'formats/mpeg/adts_constants.cc', 962 'formats/mpeg/adts_constants.cc',
963 'formats/mpeg/adts_constants.h', 963 'formats/mpeg/adts_constants.h',
964 'formats/mpeg/adts_stream_parser.cc', 964 'formats/mpeg/adts_stream_parser.cc',
965 'formats/mpeg/adts_stream_parser.h', 965 'formats/mpeg/adts_stream_parser.h',
966 'formats/mpeg/mp3_stream_parser.cc', 966 'formats/mpeg/mp3_stream_parser.cc',
967 'formats/mpeg/mp3_stream_parser.h', 967 'formats/mpeg/mp3_stream_parser.h',
968 'formats/mpeg/mpeg_audio_stream_parser_base.cc', 968 'formats/mpeg/mpeg_audio_stream_parser_base.cc',
969 'formats/mpeg/mpeg_audio_stream_parser_base.h', 969 'formats/mpeg/mpeg_audio_stream_parser_base.h',
970 ], 970 ],
971 'conditions': [
972 ['enable_mpeg2ts_stream_parser==1', {
973 'defines': [
974 'ENABLE_MPEG2TS_STREAM_PARSER',
975 ],
976 }],
977 ],
978 }], 971 }],
979 ['target_arch=="ia32" or target_arch=="x64"', { 972 ['target_arch=="ia32" or target_arch=="x64"', {
980 'dependencies': [ 973 'dependencies': [
981 'media_asm', 974 'media_asm',
982 'media_mmx', 975 'media_mmx',
983 'media_sse2', 976 'media_sse2',
984 ], 977 ],
985 'sources': [ 978 'sources': [
986 'base/simd/convert_yuv_to_rgb_x86.cc', 979 'base/simd/convert_yuv_to_rgb_x86.cc',
987 ], 980 ],
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
1257 'formats/mp4/avc_unittest.cc', 1250 'formats/mp4/avc_unittest.cc',
1258 'formats/mp4/box_reader_unittest.cc', 1251 'formats/mp4/box_reader_unittest.cc',
1259 'formats/mp4/es_descriptor_unittest.cc', 1252 'formats/mp4/es_descriptor_unittest.cc',
1260 'formats/mp4/mp4_stream_parser_unittest.cc', 1253 'formats/mp4/mp4_stream_parser_unittest.cc',
1261 'formats/mp4/sample_to_group_iterator_unittest.cc', 1254 'formats/mp4/sample_to_group_iterator_unittest.cc',
1262 'formats/mp4/track_run_iterator_unittest.cc', 1255 'formats/mp4/track_run_iterator_unittest.cc',
1263 'formats/mpeg/adts_stream_parser_unittest.cc', 1256 'formats/mpeg/adts_stream_parser_unittest.cc',
1264 'formats/mpeg/mp3_stream_parser_unittest.cc', 1257 'formats/mpeg/mp3_stream_parser_unittest.cc',
1265 ], 1258 ],
1266 }], 1259 }],
1267 ['enable_mpeg2ts_stream_parser==1', {
1268 'defines': [
1269 'ENABLE_MPEG2TS_STREAM_PARSER',
1270 ],
1271 }],
1272 # TODO(wolenetz): Fix size_t to int truncations in win64. See 1260 # TODO(wolenetz): Fix size_t to int truncations in win64. See
1273 # http://crbug.com/171009 1261 # http://crbug.com/171009
1274 ['OS=="win" and target_arch=="x64"', { 1262 ['OS=="win" and target_arch=="x64"', {
1275 'msvs_disabled_warnings': [ 4267, ], 1263 'msvs_disabled_warnings': [ 4267, ],
1276 }], 1264 }],
1277 ['OS=="mac"', { 1265 ['OS=="mac"', {
1278 'sources': [ 1266 'sources': [
1279 'video/capture/mac/video_capture_device_factory_mac_unittest.mm', 1267 'video/capture/mac/video_capture_device_factory_mac_unittest.mm',
1280 ] 1268 ]
1281 }], 1269 }],
(...skipping 463 matching lines...) Expand 10 before | Expand all | Expand 10 after
1745 ], 1733 ],
1746 }], 1734 }],
1747 ], 1735 ],
1748 }], 1736 }],
1749 ], 1737 ],
1750 }, 1738 },
1751 ], 1739 ],
1752 }], 1740 }],
1753 ], 1741 ],
1754 } 1742 }
OLDNEW
« no previous file with comments | « media/BUILD.gn ('k') | net/base/mime_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698