commit 364b1e1d133d677dcb26dd24f3e84f8f20a815bf
author Ranjith Kagathi Ananda <ranjith@codeaurora.org> Tue May 10 16:23:31 2016 -0700
committer Zhijun He <zhijunhe@google.com> Wed May 11 11:47:48 2016 -0700
tree b6cf71504fb71e139bacbfa0336406dca96fed24
parent bda6bce292d96a86c07a838375fdf64bbc98212c

QCamera2/HAL3: Use snapshot format for 4K live snapshot as well

Video uses UBWC as default format. JPEG does not support
UBWC. So even for 4K use cases, do not use video format
for snapshot stream.

BUG=28708479

Change-Id: Idf3a0a8b2410d326633fa13db5821fbac0b3a3dd
CRs-Fixed: 1013837

QCamera2/HAL3/QCamera3Channel.cpp

diff --git a/QCamera2/HAL3/QCamera3Channel.cpp b/QCamera2/HAL3/QCamera3Channel.cpp
index 6a00ed5..f4c8ab0 100644
--- a/QCamera2/HAL3/QCamera3Channel.cpp
+++ b/QCamera2/HAL3/QCamera3Channel.cpp
@@ -3124,7 +3124,7 @@
                     void *userData,
                     camera3_stream_t *stream,
                     uint32_t postprocess_mask,
-                    bool is4KVideo,
+                    __unused bool is4KVideo,
                     bool isInputStreamConfigured,
                     QCamera3Channel *metadataChannel,
                     uint32_t numBuffers) :
@@ -3143,9 +3143,7 @@
     mYuvHeight = stream->height;
     mStreamType = CAM_STREAM_TYPE_SNAPSHOT;
     // Use same pixelformat for 4K video case
-    mStreamFormat = is4KVideo ?
-            getStreamDefaultFormat(CAM_STREAM_TYPE_VIDEO)
-            :getStreamDefaultFormat(CAM_STREAM_TYPE_SNAPSHOT);
+    mStreamFormat = getStreamDefaultFormat(CAM_STREAM_TYPE_SNAPSHOT);
     int32_t rc = m_postprocessor.initJpeg(jpegEvtHandle, &m_max_pic_dim, this);
     if (rc != 0) {
         LOGE("Init Postprocessor failed");