| commit | 522260c45e1303b337444534e3cc065c9d1b5fc1 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Jul 01 18:51:27 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 01 18:51:27 2024 +0000 |
| tree | 2c5434bc5072743bf1e90944ec6e5322f3fa2097 | |
| parent | b579bc70c8277afa29f4ea9923a01d8f1dffb95c [diff] | |
| parent | b308a7889d2b78b77fa2a795b06441560dbad5c1 [diff] |
Merge "Camera: Correct the U/V plane selection for HEIC streams" into main am: ab7efbbba0 am: b308a7889d Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3151316 Change-Id: Ia1b3c5e09d01317f7937f27d1dae3ce7cdbdc4e8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/camera/libcameraservice/api2/HeicCompositeStream.cpp b/services/camera/libcameraservice/api2/HeicCompositeStream.cpp index cf6ff84..ea4f6fd 100644 --- a/services/camera/libcameraservice/api2/HeicCompositeStream.cpp +++ b/services/camera/libcameraservice/api2/HeicCompositeStream.cpp
@@ -1589,7 +1589,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);