diff options
| author | Yin-Chia Yeh <yinchiayeh@google.com> | 2015-09-15 00:40:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-09-15 00:40:15 +0000 |
| commit | 3818c6964a000bcac34176afa2bae5e247f5d223 (patch) | |
| tree | a2a217e4c6ee066fdf0020491217ace6a556d4a1 /services | |
| parent | f00b70e082c14f789c948f623daca9be7a0e36e8 (diff) | |
| parent | 652f7d7ebd9a8cec067588c2a232e49710d5cd83 (diff) | |
| download | frameworks_av-3818c6964a000bcac34176afa2bae5e247f5d223.zip frameworks_av-3818c6964a000bcac34176afa2bae5e247f5d223.tar.gz frameworks_av-3818c6964a000bcac34176afa2bae5e247f5d223.tar.bz2 | |
Merge "Camera: API1 shim: select better default FPS range" into mnc-dr-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/api1/client2/Parameters.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/camera/libcameraservice/api1/client2/Parameters.cpp b/services/camera/libcameraservice/api1/client2/Parameters.cpp index 442eb75..44447b4 100644 --- a/services/camera/libcameraservice/api1/client2/Parameters.cpp +++ b/services/camera/libcameraservice/api1/client2/Parameters.cpp @@ -214,8 +214,8 @@ status_t Parameters::initialize(const CameraMetadata *info, int deviceVersion) { supportedPreviewFormats); } - previewFpsRange[0] = availableFpsRanges.data.i32[0]; - previewFpsRange[1] = availableFpsRanges.data.i32[1]; + previewFpsRange[0] = fastInfo.bestStillCaptureFpsRange[0]; + previewFpsRange[1] = fastInfo.bestStillCaptureFpsRange[1]; // PREVIEW_FRAME_RATE / SUPPORTED_PREVIEW_FRAME_RATES are deprecated, but // still have to do something sane for them |