Android native camera: added BGR output format; added methods to configure output frame size.

31e77a3b · Andrey Kamaev · 1965b297 · 31e77a3b · 31e77a3b
Commit 31e77a3b authored Apr 18, 2011 by Andrey Kamaev
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

highgui_c.h modules/highgui/include/opencv2/highgui/highgui_c.h +2 -3

cap_android.cpp modules/highgui/src/cap_android.cpp +0 -0

No files found.
--- a/modules/highgui/include/opencv2/highgui/highgui_c.h
+++ b/modules/highgui/include/opencv2/highgui/highgui_c.h
@@ -392,9 +392,8 @@ enum
 //supported by Android camera output formats
 enum
 {
-  CV_CAP_ANDROID_COLOR_FRAME = 1, //TODO: check RGB or BGR?
-  CV_CAP_ANDROID_GREY_FRAME  = 0,
-  CV_CAP_ANDROID_YUV_FRAME   = 2
+  CV_CAP_ANDROID_COLOR_FRAME = 0, //BGR
+  CV_CAP_ANDROID_GREY_FRAME  = 1  //Y
 };

 /* retrieve or set capture properties */

--- a/modules/highgui/src/cap_android.cpp
+++ b/modules/highgui/src/cap_android.cpp