| author | Guosong Zhou <guosong.zhou@amlogic.com> | 2016-07-18 12:57:05 (GMT) |
|---|---|---|
| committer | Guosong Zhou <guosong.zhou@amlogic.com> | 2016-07-18 13:04:07 (GMT) |
| commit | b69410a6593ae336db55036efd23626e939375c8 (patch) | |
| tree | 77e55fc184942950205146e4bd8cf704d15c3780 | |
| parent | efaad5044fa06e26b7fd463ea736286e765fa8fa (diff) | |
| download | camera-b69410a6593ae336db55036efd23626e939375c8.zip camera-b69410a6593ae336db55036efd23626e939375c8.tar.gz camera-b69410a6593ae336db55036efd23626e939375c8.tar.bz2 | |
PD#121422: camera: fix camera crash when get camera info
Change-Id: Iab851cca758b8b50c5273f4b7b0d4c4ab23b5e79
| -rw-r--r-- | v3/EmulatedFakeCamera3.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/v3/EmulatedFakeCamera3.cpp b/v3/EmulatedFakeCamera3.cpp index 09a8cda..b6b25c2 100644 --- a/v3/EmulatedFakeCamera3.cpp +++ b/v3/EmulatedFakeCamera3.cpp @@ -2074,9 +2074,15 @@ status_t EmulatedFakeCamera3::constructStaticInfo() { info.update(ANDROID_SCALER_AVAILABLE_MAX_DIGITAL_ZOOM, &maxZoom, 1); } else { - float maxZoom = mZoomMax / mZoomMin; - info.update(ANDROID_SCALER_AVAILABLE_MAX_DIGITAL_ZOOM, - &maxZoom, 1); + if (mZoomMin != 0) { + float maxZoom = mZoomMax / mZoomMin; + info.update(ANDROID_SCALER_AVAILABLE_MAX_DIGITAL_ZOOM, + &maxZoom, 1); + } else { + float maxZoom = 1.0; + info.update(ANDROID_SCALER_AVAILABLE_MAX_DIGITAL_ZOOM, + &maxZoom, 1); + } } static const uint8_t availableVstabModes[] = { |