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

Side by Side Diff: media/media.gyp

Issue 1129643002: Moved media mime type and codec checks to media/base/mime_util.* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: CR feedback fixes Created 5 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 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 'base/media_keys.h', 323 'base/media_keys.h',
324 'base/media_log.cc', 324 'base/media_log.cc',
325 'base/media_log.h', 325 'base/media_log.h',
326 'base/media_log_event.h', 326 'base/media_log_event.h',
327 'base/media_permission.cc', 327 'base/media_permission.cc',
328 'base/media_permission.h', 328 'base/media_permission.h',
329 'base/media_posix.cc', 329 'base/media_posix.cc',
330 'base/media_switches.cc', 330 'base/media_switches.cc',
331 'base/media_switches.h', 331 'base/media_switches.h',
332 'base/media_win.cc', 332 'base/media_win.cc',
333 'base/mime_util.cc',
334 'base/mime_util.h',
333 'base/moving_average.cc', 335 'base/moving_average.cc',
334 'base/moving_average.h', 336 'base/moving_average.h',
335 'base/multi_channel_resampler.cc', 337 'base/multi_channel_resampler.cc',
336 'base/multi_channel_resampler.h', 338 'base/multi_channel_resampler.h',
337 'base/pipeline.cc', 339 'base/pipeline.cc',
338 'base/pipeline.h', 340 'base/pipeline.h',
339 'base/pipeline_status.h', 341 'base/pipeline_status.h',
340 'base/player_tracker.cc', 342 'base/player_tracker.cc',
341 'base/player_tracker.h', 343 'base/player_tracker.h',
342 'base/ranges.cc', 344 'base/ranges.cc',
(...skipping 686 matching lines...) Expand 10 before | Expand all | Expand 10 after
1029 'formats/mpeg/adts_constants.cc', 1031 'formats/mpeg/adts_constants.cc',
1030 'formats/mpeg/adts_constants.h', 1032 'formats/mpeg/adts_constants.h',
1031 'formats/mpeg/adts_stream_parser.cc', 1033 'formats/mpeg/adts_stream_parser.cc',
1032 'formats/mpeg/adts_stream_parser.h', 1034 'formats/mpeg/adts_stream_parser.h',
1033 'formats/mpeg/mpeg1_audio_stream_parser.cc', 1035 'formats/mpeg/mpeg1_audio_stream_parser.cc',
1034 'formats/mpeg/mpeg1_audio_stream_parser.h', 1036 'formats/mpeg/mpeg1_audio_stream_parser.h',
1035 'formats/mpeg/mpeg_audio_stream_parser_base.cc', 1037 'formats/mpeg/mpeg_audio_stream_parser_base.cc',
1036 'formats/mpeg/mpeg_audio_stream_parser_base.h', 1038 'formats/mpeg/mpeg_audio_stream_parser_base.h',
1037 ], 1039 ],
1038 }], 1040 }],
1039 ['target_arch=="ia32" or target_arch=="x64"', { 1041 ['OS != "ios" and (target_arch=="ia32" or target_arch=="x64")', {
ddorwin 2015/05/14 18:09:59 Why is this necessary if iOS doesn't use the media
servolk 2015/05/14 22:30:49 Strictly speaking this is unnecessary for this CL,
1040 'dependencies': [ 1042 'dependencies': [
1041 'media_asm', 1043 'media_asm',
1042 'media_sse2', 1044 'media_sse2',
1043 ], 1045 ],
1044 'sources': [ 1046 'sources': [
1045 'base/simd/convert_yuv_to_rgb_x86.cc', 1047 'base/simd/convert_yuv_to_rgb_x86.cc',
1046 ], 1048 ],
1047 }], 1049 }],
1048 ['OS!="linux" and OS!="win"', { 1050 ['OS!="linux" and OS!="win"', {
1049 'sources!': [ 1051 'sources!': [
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
1130 'base/channel_mixing_matrix_unittest.cc', 1132 'base/channel_mixing_matrix_unittest.cc',
1131 'base/container_names_unittest.cc', 1133 'base/container_names_unittest.cc',
1132 'base/data_buffer_unittest.cc', 1134 'base/data_buffer_unittest.cc',
1133 'base/decoder_buffer_queue_unittest.cc', 1135 'base/decoder_buffer_queue_unittest.cc',
1134 'base/decoder_buffer_unittest.cc', 1136 'base/decoder_buffer_unittest.cc',
1135 'base/djb2_unittest.cc', 1137 'base/djb2_unittest.cc',
1136 'base/gmock_callback_support_unittest.cc', 1138 'base/gmock_callback_support_unittest.cc',
1137 'base/key_systems_unittest.cc', 1139 'base/key_systems_unittest.cc',
1138 'base/mac/video_frame_mac_unittests.cc', 1140 'base/mac/video_frame_mac_unittests.cc',
1139 'base/media_file_checker_unittest.cc', 1141 'base/media_file_checker_unittest.cc',
1142 'base/mime_util_unittest.cc',
1140 'base/moving_average_unittest.cc', 1143 'base/moving_average_unittest.cc',
1141 'base/multi_channel_resampler_unittest.cc', 1144 'base/multi_channel_resampler_unittest.cc',
1142 'base/null_video_sink_unittest.cc', 1145 'base/null_video_sink_unittest.cc',
1143 'base/pipeline_unittest.cc', 1146 'base/pipeline_unittest.cc',
1144 'base/ranges_unittest.cc', 1147 'base/ranges_unittest.cc',
1145 'base/run_all_unittests.cc', 1148 'base/run_all_unittests.cc',
1146 'base/seekable_buffer_unittest.cc', 1149 'base/seekable_buffer_unittest.cc',
1147 'base/serial_runner_unittest.cc', 1150 'base/serial_runner_unittest.cc',
1148 'base/sinc_resampler_unittest.cc', 1151 'base/sinc_resampler_unittest.cc',
1149 'base/stream_parser_unittest.cc', 1152 'base/stream_parser_unittest.cc',
(...skipping 804 matching lines...) Expand 10 before | Expand all | Expand 10 after
1954 '../build/isolate.gypi', 1957 '../build/isolate.gypi',
1955 ], 1958 ],
1956 'sources': [ 1959 'sources': [
1957 'audio_unittests.isolate', 1960 'audio_unittests.isolate',
1958 ], 1961 ],
1959 }, 1962 },
1960 ], 1963 ],
1961 }], 1964 }],
1962 ], 1965 ],
1963 } 1966 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698