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

Side by Side Diff: media/media.gyp

Issue 7193001: Move rtc_video_decoder* from media/filter/ to content/renderer/media/. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 9 years, 5 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/filters/rtc_video_decoder_unittest.cc ('k') | webkit/glue/webmediaplayer_impl.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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'player_x11_renderer%': 'x11', 8 'player_x11_renderer%': 'x11',
9 }, 9 },
10 'targets': [ 10 'targets': [
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 'filters/file_data_source.cc', 171 'filters/file_data_source.cc',
172 'filters/file_data_source.h', 172 'filters/file_data_source.h',
173 'filters/file_data_source_factory.cc', 173 'filters/file_data_source_factory.cc',
174 'filters/file_data_source_factory.h', 174 'filters/file_data_source_factory.h',
175 'filters/in_memory_url_protocol.cc', 175 'filters/in_memory_url_protocol.cc',
176 'filters/in_memory_url_protocol.h', 176 'filters/in_memory_url_protocol.h',
177 'filters/null_audio_renderer.cc', 177 'filters/null_audio_renderer.cc',
178 'filters/null_audio_renderer.h', 178 'filters/null_audio_renderer.h',
179 'filters/null_video_renderer.cc', 179 'filters/null_video_renderer.cc',
180 'filters/null_video_renderer.h', 180 'filters/null_video_renderer.h',
181 'filters/rtc_video_decoder.cc',
182 'filters/rtc_video_decoder.h',
183 'filters/video_renderer_base.cc', 181 'filters/video_renderer_base.cc',
184 'filters/video_renderer_base.h', 182 'filters/video_renderer_base.h',
185 'video/capture/fake_video_capture_device.cc', 183 'video/capture/fake_video_capture_device.cc',
186 'video/capture/fake_video_capture_device.h', 184 'video/capture/fake_video_capture_device.h',
187 'video/capture/linux/video_capture_device_linux.cc', 185 'video/capture/linux/video_capture_device_linux.cc',
188 'video/capture/linux/video_capture_device_linux.h', 186 'video/capture/linux/video_capture_device_linux.h',
189 'video/capture/video_capture.h', 187 'video/capture/video_capture.h',
190 'video/capture/video_capture_device.h', 188 'video/capture/video_capture_device.h',
191 'video/capture/win/filter_base_win.cc', 189 'video/capture/win/filter_base_win.cc',
192 'video/capture/win/filter_base_win.h', 190 'video/capture/win/filter_base_win.h',
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 }, 383 },
386 { 384 {
387 'target_name': 'media_unittests', 385 'target_name': 'media_unittests',
388 'type': 'executable', 386 'type': 'executable',
389 'dependencies': [ 387 'dependencies': [
390 'media', 388 'media',
391 'media_test_support', 389 'media_test_support',
392 '../base/base.gyp:base', 390 '../base/base.gyp:base',
393 '../base/base.gyp:base_i18n', 391 '../base/base.gyp:base_i18n',
394 '../base/base.gyp:test_support_base', 392 '../base/base.gyp:test_support_base',
395 '../build/temp_gyp/googleurl.gyp:googleurl',
396 '../testing/gmock.gyp:gmock', 393 '../testing/gmock.gyp:gmock',
397 '../testing/gtest.gyp:gtest', 394 '../testing/gtest.gyp:gtest',
398 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 395 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
399 ], 396 ],
400 'sources': [ 397 'sources': [
401 'audio/audio_input_controller_unittest.cc', 398 'audio/audio_input_controller_unittest.cc',
402 'audio/audio_input_device_unittest.cc', 399 'audio/audio_input_device_unittest.cc',
403 'audio/audio_input_unittest.cc', 400 'audio/audio_input_unittest.cc',
404 'audio/audio_output_controller_unittest.cc', 401 'audio/audio_output_controller_unittest.cc',
405 'audio/audio_output_proxy_unittest.cc', 402 'audio/audio_output_proxy_unittest.cc',
(...skipping 27 matching lines...) Expand all
433 'filters/audio_renderer_algorithm_ola_unittest.cc', 430 'filters/audio_renderer_algorithm_ola_unittest.cc',
434 'filters/audio_renderer_base_unittest.cc', 431 'filters/audio_renderer_base_unittest.cc',
435 'filters/bitstream_converter_unittest.cc', 432 'filters/bitstream_converter_unittest.cc',
436 'filters/chunk_demuxer_unittest.cc', 433 'filters/chunk_demuxer_unittest.cc',
437 'filters/decoder_base_unittest.cc', 434 'filters/decoder_base_unittest.cc',
438 'filters/ffmpeg_demuxer_unittest.cc', 435 'filters/ffmpeg_demuxer_unittest.cc',
439 'filters/ffmpeg_glue_unittest.cc', 436 'filters/ffmpeg_glue_unittest.cc',
440 'filters/ffmpeg_h264_bitstream_converter_unittest.cc', 437 'filters/ffmpeg_h264_bitstream_converter_unittest.cc',
441 'filters/ffmpeg_video_decoder_unittest.cc', 438 'filters/ffmpeg_video_decoder_unittest.cc',
442 'filters/file_data_source_unittest.cc', 439 'filters/file_data_source_unittest.cc',
443 'filters/rtc_video_decoder_unittest.cc',
444 'filters/video_renderer_base_unittest.cc', 440 'filters/video_renderer_base_unittest.cc',
445 'video/capture/video_capture_device_unittest.cc', 441 'video/capture/video_capture_device_unittest.cc',
446 'video/ffmpeg_video_decode_engine_unittest.cc', 442 'video/ffmpeg_video_decode_engine_unittest.cc',
447 'webm/cluster_builder.cc', 443 'webm/cluster_builder.cc',
448 'webm/cluster_builder.h', 444 'webm/cluster_builder.h',
449 ], 445 ],
450 'conditions': [ 446 'conditions': [
451 ['os_posix==1 and OS!="mac"', { 447 ['os_posix==1 and OS!="mac"', {
452 'conditions': [ 448 'conditions': [
453 ['linux_use_tcmalloc==1', { 449 ['linux_use_tcmalloc==1', {
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
740 ], 736 ],
741 }], 737 }],
742 ], 738 ],
743 } 739 }
744 740
745 # Local Variables: 741 # Local Variables:
746 # tab-width:2 742 # tab-width:2
747 # indent-tabs-mode:nil 743 # indent-tabs-mode:nil
748 # End: 744 # End:
749 # vim: set expandtab tabstop=2 shiftwidth=2: 745 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « media/filters/rtc_video_decoder_unittest.cc ('k') | webkit/glue/webmediaplayer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698