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

Commit 5b5da45b authored by Wonsik Kim's avatar Wonsik Kim Committed by Automerger Merge Worker
Browse files

Merge "C2Buffer: don't check for right and bottom crop at mapping" into main... 

Merge "C2Buffer: don't check for right and bottom crop at mapping" into main am: 2ba5979a am: 74942ceb

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



Change-Id: I3c63e6fbfb242c2dafb53df3c0f98a77015a1c1e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3b123d17 74942ceb

media/codec2/vndk/C2Buffer.cpp

+1 −2
Original line number Diff line number Diff line
@@ -1311,8 +1311,7 @@ public: 
                for (size_t planeIx = 0; planeIx < mLayout.numPlanes; ++planeIx) {

                    const uint32_t colSampling = mLayout.planes[planeIx].colSampling;

                    const uint32_t rowSampling = mLayout.planes[planeIx].rowSampling;

                    if (crop.left % colSampling || crop.right() % colSampling

                            || crop.top % rowSampling || crop.bottom() % rowSampling) {

                    if (crop.left % colSampling || crop.top % rowSampling) {

                        // cannot calculate data pointer

                        mImpl->getAllocation()->unmap(mData, crop, nullptr);

                        memset(&mLayout, 0, sizeof(mLayout));