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

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 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 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 'filters/source_buffer_stream.cc', 311 'filters/source_buffer_stream.cc',
312 'filters/source_buffer_stream.h', 312 'filters/source_buffer_stream.h',
313 'filters/video_decoder_selector.cc', 313 'filters/video_decoder_selector.cc',
314 'filters/video_decoder_selector.h', 314 'filters/video_decoder_selector.h',
315 'filters/video_frame_generator.cc', 315 'filters/video_frame_generator.cc',
316 'filters/video_frame_generator.h', 316 'filters/video_frame_generator.h',
317 'filters/video_renderer_base.cc', 317 'filters/video_renderer_base.cc',
318 'filters/video_renderer_base.h', 318 'filters/video_renderer_base.h',
319 'filters/vpx_video_decoder.cc', 319 'filters/vpx_video_decoder.cc',
320 'filters/vpx_video_decoder.h', 320 'filters/vpx_video_decoder.h',
321 'video/capture/android/video_capture_device_android.cc',
322 'video/capture/android/video_capture_device_android.h',
321 'video/capture/fake_video_capture_device.cc', 323 'video/capture/fake_video_capture_device.cc',
322 'video/capture/fake_video_capture_device.h', 324 'video/capture/fake_video_capture_device.h',
323 'video/capture/linux/video_capture_device_linux.cc', 325 'video/capture/linux/video_capture_device_linux.cc',
324 'video/capture/linux/video_capture_device_linux.h', 326 'video/capture/linux/video_capture_device_linux.h',
325 'video/capture/mac/video_capture_device_mac.h', 327 'video/capture/mac/video_capture_device_mac.h',
326 'video/capture/mac/video_capture_device_mac.mm', 328 'video/capture/mac/video_capture_device_mac.mm',
327 'video/capture/mac/video_capture_device_qtkit_mac.h', 329 'video/capture/mac/video_capture_device_qtkit_mac.h',
328 'video/capture/mac/video_capture_device_qtkit_mac.mm', 330 'video/capture/mac/video_capture_device_qtkit_mac.mm',
329 'video/capture/video_capture.h', 331 'video/capture/video_capture.h',
330 'video/capture/video_capture_device.h', 332 'video/capture/video_capture_device.h',
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
469 }], 471 }],
470 ['OS == "android"', { 472 ['OS == "android"', {
471 'sources': [ 473 'sources': [
472 'base/media_stub.cc', 474 'base/media_stub.cc',
473 ], 475 ],
474 'link_settings': { 476 'link_settings': {
475 'libraries': [ 477 'libraries': [
476 '-lOpenSLES', 478 '-lOpenSLES',
477 ], 479 ],
478 }, 480 },
481 'include_dirs': [
482 '<(SHARED_INTERMEDIATE_DIR)/media',
483 ],
484 'dependencies': [
485 'video_capture_android_jni_headers',
486 ],
479 }], 487 }],
480 # A simple WebM encoder for animated avatars on ChromeOS. 488 # A simple WebM encoder for animated avatars on ChromeOS.
481 ['chromeos==1', { 489 ['chromeos==1', {
482 'dependencies': [ 490 'dependencies': [
483 '../third_party/libvpx/libvpx.gyp:libvpx', 491 '../third_party/libvpx/libvpx.gyp:libvpx',
484 '../third_party/libyuv/libyuv.gyp:libyuv', 492 '../third_party/libyuv/libyuv.gyp:libyuv',
485 ], 493 ],
486 'sources': [ 494 'sources': [
487 'webm/chromeos/ebml_writer.cc', 495 'webm/chromeos/ebml_writer.cc',
488 'webm/chromeos/ebml_writer.h', 496 'webm/chromeos/ebml_writer.h',
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
558 'defines': [ 566 'defines': [
559 'USE_PULSEAUDIO', 567 'USE_PULSEAUDIO',
560 ], 568 ],
561 }, { # else: use_pulseaudio == 0 569 }, { # else: use_pulseaudio == 0
562 'sources!': [ 570 'sources!': [
563 'audio/pulse/pulse_output.cc', 571 'audio/pulse/pulse_output.cc',
564 'audio/pulse/pulse_output.h', 572 'audio/pulse/pulse_output.h',
565 ], 573 ],
566 }], 574 }],
567 ], 575 ],
568 }],
569 ['os_posix == 1 and OS != "android"', {
570 # Video capture isn't supported in Android yet.
571 'sources!': [ 576 'sources!': [
572 'video/capture/video_capture_device_dummy.cc', 577 'video/capture/video_capture_device_dummy.cc',
573 'video/capture/video_capture_device_dummy.h', 578 'video/capture/video_capture_device_dummy.h',
574 ], 579 ],
575 }], 580 }],
576 ['OS=="mac"', { 581 ['OS=="mac"', {
577 'link_settings': { 582 'link_settings': {
578 'libraries': [ 583 'libraries': [
579 '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework', 584 '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework',
580 '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework', 585 '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework',
(...skipping 629 matching lines...) Expand 10 before | Expand all | Expand 10 after
1210 'sources': [ 1215 'sources': [
1211 'base/android/java/src/org/chromium/media/MediaPlayerBridge.java', 1216 'base/android/java/src/org/chromium/media/MediaPlayerBridge.java',
1212 'base/android/java/src/org/chromium/media/MediaPlayerListener.java', 1217 'base/android/java/src/org/chromium/media/MediaPlayerListener.java',
1213 ], 1218 ],
1214 'variables': { 1219 'variables': {
1215 'jni_gen_dir': 'media', 1220 'jni_gen_dir': 'media',
1216 }, 1221 },
1217 'includes': [ '../build/jni_generator.gypi' ], 1222 'includes': [ '../build/jni_generator.gypi' ],
1218 }, 1223 },
1219 { 1224 {
1225 'target_name': 'video_capture_android_jni_headers',
1226 'type': 'none',
1227 'sources': [
1228 'base/android/java/src/org/chromium/media/VideoCapture.java',
1229 ],
1230 'variables': {
1231 'jni_gen_dir': 'media',
1232 },
1233 'includes': [ '../build/jni_generator.gypi' ],
1234 },
1235 {
1220 'target_name': 'player_android', 1236 'target_name': 'player_android',
1221 'type': 'static_library', 1237 'type': 'static_library',
1222 'sources': [ 1238 'sources': [
1223 'base/android/media_jni_registrar.cc', 1239 'base/android/media_jni_registrar.cc',
1224 'base/android/media_jni_registrar.h', 1240 'base/android/media_jni_registrar.h',
1225 'base/android/media_player_bridge.cc', 1241 'base/android/media_player_bridge.cc',
1226 'base/android/media_player_bridge.h', 1242 'base/android/media_player_bridge.h',
1227 'base/android/media_player_listener.cc', 1243 'base/android/media_player_listener.cc',
1228 'base/android/media_player_listener.h', 1244 'base/android/media_player_listener.h',
1229 ], 1245 ],
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
1342 'media', 1358 'media',
1343 ], 1359 ],
1344 'sources': [ 1360 'sources': [
1345 'tools/media_bench/media_bench.cc', 1361 'tools/media_bench/media_bench.cc',
1346 ], 1362 ],
1347 }, 1363 },
1348 ], 1364 ],
1349 }] 1365 }]
1350 ], 1366 ],
1351 } 1367 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698