summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2012-10-03 14:59:29 -0700
committerEino-Ville Talvala <etalvala@google.com>2012-10-03 14:59:29 -0700
commit260f267288502b73d1920a3701be2038753125b5 (patch)
treed8be1f75171f606b55ad245ed26a1bfa12372c99 /services
parentb3e97b347dceb882983427ac872b772e25f3f166 (diff)
downloadframeworks_av-260f267288502b73d1920a3701be2038753125b5.zip
frameworks_av-260f267288502b73d1920a3701be2038753125b5.tar.gz
frameworks_av-260f267288502b73d1920a3701be2038753125b5.tar.bz2
Camera2: Properly update FPS range when FPS is set.
Otherwise a getParameters followed by setParameters will trigger an incorrect reversion in FPS parameters. Bug: 7279267 Change-Id: I7426860f05497dbdf4245c34cef1b38f2f5a1832
Diffstat (limited to 'services')
-rw-r--r--services/camera/libcameraservice/camera2/Parameters.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/camera2/Parameters.cpp b/services/camera/libcameraservice/camera2/Parameters.cpp
index 5248e97..74f4a7e 100644
--- a/services/camera/libcameraservice/camera2/Parameters.cpp
+++ b/services/camera/libcameraservice/camera2/Parameters.cpp
@@ -1057,6 +1057,10 @@ status_t Parameters::set(const String8& paramString) {
validatedParams.previewFpsRange[1] =
availableFrameRates.data.i32[i+1];
}
+ newParams.set(CameraParameters::KEY_PREVIEW_FPS_RANGE,
+ String8::format("%d,%d",
+ validatedParams.previewFpsRange[0] * kFpsToApiScale,
+ validatedParams.previewFpsRange[1] * kFpsToApiScale));
}
// PICTURE_SIZE