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

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: code review and rebase 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.
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 # Android and iOS don't use libvpx. 16 # Android and iOS don't use libvpx.
17 'use_libvpx%': 0, 17 'use_libvpx%': 0,
18 }, { # 'OS != "android" and OS != "ios"' 18 }, { # 'OS != "android" and OS != "ios"'
19 'use_ffmpeg%': 1, 19 'use_ffmpeg%': 1,
20 'use_libvpx%': 1, 20 'use_libvpx%': 1,
21 }], 21 }],
Ami GONE FROM CHROMIUM 2013/01/30 19:46:23 I wish you had separated addressing the code revie
22 # Screen capturer works only on Windows, OSX and Linux. 22 # Screen capturer works only on Windows, OSX and Linux.
23 ['OS=="win" or OS=="mac" or OS=="linux"', { 23 ['OS=="win" or OS=="mac" or OS=="linux"', {
24 'screen_capture_supported%': 1, 24 'screen_capture_supported%': 1,
25 }, { 25 }, {
26 'screen_capture_supported%': 0, 26 'screen_capture_supported%': 0,
27 }], 27 }],
28 ], 28 ],
29 }, 29 },
30 'targets': [ 30 'targets': [
31 { 31 {
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 'filters/source_buffer_stream.cc', 317 'filters/source_buffer_stream.cc',
318 'filters/source_buffer_stream.h', 318 'filters/source_buffer_stream.h',
319 'filters/video_decoder_selector.cc', 319 'filters/video_decoder_selector.cc',
320 'filters/video_decoder_selector.h', 320 'filters/video_decoder_selector.h',
321 'filters/video_frame_generator.cc', 321 'filters/video_frame_generator.cc',
322 'filters/video_frame_generator.h', 322 'filters/video_frame_generator.h',
323 'filters/video_renderer_base.cc', 323 'filters/video_renderer_base.cc',
324 'filters/video_renderer_base.h', 324 'filters/video_renderer_base.h',
325 'filters/vpx_video_decoder.cc', 325 'filters/vpx_video_decoder.cc',
326 'filters/vpx_video_decoder.h', 326 'filters/vpx_video_decoder.h',
327 'video/capture/android/video_capture_device_android.cc',
328 'video/capture/android/video_capture_device_android.h',
327 'video/capture/fake_video_capture_device.cc', 329 'video/capture/fake_video_capture_device.cc',
328 'video/capture/fake_video_capture_device.h', 330 'video/capture/fake_video_capture_device.h',
329 'video/capture/linux/video_capture_device_linux.cc', 331 'video/capture/linux/video_capture_device_linux.cc',
330 'video/capture/linux/video_capture_device_linux.h', 332 'video/capture/linux/video_capture_device_linux.h',
331 'video/capture/mac/video_capture_device_mac.h', 333 'video/capture/mac/video_capture_device_mac.h',
332 'video/capture/mac/video_capture_device_mac.mm', 334 'video/capture/mac/video_capture_device_mac.mm',
333 'video/capture/mac/video_capture_device_qtkit_mac.h', 335 'video/capture/mac/video_capture_device_qtkit_mac.h',
334 'video/capture/mac/video_capture_device_qtkit_mac.mm', 336 'video/capture/mac/video_capture_device_qtkit_mac.mm',
335 'video/capture/screen/differ.cc', 337 'video/capture/screen/differ.cc',
336 'video/capture/screen/differ.h', 338 'video/capture/screen/differ.h',
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
508 }], 510 }],
509 ['OS == "android"', { 511 ['OS == "android"', {
510 'sources': [ 512 'sources': [
511 'base/media_stub.cc', 513 'base/media_stub.cc',
512 ], 514 ],
513 'link_settings': { 515 'link_settings': {
514 'libraries': [ 516 'libraries': [
515 '-lOpenSLES', 517 '-lOpenSLES',
516 ], 518 ],
517 }, 519 },
520 'include_dirs': [
521 '<(SHARED_INTERMEDIATE_DIR)/media',
522 ],
523 'dependencies': [
524 'video_capture_android_jni_headers',
525 ],
518 }], 526 }],
519 # A simple WebM encoder for animated avatars on ChromeOS. 527 # A simple WebM encoder for animated avatars on ChromeOS.
520 ['chromeos==1', { 528 ['chromeos==1', {
521 'dependencies': [ 529 'dependencies': [
522 '../third_party/libvpx/libvpx.gyp:libvpx', 530 '../third_party/libvpx/libvpx.gyp:libvpx',
523 '../third_party/libyuv/libyuv.gyp:libyuv', 531 '../third_party/libyuv/libyuv.gyp:libyuv',
524 ], 532 ],
525 'sources': [ 533 'sources': [
526 'webm/chromeos/ebml_writer.cc', 534 'webm/chromeos/ebml_writer.cc',
527 'webm/chromeos/ebml_writer.h', 535 'webm/chromeos/ebml_writer.h',
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
605 'defines': [ 613 'defines': [
606 'USE_PULSEAUDIO', 614 'USE_PULSEAUDIO',
607 ], 615 ],
608 }, { # else: use_pulseaudio == 0 616 }, { # else: use_pulseaudio == 0
609 'sources!': [ 617 'sources!': [
610 'audio/pulse/pulse_output.cc', 618 'audio/pulse/pulse_output.cc',
611 'audio/pulse/pulse_output.h', 619 'audio/pulse/pulse_output.h',
612 ], 620 ],
613 }], 621 }],
614 ], 622 ],
615 }],
616 ['os_posix == 1 and OS != "android"', {
617 # Video capture isn't supported in Android yet.
618 'sources!': [ 623 'sources!': [
619 'video/capture/video_capture_device_dummy.cc', 624 'video/capture/video_capture_device_dummy.cc',
620 'video/capture/video_capture_device_dummy.h', 625 'video/capture/video_capture_device_dummy.h',
621 ], 626 ],
622 }], 627 }],
623 ['OS=="mac"', { 628 ['OS=="mac"', {
624 'link_settings': { 629 'link_settings': {
625 'libraries': [ 630 'libraries': [
626 '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework', 631 '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework',
627 '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework', 632 '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework',
(...skipping 681 matching lines...) Expand 10 before | Expand all | Expand 10 after
1309 'sources': [ 1314 'sources': [
1310 'base/android/java/src/org/chromium/media/MediaPlayerBridge.java', 1315 'base/android/java/src/org/chromium/media/MediaPlayerBridge.java',
1311 'base/android/java/src/org/chromium/media/MediaPlayerListener.java', 1316 'base/android/java/src/org/chromium/media/MediaPlayerListener.java',
1312 ], 1317 ],
1313 'variables': { 1318 'variables': {
1314 'jni_gen_dir': 'media', 1319 'jni_gen_dir': 'media',
1315 }, 1320 },
1316 'includes': [ '../build/jni_generator.gypi' ], 1321 'includes': [ '../build/jni_generator.gypi' ],
1317 }, 1322 },
1318 { 1323 {
1324 'target_name': 'camera_jni_headers',
1325 'type': 'none',
1326 'variables': {
1327 'jni_gen_dir': 'media',
1328 'input_java_class': 'android/hardware/Camera.class',
1329 'input_jar_file': '<(android_sdk)/android.jar',
1330 },
1331 'includes': [ '../build/jar_file_jni_generator.gypi' ],
1332 },
1333 {
1334 'target_name': 'video_capture_android_jni_headers',
1335 'type': 'none',
1336 'dependencies': [
1337 'camera_jni_headers',
1338 ],
1339 'sources': [
1340 'base/android/java/src/org/chromium/media/VideoCapture.java',
1341 ],
1342 'variables': {
1343 'jni_gen_dir': 'media',
1344 },
1345 'includes': [ '../build/jni_generator.gypi' ],
1346 },
1347 {
1319 'target_name': 'player_android', 1348 'target_name': 'player_android',
1320 'type': 'static_library', 1349 'type': 'static_library',
1321 'sources': [ 1350 'sources': [
1322 'base/android/media_jni_registrar.cc', 1351 'base/android/media_jni_registrar.cc',
1323 'base/android/media_jni_registrar.h', 1352 'base/android/media_jni_registrar.h',
1324 'base/android/media_player_bridge.cc', 1353 'base/android/media_player_bridge.cc',
1325 'base/android/media_player_bridge.h', 1354 'base/android/media_player_bridge.h',
1326 'base/android/media_player_listener.cc', 1355 'base/android/media_player_listener.cc',
1327 'base/android/media_player_listener.h', 1356 'base/android/media_player_listener.h',
1328 ], 1357 ],
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
1463 ], 1492 ],
1464 'sources': [ 1493 'sources': [
1465 'video/capture/screen/differ_block_sse2.cc', 1494 'video/capture/screen/differ_block_sse2.cc',
1466 'video/capture/screen/differ_block_sse2.h', 1495 'video/capture/screen/differ_block_sse2.h',
1467 ], 1496 ],
1468 }, # end of target differ_block_sse2 1497 }, # end of target differ_block_sse2
1469 ], 1498 ],
1470 }], 1499 }],
1471 ], 1500 ],
1472 } 1501 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698