commit e080a45d3e29e41bce06669b79d5eb04f0fd05ef
author Vladimir Chtchetkine <vchtchetkine@google.com> Tue Nov 15 13:47:39 2011 -0800
committer Vladimir Chtchetkine <vchtchetkine@google.com> Tue Nov 15 13:47:39 2011 -0800
tree 2ecd769d77fc8966db2595478c7c11a04875f6fb
parent 8d9a7a5fa4bd32f9b8aeb7b9e3bd047a475539ab

Add 320x240 frame support for Windows and Mac camera emulation

Change-Id: I54897ca86b372d98c7a30a47ecf88a4df8ee0fe9

android/camera/camera-capture-mac.m

diff --git a/android/camera/camera-capture-mac.m b/android/camera/camera-capture-mac.m
index 228838b..4d684e0 100644
--- a/android/camera/camera-capture-mac.m
+++ b/android/camera/camera-capture-mac.m
@@ -496,6 +496,8 @@
   {640, 480},
   /* Emulates 352x288 frame (required by camera framework). */
   {352, 288},
+  /* Emulates 320x240 frame (required by camera framework). */
+  {320, 240},
   /* Emulates 176x144 frame (required by camera framework). */
   {176, 144}
 };

android/camera/camera-capture-windows.c

diff --git a/android/camera/camera-capture-windows.c b/android/camera/camera-capture-windows.c
index 781ba05..ecf5b62 100755
--- a/android/camera/camera-capture-windows.c
+++ b/android/camera/camera-capture-windows.c
@@ -556,6 +556,8 @@
   {640, 480},
   /* Emulates 352x288 frame (required by camera framework). */
   {352, 288},
+  /* Emulates 320x240 frame (required by camera framework). */
+  {320, 240},
   /* Emulates 176x144 frame (required by camera framework). */
   {176, 144}
 };