From ac06eb4a307c6a3a53249fae2cb0eda3b31d3489 Mon Sep 17 00:00:00 2001
From: jiaoyuan <jiaoyuan@codeaurora.org>
Date: Tue, 30 Jun 2020 14:15:48 +0800
Subject: [PATCH] Snapcam: change MaxBurstShotFPS from int to float
change MaxBurstShotFPS from int to float
Change-Id: I7047638f4c74cf7316cab528adb81e4cffef9429
---
src/com/android/camera/CaptureModule.java | 10 +++++-----
src/com/android/camera/SettingsManager.java | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 871c87e31..8225c430d 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -369,8 +369,8 @@ public class CaptureModule implements CameraModule, PhotoController,
new CameraCharacteristics.Key<>("org.quic.camera.MaxPreviewSize.MaxPreviewSize", int[].class);
public static CameraCharacteristics.Key<Byte> is_burstshot_supported =
new CameraCharacteristics.Key<>("org.quic.camera.BurstFPS.isBurstShotSupported", Byte.class);
- public static CameraCharacteristics.Key<Integer> max_burstshot_fps =
- new CameraCharacteristics.Key<>("org.quic.camera.BurstFPS.MaxBurstShotFPS", int.class);
+ public static CameraCharacteristics.Key<Float> max_burstshot_fps =
+ new CameraCharacteristics.Key<>("org.quic.camera.BurstFPS.MaxBurstShotFPS", Float.class);
public static CameraCharacteristics.Key<Byte> is_liveshot_size_same_as_video =
new CameraCharacteristics.Key<>("org.quic.camera.LiveshotSize.isLiveshotSizeSameAsVideoSize", Byte.class);
public static CameraCharacteristics.Key<Byte> is_FD_Rendering_In_Video_UI_Supported =
@@ -3155,12 +3155,12 @@ public class CaptureModule implements CameraModule, PhotoController,
}
};
- private int calculateMaxFps(){
- int maxFps = mSettingsManager.getmaxBurstShotFPS();
+ private float calculateMaxFps(){
+ float maxFps = mSettingsManager.getmaxBurstShotFPS();
if(maxFps > 0) {
double size = mPictureSize.getWidth() * mPictureSize.getHeight();
double maxsizefloat = mSupportedMaxPictureSize.getWidth() * mSupportedMaxPictureSize.getHeight();
- maxFps = (int)Math.round((maxsizefloat * maxFps) / size);
+ maxFps = (float)((maxsizefloat * maxFps) / size);
if (DEBUG) {
Log.i(TAG, "maxsize:" + mSupportedMaxPictureSize.getWidth() + ",height:" + mSupportedMaxPictureSize.getHeight() + "maxsize:" + maxsizefloat);
Log.i(TAG, "size:" + mPictureSize.getWidth() + ",height:" + mPictureSize.getHeight() + ",size:" + size);
diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java
index bb27b464a..d1247b0f0 100755
--- a/src/com/android/camera/SettingsManager.java
+++ b/src/com/android/camera/SettingsManager.java
@@ -582,8 +582,8 @@ public class SettingsManager implements ListMenu.SettingsListener {
return isCameraFDSupported;
}
- public int getmaxBurstShotFPS(){
- int maxBurstShotFPS = 0;
+ public float getmaxBurstShotFPS(){
+ float maxBurstShotFPS = 0;
try {
maxBurstShotFPS = mCharacteristics.get(mCameraId).get(CaptureModule.max_burstshot_fps);
} catch (IllegalArgumentException e) {
--
GitLab