summaryrefslogtreecommitdiffstats
path: root/media/video
diff options
context:
space:
mode:
authorwjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-18 17:29:19 +0000
committerwjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-18 17:29:19 +0000
commit57d41e4cfcbbc1588f6f5e0ff53950ec4b3e2d60 (patch)
treef207ecd61ac9a6dd89b066bb4dcd4c53a359a2f8 /media/video
parentc86e28627c44f77ee70d4f3d25a749c7e70d96fd (diff)
downloadchromium_src-57d41e4cfcbbc1588f6f5e0ff53950ec4b3e2d60.zip
chromium_src-57d41e4cfcbbc1588f6f5e0ff53950ec4b3e2d60.tar.gz
chromium_src-57d41e4cfcbbc1588f6f5e0ff53950ec4b3e2d60.tar.bz2
add more color formats NV21 and YV12 in video capture (mainly from Android).
Review URL: https://chromiumcodereview.appspot.com/10075001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132808 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/video')
-rw-r--r--media/video/capture/video_capture_device.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/media/video/capture/video_capture_device.h b/media/video/capture/video_capture_device.h
index 5069fc4..91d0bf4 100644
--- a/media/video/capture/video_capture_device.h
+++ b/media/video/capture/video_capture_device.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
@@ -42,6 +42,8 @@ class MEDIA_EXPORT VideoCaptureDevice {
kRGB24,
kARGB,
kMJPEG, // Currently only supported on Windows.
+ kNV21,
+ kYV12,
};
// Describes the format a camera capture video in.