diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-10-03 15:20:38 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-03 15:20:38 -0700 |
| commit | ce953ce4d698155c50356df093712df1dea76051 (patch) | |
| tree | 99f36762140decd00c7fc996e24eddc91016d957 /services/camera | |
| parent | c20630569431234db23b6182dd17102023dee68e (diff) | |
| parent | 260f267288502b73d1920a3701be2038753125b5 (diff) | |
| download | frameworks_av-ce953ce4d698155c50356df093712df1dea76051.zip frameworks_av-ce953ce4d698155c50356df093712df1dea76051.tar.gz frameworks_av-ce953ce4d698155c50356df093712df1dea76051.tar.bz2 | |
Merge "Camera2: Properly update FPS range when FPS is set." into jb-mr1-dev
Diffstat (limited to 'services/camera')
| -rw-r--r-- | services/camera/libcameraservice/camera2/Parameters.cpp | 4 |
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 |