diff options
| author | Zhijun He <zhijunhe@google.com> | 2015-05-30 05:09:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-30 05:09:15 +0000 |
| commit | cf9ce7ca6d9b97c3cfd1cfbd5424a810cc271b34 (patch) | |
| tree | f58e6c9bb109eca132ab2de66b39397e239531bd /camera | |
| parent | bffa214d651485a48881fa5d981810bcf6d68b8a (diff) | |
| parent | 890bce4b75f00853873925c5b241434b1409f86a (diff) | |
| download | shamu-cf9ce7ca6d9b97c3cfd1cfbd5424a810cc271b34.tar.gz | |
Merge "Camera3: Check if mPictureChannel is valid." into mnc-dev
Diffstat (limited to 'camera')
| -rw-r--r--[-rwxr-xr-x] | camera/QCamera2/HAL3/QCamera3HWI.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/camera/QCamera2/HAL3/QCamera3HWI.cpp b/camera/QCamera2/HAL3/QCamera3HWI.cpp index 261b10ff..30eaad78 100755..100644 --- a/camera/QCamera2/HAL3/QCamera3HWI.cpp +++ b/camera/QCamera2/HAL3/QCamera3HWI.cpp @@ -1259,7 +1259,9 @@ int QCamera3HardwareInterface::configureStreams( or will be limited to the max i/p stream size which we can control to be equal to be the largest YUV/Opaque stream size */ - mPictureChannel->overrideYuvSize(zslStream->width, zslStream->height); + if (mPictureChannel) { + mPictureChannel->overrideYuvSize(zslStream->width, zslStream->height); + } } else if (mPictureChannel && m_bIs4KVideo) { mPictureChannel->overrideYuvSize(videoWidth, videoHeight); } |