| commit | b308a7889d2b78b77fa2a795b06441560dbad5c1 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Jul 01 18:26:57 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 01 18:26:57 2024 +0000 |
| tree | 3000012b5068c0e14634a74cecc143e0e0f861f0 | |
| parent | 9db11468b8fae1e746d86d46126aa6248a8479f4 [diff] | |
| parent | ab7efbbba0440d63c56298d3b4117f74558f205a [diff] |
Merge "Camera: Correct the U/V plane selection for HEIC streams" into main am: ab7efbbba0 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3151316 Change-Id: I0735d841a9f19a14da79f9c6bf58113943787934 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 225d7f5..c995cbe 100644 --- a/services/camera/libcameraservice/api2/HeicCompositeStream.cpp +++ b/services/camera/libcameraservice/api2/HeicCompositeStream.cpp
@@ -1588,7 +1588,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);