Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 522260c4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3151316



Change-Id: Ia1b3c5e09d01317f7937f27d1dae3ce7cdbdc4e8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b579bc70 b308a788

services/camera/libcameraservice/api2/HeicCompositeStream.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1589,7 +1589,7 @@ status_t HeicCompositeStream::copyOneYuvTile(sp<MediaCodecBuffer>& codecBuffer, 
        // 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);