commit 1d979d0ea27d04a1da004ebc51a19d16d31a165b
author Yin-Chia Yeh <yinchiayeh@google.com> Thu Sep 14 15:34:59 2017 -0700
committer Yin-Chia Yeh <yinchiayeh@google.com> Mon Sep 18 13:35:57 2017 -0700
tree 0618df280d616eaec7de3aa1ca1c4934f67546ce
parent cb689e27522225deddd7056ed1d1c396bb5c6a18

Camera: fix LSB 2 bits fetching bug

Test: compare with RAW10 output
Bug: 65552901
Change-Id: I5104571fd18ec6df2ecebb0433db4aaaec6e4be8

QCamera2: HAL3: Fix wrong conversion for first 2 pixels

Test: Camera CTS
Bug: 65552901
Change-Id: I3ee00beb9ebef811e74e95134ead886e3da6d476

camera/QCamera2/HAL3/QCamera3Channel.cpp

diff --git a/camera/QCamera2/HAL3/QCamera3Channel.cpp b/camera/QCamera2/HAL3/QCamera3Channel.cpp
index cb31953..bfeb46a 100644
--- a/camera/QCamera2/HAL3/QCamera3Channel.cpp
+++ b/camera/QCamera2/HAL3/QCamera3Channel.cpp
@@ -1974,6 +1974,8 @@
 
         uint32_t raw16_stride = ((uint32_t)dim.width + 15U) & ~15U;
         uint16_t* raw16_buffer = (uint16_t *)frame->buffer;
+        uint8_t first_quintuple[5];
+        memcpy(first_quintuple, raw16_buffer, sizeof(first_quintuple));
 
         // Some raw processing may be needed prior to conversion.
         static bool raw_proc_lib_load_attempted = false;
@@ -2007,13 +2009,19 @@
             for (int32_t xs = dim.width - 1; xs >= 0; xs--) {
                 uint32_t x = (uint32_t)xs;
                 uint8_t upper_8bit = row_start[5*(x/4)+x%4];
-                uint8_t lower_2bit = ((row_start[5*(x/4)+4] >> (x%4)) & 0x3);
+                uint8_t lower_2bit = ((row_start[5*(x/4)+4] >> ((x%4) << 1)) & 0x3);
                 uint16_t raw16_pixel =
                         (uint16_t)(((uint16_t)upper_8bit)<<2 |
                         (uint16_t)lower_2bit);
                 raw16_buffer[y*raw16_stride+x] = raw16_pixel;
             }
         }
+
+        // Re-convert the first 2 pixels of the buffer because the loop above messes
+        // them up by reading the first quintuple while modifying it.
+        raw16_buffer[0] = ((uint16_t)first_quintuple[0]<<2) | (first_quintuple[4] & 0x3);
+        raw16_buffer[1] = ((uint16_t)first_quintuple[1]<<2) | ((first_quintuple[4] >> 2) & 0x3);
+
     } else {
         ALOGE("%s: Could not find stream", __func__);
     }