commit b1fb6079ef7f005c4be8de76bef57ce10c1efe76
author Nipun Kwatra <nkwatra@google.com> Fri Jul 30 18:30:55 2010 -0700
committer Nipun Kwatra <nkwatra@google.com> Mon Aug 02 09:49:07 2010 -0700
tree ed428f9c6a18c9c67d76a0e5aaf8295369a6370b
parent 51c2ec24116919d710e8770e253f14e15e295f2b

Implementing getSupportedPictureSizes

Go through all the supported picture sizes and choose the smallest one with
both dimensions higher than the passed in video width and height.

Change-Id: I4e9fe7a6384a0feeb9e069239ec68c70fb5f3033

media/libstagefright/CameraSourceTimeLapse.cpp

diff --git a/media/libstagefright/CameraSourceTimeLapse.cpp b/media/libstagefright/CameraSourceTimeLapse.cpp
index a01450b..854afdd 100644
--- a/media/libstagefright/CameraSourceTimeLapse.cpp
+++ b/media/libstagefright/CameraSourceTimeLapse.cpp
@@ -30,6 +30,7 @@
 #include <camera/CameraParameters.h>
 #include <ui/Rect.h>
 #include <utils/String8.h>
+#include <utils/Vector.h>
 #include "OMX_Video.h"
 
 namespace android {
@@ -79,7 +80,7 @@
     mVideoWidth = width;
     mVideoHeight = height;
     if (mUseStillCameraForTimeLapse) {
-        setPictureSizeToClosestSupported(width, height);
+        CHECK(setPictureSizeToClosestSupported(width, height));
         mNeedCropping = computeCropRectangleOffset();
         mMeta->setInt32(kKeyWidth, width);
         mMeta->setInt32(kKeyHeight, height);
@@ -89,11 +90,31 @@
 CameraSourceTimeLapse::~CameraSourceTimeLapse() {
 }
 
-void CameraSourceTimeLapse::setPictureSizeToClosestSupported(int32_t width, int32_t height) {
-    // TODO: Currently fixed to the highest resolution.
-    // Need to poll the camera and set accordingly.
-    mPictureWidth = 2048;
-    mPictureHeight = 1536;
+bool CameraSourceTimeLapse::setPictureSizeToClosestSupported(int32_t width, int32_t height) {
+    int64_t token = IPCThreadState::self()->clearCallingIdentity();
+    String8 s = mCamera->getParameters();
+    IPCThreadState::self()->restoreCallingIdentity(token);
+
+    CameraParameters params(s);
+    Vector<Size> supportedSizes;
+    params.getSupportedPictureSizes(supportedSizes);
+
+    int32_t minPictureSize = INT_MAX;
+    for (uint32_t i = 0; i < supportedSizes.size(); ++i) {
+        int32_t pictureWidth = supportedSizes[i].width;
+        int32_t pictureHeight = supportedSizes[i].height;
+
+        if ((pictureWidth >= width) && (pictureHeight >= height)) {
+            int32_t pictureSize = pictureWidth*pictureHeight;
+            if (pictureSize < minPictureSize) {
+                minPictureSize = pictureSize;
+                mPictureWidth = pictureWidth;
+                mPictureHeight = pictureHeight;
+            }
+        }
+    }
+    LOGV("Picture size = (%d, %d)", mPictureWidth, mPictureHeight);
+    return (minPictureSize != INT_MAX);
 }
 
 bool CameraSourceTimeLapse::computeCropRectangleOffset() {