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

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: catch only IOException Created 7 years, 10 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 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 'filters/source_buffer_stream.cc', 315 'filters/source_buffer_stream.cc',
316 'filters/source_buffer_stream.h', 316 'filters/source_buffer_stream.h',
317 'filters/video_decoder_selector.cc', 317 'filters/video_decoder_selector.cc',
318 'filters/video_decoder_selector.h', 318 'filters/video_decoder_selector.h',
319 'filters/video_frame_generator.cc', 319 'filters/video_frame_generator.cc',
320 'filters/video_frame_generator.h', 320 'filters/video_frame_generator.h',
321 'filters/video_renderer_base.cc', 321 'filters/video_renderer_base.cc',
322 'filters/video_renderer_base.h', 322 'filters/video_renderer_base.h',
323 'filters/vpx_video_decoder.cc', 323 'filters/vpx_video_decoder.cc',
324 'filters/vpx_video_decoder.h', 324 'filters/vpx_video_decoder.h',
325 'video/capture/android/video_capture_device_android.cc',
326 'video/capture/android/video_capture_device_android.h',
325 'video/capture/fake_video_capture_device.cc', 327 'video/capture/fake_video_capture_device.cc',
326 'video/capture/fake_video_capture_device.h', 328 'video/capture/fake_video_capture_device.h',
327 'video/capture/linux/video_capture_device_linux.cc', 329 'video/capture/linux/video_capture_device_linux.cc',
328 'video/capture/linux/video_capture_device_linux.h', 330 'video/capture/linux/video_capture_device_linux.h',
329 'video/capture/mac/video_capture_device_mac.h', 331 'video/capture/mac/video_capture_device_mac.h',
330 'video/capture/mac/video_capture_device_mac.mm', 332 'video/capture/mac/video_capture_device_mac.mm',
331 'video/capture/mac/video_capture_device_qtkit_mac.h', 333 'video/capture/mac/video_capture_device_qtkit_mac.h',
332 'video/capture/mac/video_capture_device_qtkit_mac.mm', 334 'video/capture/mac/video_capture_device_qtkit_mac.mm',
333 'video/capture/screen/differ.cc', 335 'video/capture/screen/differ.cc',
334 'video/capture/screen/differ.h', 336 'video/capture/screen/differ.h',
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
507 }], 509 }],
508 ['OS == "android"', { 510 ['OS == "android"', {
509 'sources': [ 511 'sources': [
510 'base/media_stub.cc', 512 'base/media_stub.cc',
511 ], 513 ],
512 'link_settings': { 514 'link_settings': {
513 'libraries': [ 515 'libraries': [
514 '-lOpenSLES', 516 '-lOpenSLES',
515 ], 517 ],
516 }, 518 },
519 'include_dirs': [
520 '<(SHARED_INTERMEDIATE_DIR)/media',
521 ],
522 'dependencies': [
523 'video_capture_android_jni_headers',
524 ],
517 }], 525 }],
518 # A simple WebM encoder for animated avatars on ChromeOS. 526 # A simple WebM encoder for animated avatars on ChromeOS.
519 ['chromeos==1', { 527 ['chromeos==1', {
520 'dependencies': [ 528 'dependencies': [
521 '../third_party/libvpx/libvpx.gyp:libvpx', 529 '../third_party/libvpx/libvpx.gyp:libvpx',
522 '../third_party/libyuv/libyuv.gyp:libyuv', 530 '../third_party/libyuv/libyuv.gyp:libyuv',
523 ], 531 ],
524 'sources': [ 532 'sources': [
525 'webm/chromeos/ebml_writer.cc', 533 'webm/chromeos/ebml_writer.cc',
526 'webm/chromeos/ebml_writer.h', 534 'webm/chromeos/ebml_writer.h',
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
604 'defines': [ 612 'defines': [
605 'USE_PULSEAUDIO', 613 'USE_PULSEAUDIO',
606 ], 614 ],
607 }, { # else: use_pulseaudio == 0 615 }, { # else: use_pulseaudio == 0
608 'sources!': [ 616 'sources!': [
609 'audio/pulse/pulse_output.cc', 617 'audio/pulse/pulse_output.cc',
610 'audio/pulse/pulse_output.h', 618 'audio/pulse/pulse_output.h',
611 ], 619 ],
612 }], 620 }],
613 ], 621 ],
614 }],
615 ['os_posix == 1 and OS != "android"', {
616 # Video capture isn't supported in Android yet.
617 'sources!': [ 622 'sources!': [
618 'video/capture/video_capture_device_dummy.cc', 623 'video/capture/video_capture_device_dummy.cc',
619 'video/capture/video_capture_device_dummy.h', 624 'video/capture/video_capture_device_dummy.h',
620 ], 625 ],
621 }], 626 }],
622 ['OS=="mac"', { 627 ['OS=="mac"', {
623 'link_settings': { 628 'link_settings': {
624 'libraries': [ 629 'libraries': [
625 '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework', 630 '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework',
626 '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework', 631 '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework',
(...skipping 664 matching lines...) Expand 10 before | Expand all | Expand 10 after
1291 'sources': [ 1296 'sources': [
1292 'base/android/java/src/org/chromium/media/MediaPlayerBridge.java', 1297 'base/android/java/src/org/chromium/media/MediaPlayerBridge.java',
1293 'base/android/java/src/org/chromium/media/MediaPlayerListener.java', 1298 'base/android/java/src/org/chromium/media/MediaPlayerListener.java',
1294 ], 1299 ],
1295 'variables': { 1300 'variables': {
1296 'jni_gen_dir': 'media', 1301 'jni_gen_dir': 'media',
1297 }, 1302 },
1298 'includes': [ '../build/jni_generator.gypi' ], 1303 'includes': [ '../build/jni_generator.gypi' ],
1299 }, 1304 },
1300 { 1305 {
1306 'target_name': 'camera_jni_headers',
1307 'type': 'none',
1308 'variables': {
1309 'jni_gen_dir': 'media',
1310 'input_java_class': 'android/hardware/Camera.class',
1311 'input_jar_file': '<(android_sdk)/android.jar',
1312 },
1313 'includes': [ '../build/jar_file_jni_generator.gypi' ],
1314 },
1315 {
1316 'target_name': 'video_capture_android_jni_headers',
1317 'type': 'none',
1318 'dependencies': [
1319 'camera_jni_headers',
1320 ],
1321 'sources': [
1322 'base/android/java/src/org/chromium/media/VideoCapture.java',
1323 ],
1324 'variables': {
1325 'jni_gen_dir': 'media',
1326 },
1327 'includes': [ '../build/jni_generator.gypi' ],
1328 },
1329 {
1301 'target_name': 'player_android', 1330 'target_name': 'player_android',
1302 'type': 'static_library', 1331 'type': 'static_library',
1303 'sources': [ 1332 'sources': [
1304 'base/android/media_jni_registrar.cc', 1333 'base/android/media_jni_registrar.cc',
1305 'base/android/media_jni_registrar.h', 1334 'base/android/media_jni_registrar.h',
1306 'base/android/media_player_bridge.cc', 1335 'base/android/media_player_bridge.cc',
1307 'base/android/media_player_bridge.h', 1336 'base/android/media_player_bridge.h',
1308 'base/android/media_player_listener.cc', 1337 'base/android/media_player_listener.cc',
1309 'base/android/media_player_listener.h', 1338 'base/android/media_player_listener.h',
1310 ], 1339 ],
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
1445 ], 1474 ],
1446 'sources': [ 1475 'sources': [
1447 'video/capture/screen/differ_block_sse2.cc', 1476 'video/capture/screen/differ_block_sse2.cc',
1448 'video/capture/screen/differ_block_sse2.h', 1477 'video/capture/screen/differ_block_sse2.h',
1449 ], 1478 ],
1450 }, # end of target differ_block_sse2 1479 }, # end of target differ_block_sse2
1451 ], 1480 ],
1452 }], 1481 }],
1453 ], 1482 ],
1454 } 1483 }
OLDNEW
« no previous file with comments | « media/base/android/media_jni_registrar.cc ('k') | media/video/capture/android/video_capture_device_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698