Set default fps 30 for both Camera HAL1 and HAL3.
HAL1 used 24, while HAL3 chose 30 as default fps. When switching between
HAL1 and HAL3, need update the fps in media_profile. Setting the same
fps avoid this issue.
Bug: 68388303, 68388341, 68388474
Test: CTS for HAL1 and HAL3
Change-Id: Iac274811e6f1280b022ee22e7ed93ba9ecbfc627
diff --git a/camera/EmulatedCamera.cpp b/camera/EmulatedCamera.cpp
index 4761386..fe4fcae 100755
--- a/camera/EmulatedCamera.cpp
+++ b/camera/EmulatedCamera.cpp
@@ -176,9 +176,9 @@
* worker thread. */
mParameters.set(CameraParameters::KEY_SUPPORTED_PREVIEW_FRAME_RATES,
"30,24,20,15,10,5");
- mParameters.set(CameraParameters::KEY_SUPPORTED_PREVIEW_FPS_RANGE, "(24000,24000)");
- mParameters.set(CameraParameters::KEY_PREVIEW_FPS_RANGE, "24000,24000");
- mParameters.setPreviewFrameRate(24);
+ mParameters.set(CameraParameters::KEY_SUPPORTED_PREVIEW_FPS_RANGE, "(30000,30000)");
+ mParameters.set(CameraParameters::KEY_PREVIEW_FPS_RANGE, "30000,30000");
+ mParameters.setPreviewFrameRate(30);
/* Only PIXEL_FORMAT_YUV420P is accepted by video framework in emulator! */
mParameters.set(CameraParameters::KEY_VIDEO_FRAME_FORMAT,
diff --git a/camera/EmulatedFakeCamera3.cpp b/camera/EmulatedFakeCamera3.cpp
index c59e4f9..9a259ee 100644
--- a/camera/EmulatedFakeCamera3.cpp
+++ b/camera/EmulatedFakeCamera3.cpp
@@ -1589,7 +1589,7 @@
}
static const int32_t availableTargetFpsRanges[] = {
- 15, 30, 15, 15, 30, 30
+ 15, 30, 30, 30
};
ADD_STATIC_ENTRY(ANDROID_CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES,
availableTargetFpsRanges,
diff --git a/camera/media_profiles.xml b/camera/media_profiles.xml
index 63aad9f..9326875 100644
--- a/camera/media_profiles.xml
+++ b/camera/media_profiles.xml
@@ -84,7 +84,7 @@
bitRate="128000"
width="320"
height="240"
- frameRate="24" />
+ frameRate="30" />
<Audio codec="amrnb"
bitRate="12200"
sampleRate="8000"
