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

Side by Side Diff: media/media.gyp

Issue 11416367: Add Opus decode wrapper to media. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase on updates to webkit/media/filter_helpers.cc Created 8 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 | Annotate | Revision Log
« no previous file with comments | « media/filters/opus_audio_decoder.cc ('k') | webkit/media/filter_helpers.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 PulseAudio library. 8 # Override to dynamically link the PulseAudio library.
9 'use_pulseaudio%': 0, 9 'use_pulseaudio%': 0,
10 # Override to dynamically link the cras (ChromeOS audio) library. 10 # Override to dynamically link the cras (ChromeOS audio) library.
11 'use_cras%': 0, 11 'use_cras%': 0,
12 'conditions': [ 12 'conditions': [
13 ['OS == "android" or OS == "ios"', { 13 ['OS == "android" or OS == "ios"', {
14 # Android and iOS don't use ffmpeg. 14 # Android and iOS don't use ffmpeg.
15 'use_ffmpeg%': 0, 15 'use_ffmpeg%': 0,
16 }, { # 'OS != "android" and OS != "ios"' 16 }, { # 'OS != "android" and OS != "ios"'
17 'use_ffmpeg%': 1, 17 'use_ffmpeg%': 1,
18 }], 18 }],
19 ], 19 ],
20 }, 20 },
21 'targets': [ 21 'targets': [
22 { 22 {
23 'target_name': 'media', 23 'target_name': 'media',
24 'type': '<(component)', 24 'type': '<(component)',
25 'dependencies': [ 25 'dependencies': [
26 '../base/base.gyp:base', 26 '../base/base.gyp:base',
27 '../build/temp_gyp/googleurl.gyp:googleurl', 27 '../build/temp_gyp/googleurl.gyp:googleurl',
28 '../crypto/crypto.gyp:crypto', 28 '../crypto/crypto.gyp:crypto',
29 '../skia/skia.gyp:skia', 29 '../skia/skia.gyp:skia',
30 '../third_party/opus/opus.gyp:opus',
30 '../ui/ui.gyp:ui', 31 '../ui/ui.gyp:ui',
31 ], 32 ],
32 'defines': [ 33 'defines': [
33 'MEDIA_IMPLEMENTATION', 34 'MEDIA_IMPLEMENTATION',
34 ], 35 ],
35 'include_dirs': [ 36 'include_dirs': [
36 '..', 37 '..',
37 ], 38 ],
38 'sources': [ 39 'sources': [
39 'audio/android/audio_manager_android.cc', 40 'audio/android/audio_manager_android.cc',
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 'filters/ffmpeg_video_decoder.cc', 293 'filters/ffmpeg_video_decoder.cc',
293 'filters/ffmpeg_video_decoder.h', 294 'filters/ffmpeg_video_decoder.h',
294 'filters/file_data_source.cc', 295 'filters/file_data_source.cc',
295 'filters/file_data_source.h', 296 'filters/file_data_source.h',
296 'filters/gpu_video_decoder.cc', 297 'filters/gpu_video_decoder.cc',
297 'filters/gpu_video_decoder.h', 298 'filters/gpu_video_decoder.h',
298 'filters/h264_to_annex_b_bitstream_converter.cc', 299 'filters/h264_to_annex_b_bitstream_converter.cc',
299 'filters/h264_to_annex_b_bitstream_converter.h', 300 'filters/h264_to_annex_b_bitstream_converter.h',
300 'filters/in_memory_url_protocol.cc', 301 'filters/in_memory_url_protocol.cc',
301 'filters/in_memory_url_protocol.h', 302 'filters/in_memory_url_protocol.h',
303 'filters/opus_audio_decoder.cc',
304 'filters/opus_audio_decoder.h',
302 'filters/skcanvas_video_renderer.cc', 305 'filters/skcanvas_video_renderer.cc',
303 'filters/skcanvas_video_renderer.h', 306 'filters/skcanvas_video_renderer.h',
304 'filters/source_buffer_stream.cc', 307 'filters/source_buffer_stream.cc',
305 'filters/source_buffer_stream.h', 308 'filters/source_buffer_stream.h',
306 'filters/video_decoder_selector.cc', 309 'filters/video_decoder_selector.cc',
307 'filters/video_decoder_selector.h', 310 'filters/video_decoder_selector.h',
308 'filters/video_frame_generator.cc', 311 'filters/video_frame_generator.cc',
309 'filters/video_frame_generator.h', 312 'filters/video_frame_generator.h',
310 'filters/video_renderer_base.cc', 313 'filters/video_renderer_base.cc',
311 'filters/video_renderer_base.h', 314 'filters/video_renderer_base.h',
(...skipping 1049 matching lines...) Expand 10 before | Expand all | Expand 10 after
1361 'media', 1364 'media',
1362 ], 1365 ],
1363 'sources': [ 1366 'sources': [
1364 'tools/media_bench/media_bench.cc', 1367 'tools/media_bench/media_bench.cc',
1365 ], 1368 ],
1366 }, 1369 },
1367 ], 1370 ],
1368 }] 1371 }]
1369 ], 1372 ],
1370 } 1373 }
OLDNEW
« no previous file with comments | « media/filters/opus_audio_decoder.cc ('k') | webkit/media/filter_helpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698