Merge "SnapdragonCamera: Fix video fps is 60, preview fps is 30." into camera-SnapdragonCamera.lnx.2.0

2 files changed, 14 insertions, 14 deletions

diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 8d07d933f..a73d0e0f4 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -4341,8 +4341,9 @@ public class CaptureModule implements CameraModule, PhotoController,
             mCaptureSession[cameraId] = cameraCaptureSession;
             try {
                 setUpVideoCaptureRequestBuilder(mVideoRequestBuilder, cameraId);
-                mCurrentSession.setRepeatingRequest(mVideoRequestBuilder.build(),
-                        mCaptureCallback, mCameraHandler);
+                List list = CameraUtil
+                        .createHighSpeedRequestList(mVideoRequestBuilder.build());
+                mCurrentSession.setRepeatingBurst(list, mCaptureCallback, mCameraHandler);
             } catch (CameraAccessException e) {
                 e.printStackTrace();
             } catch (IllegalStateException e) {
@@ -4383,15 +4384,9 @@ public class CaptureModule implements CameraModule, PhotoController,
             List<CaptureRequest> slowMoRequests = null;
             try {
                 setUpVideoCaptureRequestBuilder(mVideoRequestBuilder, cameraId);
-                if (mHighSpeedCapture && ((int) mHighSpeedFPSRange.getUpper() > NORMAL_SESSION_MAX_FPS)) {
-                    slowMoRequests = ((CameraConstrainedHighSpeedCaptureSession) mCurrentSession).
-                            createHighSpeedRequestList(mVideoRequestBuilder.build());
-                    mCurrentSession.setRepeatingBurst(slowMoRequests,
-                            mCaptureCallback, mCameraHandler);
-                } else {
-                    mCurrentSession.setRepeatingRequest(mVideoRequestBuilder.build(),
-                            mCaptureCallback, mCameraHandler);
-                }
+                List list = CameraUtil
+                        .createHighSpeedRequestList(mVideoRequestBuilder.build());
+                mCurrentSession.setRepeatingBurst(list,mCaptureCallback, mCameraHandler);
             } catch (CameraAccessException e) {
                 e.printStackTrace();
             } catch (IllegalStateException e) {
@@ -4672,6 +4667,7 @@ public class CaptureModule implements CameraModule, PhotoController,
                                 @Override
                                 public void onConfigured(CameraCaptureSession cameraCaptureSession) {
                                     mCurrentSession = cameraCaptureSession;
+                                    Log.v(TAG, "createConstrainedHighSpeedCaptureSession onConfigured");
                                     mCaptureSession[cameraId] = cameraCaptureSession;
                                     CameraConstrainedHighSpeedCaptureSession session =
                                             (CameraConstrainedHighSpeedCaptureSession) mCurrentSession;
diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java
index 854b5bdfa..6b5f941e0 100755
--- a/src/com/android/camera/util/CameraUtil.java
+++ b/src/com/android/camera/util/CameraUtil.java
@@ -1403,9 +1403,13 @@ public class CameraUtil {
         Collection<Surface> outputSurfaces = request.getTargets();
         Range<Integer> fpsRange = request.get(CaptureRequest.CONTROL_AE_TARGET_FPS_RANGE);
 
-        StreamConfigurationMap config =
-                SettingsManager.getInstance().getStreamConfigurationMap((int)request.getTag());
-        SurfaceUtils.checkConstrainedHighSpeedSurfaces(outputSurfaces, fpsRange, config);
+        try {
+            StreamConfigurationMap config =
+                    SettingsManager.getInstance().getStreamConfigurationMap((int)request.getTag());
+            SurfaceUtils.checkConstrainedHighSpeedSurfaces(outputSurfaces, fpsRange, config);
+        } catch (IllegalArgumentException e) {
+            Log.w(TAG, " checkConstrainedHighSpeedSurfaces occur " + e.toString());
+        }
 
         // Request list size: to limit the preview to 30fps, need use maxFps/30; to maximize
         // the preview frame rate, should use maxBatch size for that high speed stream