diff --git a/tools/emulator/system/camera/EmulatedFakeCamera.cpp b/tools/emulator/system/camera/EmulatedFakeCamera.cpp
index 7549ddf6d..beb632917 100755
--- a/tools/emulator/system/camera/EmulatedFakeCamera.cpp
+++ b/tools/emulator/system/camera/EmulatedFakeCamera.cpp
@@ -96,8 +96,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 6f6d4f715..f66f07647 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 {