summaryrefslogtreecommitdiffstats
path: root/media/media.gyp
diff options
context:
space:
mode:
authormcasas@chromium.org <mcasas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-01 08:48:00 +0000
committermcasas@chromium.org <mcasas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-01 08:48:00 +0000
commitb1d26db2602f3b7ba8824995771da53e9af367f3 (patch)
tree89aec58efdfe019b9e8c2263178b522a58fce221 /media/media.gyp
parent5c963e67502659d49c28c81bbdd151ccbecce903 (diff)
downloadchromium_src-b1d26db2602f3b7ba8824995771da53e9af367f3.zip
chromium_src-b1d26db2602f3b7ba8824995771da53e9af367f3.tar.gz
chromium_src-b1d26db2602f3b7ba8824995771da53e9af367f3.tar.bz2
Add Project Tango video capture for Android
Project Tango is a special Android device [1]. It supports a number of special cameras, see bug. VideoCapture.java is divided into a base class and a VideoCaptureFactory. The base class VideoCapture.java abstracts most of the code commong to VideoCaptureAndroid and VideoCaptureTango, the two extensions. VideoCaptureFactory creates either a VideoCaptureAndroid (normal devices and Tango front facing camera), or a VideoCaptureTango if the device is identified as a Tango. This division clarifies the already large VideoCapture.java and is expected to be used further down the line in migrating VideoCaptureAndroid to using VideoFrames, hence reducing copies. The identification of the Tango comes from checking the android.os.Build.{MODEL,DEVICE} in the static class VideoCapture.ChromiumCameraInfo. The extra cameras are then added after the "normal" ones in the mId-indexed. list. Tested via [2], click on GetDevices, then open any of the listed cameras, "depth", "fisheye", "4MP". [1] http://www.google.com/atap/projecttango/ [1] https://src.chromium.org/svn/trunk/src/chrome/test/data/webrtc/manual/peerconnection.html BUG=352542 Review URL: https://codereview.chromium.org/151513006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260798 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
-rw-r--r--media/media.gyp3
1 files changed, 3 insertions, 0 deletions
diff --git a/media/media.gyp b/media/media.gyp
index 3a3ad2c..856c751 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -450,6 +450,8 @@
'midi/usb_midi_output_stream.h',
'video/capture/android/video_capture_device_android.cc',
'video/capture/android/video_capture_device_android.h',
+ 'video/capture/android/video_capture_device_factory_android.cc',
+ 'video/capture/android/video_capture_device_factory_android.h',
'video/capture/fake_video_capture_device.cc',
'video/capture/fake_video_capture_device.h',
'video/capture/file_video_capture_device.cc',
@@ -1555,6 +1557,7 @@
'type': 'none',
'sources': [
'base/android/java/src/org/chromium/media/VideoCapture.java',
+ 'base/android/java/src/org/chromium/media/VideoCaptureFactory.java',
],
'variables': {
'jni_gen_package': 'media',