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

Commit 1cf68fcb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "C2BqBuffer: fix to check consumer usage when migrating during surface... 

Merge "C2BqBuffer: fix to check consumer usage when migrating during surface change" into main am: 35672ce5

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



Change-Id: I4f377c86100b91b10964c2eb06b0b0a85e5b7e95
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2bbcc63d 35672ce5

media/codec2/vndk/platform/C2BqBuffer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -997,7 +997,7 @@ int C2BufferQueueBlockPoolData::migrate( 
        return -1;

    }



    if (toUsage != graphicBuffer->getUsage()) {

    if ((toUsage & graphicBuffer->getUsage()) != toUsage) {

        sp<GraphicBuffer> newBuffer = new GraphicBuffer(

            graphicBuffer->handle, GraphicBuffer::CLONE_HANDLE,

            graphicBuffer->width, graphicBuffer->height, graphicBuffer->format,