Cherry-picked from 6f00e7fc in master. Do not merge.
Update supported frame sizes for fake camera
Camera framework requires 352x288, and 320x240 frames for video preview and video
recording. If these dimensions are missing in camera properties the camera app
may abort when entering video mode, or start video recording.
Also truned off switching fake frames, leaving only the checker board.
Change-Id: I63d145c967f1ba83992141ec97700f094a9d53a7
diff --git a/tools/emulator/system/camera/EmulatedFakeCamera.cpp b/tools/emulator/system/camera/EmulatedFakeCamera.cpp
index d82fd78..86b9d08 100755
--- a/tools/emulator/system/camera/EmulatedFakeCamera.cpp
+++ b/tools/emulator/system/camera/EmulatedFakeCamera.cpp
@@ -69,8 +69,12 @@
* Parameters provided by the camera device.
*/
- mParameters.set(CameraParameters::KEY_SUPPORTED_PICTURE_SIZES, "640x480");
- mParameters.set(CameraParameters::KEY_SUPPORTED_PREVIEW_SIZES, "640x480");
+ /* 352x288 and 320x240 frame dimensions are required by the framework for
+ * video mode preview and video recording. */
+ mParameters.set(CameraParameters::KEY_SUPPORTED_PICTURE_SIZES,
+ "640x480,352x288,320x240");
+ mParameters.set(CameraParameters::KEY_SUPPORTED_PREVIEW_SIZES,
+ "640x480,352x288,320x240");
mParameters.setPreviewSize(640, 480);
mParameters.setPictureSize(640, 480);
diff --git a/tools/emulator/system/camera/EmulatedFakeCameraDevice.h b/tools/emulator/system/camera/EmulatedFakeCameraDevice.h
index 0920be7..383118b 100755
--- a/tools/emulator/system/camera/EmulatedFakeCameraDevice.h
+++ b/tools/emulator/system/camera/EmulatedFakeCameraDevice.h
@@ -32,7 +32,7 @@
* "white/red/green/blue" frame. Frame content rotation helps finding bugs in
* format conversions.
*/
-#define EFCD_ROTATE_FRAME 1
+#define EFCD_ROTATE_FRAME 0
namespace android {
