commit ab7efbbba0440d63c56298d3b4117f74558f205a
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Jul 01 18:05:06 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 01 18:05:06 2024 +0000
tree 65211ba32b1c027a264a7f99f282d63384034932
parent 5cb3691cb2fdd7b1e77c04da485c7fb67ccf25c4
parent 48ae29e954e71df8100e8b8815f129ea36a87093

Merge "Camera: Correct the U/V plane selection for HEIC streams" into main

services/camera/libcameraservice/api2/HeicCompositeStream.cpp

diff --git a/services/camera/libcameraservice/api2/HeicCompositeStream.cpp b/services/camera/libcameraservice/api2/HeicCompositeStream.cpp
index 68e9ad4..fe99241 100644
--- a/services/camera/libcameraservice/api2/HeicCompositeStream.cpp
+++ b/services/camera/libcameraservice/api2/HeicCompositeStream.cpp
@@ -1583,7 +1583,7 @@
         // The chrome plane could be either Cb first, or Cr first. Take the
         // smaller address.
         uint8_t *src = std::min(yuvBuffer.dataCb, yuvBuffer.dataCr);
-        MediaImage2::PlaneIndex dstPlane = codecUvOffsetDiff > 0 ? MediaImage2::U : MediaImage2::V;
+        MediaImage2::PlaneIndex dstPlane = codecUPlaneFirst ? MediaImage2::U : MediaImage2::V;
         for (auto row = top/2; row < (top+height)/2; row++) {
             uint8_t *dst = codecBuffer->data() + imageInfo->mPlane[dstPlane].mOffset +
                     imageInfo->mPlane[dstPlane].mRowInc * (row - top/2);