am 9a1a290e: am fd1bdd61: Update supported frame sizes for fake camera. do not merge.

* commit '9a1a290e58df454c07ed447693585a819642e3e0':
  Update supported frame sizes for fake camera. do not merge.
This commit is contained in:
Vladimir Chtchetkine
2011-11-23 14:07:06 -08:00
committed by Android Git Automerger
2 changed files with 7 additions and 3 deletions

View File

@@ -69,8 +69,12 @@ status_t EmulatedFakeCamera::Initialize()
* Parameters provided by the camera device. * Parameters provided by the camera device.
*/ */
mParameters.set(CameraParameters::KEY_SUPPORTED_PICTURE_SIZES, "640x480"); /* 352x288 and 320x240 frame dimensions are required by the framework for
mParameters.set(CameraParameters::KEY_SUPPORTED_PREVIEW_SIZES, "640x480"); * 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.setPreviewSize(640, 480);
mParameters.setPictureSize(640, 480); mParameters.setPictureSize(640, 480);

View File

@@ -32,7 +32,7 @@
* "white/red/green/blue" frame. Frame content rotation helps finding bugs in * "white/red/green/blue" frame. Frame content rotation helps finding bugs in
* format conversions. * format conversions.
*/ */
#define EFCD_ROTATE_FRAME 1 #define EFCD_ROTATE_FRAME 0
namespace android { namespace android {