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

Side by Side Diff: media/media.gyp

Issue 11860002: Add video capture on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 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
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.
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 'filters/skcanvas_video_renderer.cc', 306 'filters/skcanvas_video_renderer.cc',
307 'filters/skcanvas_video_renderer.h', 307 'filters/skcanvas_video_renderer.h',
308 'filters/source_buffer_stream.cc', 308 'filters/source_buffer_stream.cc',
309 'filters/source_buffer_stream.h', 309 'filters/source_buffer_stream.h',
310 'filters/video_decoder_selector.cc', 310 'filters/video_decoder_selector.cc',
311 'filters/video_decoder_selector.h', 311 'filters/video_decoder_selector.h',
312 'filters/video_frame_generator.cc', 312 'filters/video_frame_generator.cc',
313 'filters/video_frame_generator.h', 313 'filters/video_frame_generator.h',
314 'filters/video_renderer_base.cc', 314 'filters/video_renderer_base.cc',
315 'filters/video_renderer_base.h', 315 'filters/video_renderer_base.h',
316 'video/capture/android/video_capture_device_android.cc',
317 'video/capture/android/video_capture_device_android.h',
316 'video/capture/fake_video_capture_device.cc', 318 'video/capture/fake_video_capture_device.cc',
317 'video/capture/fake_video_capture_device.h', 319 'video/capture/fake_video_capture_device.h',
318 'video/capture/linux/video_capture_device_linux.cc', 320 'video/capture/linux/video_capture_device_linux.cc',
319 'video/capture/linux/video_capture_device_linux.h', 321 'video/capture/linux/video_capture_device_linux.h',
320 'video/capture/mac/video_capture_device_mac.h', 322 'video/capture/mac/video_capture_device_mac.h',
321 'video/capture/mac/video_capture_device_mac.mm', 323 'video/capture/mac/video_capture_device_mac.mm',
322 'video/capture/mac/video_capture_device_qtkit_mac.h', 324 'video/capture/mac/video_capture_device_qtkit_mac.h',
323 'video/capture/mac/video_capture_device_qtkit_mac.mm', 325 'video/capture/mac/video_capture_device_qtkit_mac.mm',
324 'video/capture/video_capture.h', 326 'video/capture/video_capture.h',
325 'video/capture/video_capture_device.h', 327 'video/capture/video_capture_device.h',
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
453 }], 455 }],
454 ['OS == "android"', { 456 ['OS == "android"', {
455 'sources': [ 457 'sources': [
456 'base/media_stub.cc', 458 'base/media_stub.cc',
457 ], 459 ],
458 'link_settings': { 460 'link_settings': {
459 'libraries': [ 461 'libraries': [
460 '-lOpenSLES', 462 '-lOpenSLES',
461 ], 463 ],
462 }, 464 },
465 'include_dirs': [
466 '<(SHARED_INTERMEDIATE_DIR)/media',
467 ],
468 'dependencies': [
469 'video_capture_android_jni_headers',
470 ],
463 }], 471 }],
464 # A simple WebM encoder for animated avatars on ChromeOS. 472 # A simple WebM encoder for animated avatars on ChromeOS.
465 ['chromeos==1', { 473 ['chromeos==1', {
466 'dependencies': [ 474 'dependencies': [
467 '../third_party/libvpx/libvpx.gyp:libvpx', 475 '../third_party/libvpx/libvpx.gyp:libvpx',
468 '../third_party/libyuv/libyuv.gyp:libyuv', 476 '../third_party/libyuv/libyuv.gyp:libyuv',
469 ], 477 ],
470 'sources': [ 478 'sources': [
471 'webm/chromeos/ebml_writer.cc', 479 'webm/chromeos/ebml_writer.cc',
472 'webm/chromeos/ebml_writer.h', 480 'webm/chromeos/ebml_writer.h',
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
542 'defines': [ 550 'defines': [
543 'USE_PULSEAUDIO', 551 'USE_PULSEAUDIO',
544 ], 552 ],
545 }, { # else: use_pulseaudio == 0 553 }, { # else: use_pulseaudio == 0
546 'sources!': [ 554 'sources!': [
547 'audio/pulse/pulse_output.cc', 555 'audio/pulse/pulse_output.cc',
548 'audio/pulse/pulse_output.h', 556 'audio/pulse/pulse_output.h',
549 ], 557 ],
550 }], 558 }],
551 ], 559 ],
552 }],
553 ['os_posix == 1 and OS != "android"', {
554 # Video capture isn't supported in Android yet.
555 'sources!': [ 560 'sources!': [
556 'video/capture/video_capture_device_dummy.cc', 561 'video/capture/video_capture_device_dummy.cc',
557 'video/capture/video_capture_device_dummy.h', 562 'video/capture/video_capture_device_dummy.h',
558 ], 563 ],
559 }], 564 }],
560 ['OS=="mac"', { 565 ['OS=="mac"', {
561 'link_settings': { 566 'link_settings': {
562 'libraries': [ 567 'libraries': [
563 '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework', 568 '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework',
564 '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework', 569 '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework',
(...skipping 629 matching lines...) Expand 10 before | Expand all | Expand 10 after
1194 'sources': [ 1199 'sources': [
1195 'base/android/java/src/org/chromium/media/MediaPlayerBridge.java', 1200 'base/android/java/src/org/chromium/media/MediaPlayerBridge.java',
1196 'base/android/java/src/org/chromium/media/MediaPlayerListener.java', 1201 'base/android/java/src/org/chromium/media/MediaPlayerListener.java',
1197 ], 1202 ],
1198 'variables': { 1203 'variables': {
1199 'jni_gen_dir': 'media', 1204 'jni_gen_dir': 'media',
1200 }, 1205 },
1201 'includes': [ '../build/jni_generator.gypi' ], 1206 'includes': [ '../build/jni_generator.gypi' ],
1202 }, 1207 },
1203 { 1208 {
1209 'target_name': 'video_capture_android_jni_headers',
1210 'type': 'none',
1211 'sources': [
1212 'base/android/java/src/org/chromium/media/VideoCapture.java',
1213 ],
1214 'variables': {
1215 'jni_gen_dir': 'media',
1216 },
1217 'includes': [ '../build/jni_generator.gypi' ],
1218 },
1219 {
1204 'target_name': 'player_android', 1220 'target_name': 'player_android',
1205 'type': 'static_library', 1221 'type': 'static_library',
1206 'sources': [ 1222 'sources': [
1207 'base/android/media_jni_registrar.cc', 1223 'base/android/media_jni_registrar.cc',
1208 'base/android/media_jni_registrar.h', 1224 'base/android/media_jni_registrar.h',
1209 'base/android/media_player_bridge.cc', 1225 'base/android/media_player_bridge.cc',
1210 'base/android/media_player_bridge.h', 1226 'base/android/media_player_bridge.h',
1211 'base/android/media_player_listener.cc', 1227 'base/android/media_player_listener.cc',
1212 'base/android/media_player_listener.h', 1228 'base/android/media_player_listener.h',
1213 ], 1229 ],
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
1326 'media', 1342 'media',
1327 ], 1343 ],
1328 'sources': [ 1344 'sources': [
1329 'tools/media_bench/media_bench.cc', 1345 'tools/media_bench/media_bench.cc',
1330 ], 1346 ],
1331 }, 1347 },
1332 ], 1348 ],
1333 }] 1349 }]
1334 ], 1350 ],
1335 } 1351 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698