From fd1bdd611a2954bfb171548b8fa288b0319a0aa9 Mon Sep 17 00:00:00 2001 From: Vladimir Chtchetkine Date: Tue, 22 Nov 2011 15:11:29 -0800 Subject: [PATCH] Update supported frame sizes for fake camera. do not merge. 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. (cherry picked from commit 6f00e7fc48bc2ce1716a478a2cfd07832c74bca4) Change-Id: Ic50225e1700ea3b04ae5445549548f2ffe4ae2df --- tools/emulator/system/camera/EmulatedFakeCamera.cpp | 8 ++++++-- tools/emulator/system/camera/EmulatedFakeCameraDevice.h | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/emulator/system/camera/EmulatedFakeCamera.cpp b/tools/emulator/system/camera/EmulatedFakeCamera.cpp index d82fd787f..86b9d08a5 100755 --- a/tools/emulator/system/camera/EmulatedFakeCamera.cpp +++ b/tools/emulator/system/camera/EmulatedFakeCamera.cpp @@ -69,8 +69,12 @@ status_t EmulatedFakeCamera::Initialize() * 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 f54127e12..0213ae918 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 {