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

Commit 3b123d17 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libstagefright: add default gralloc usage for detached surface" into... 

Merge "libstagefright: add default gralloc usage for detached surface" into main am: ee0882a4 am: ef131583

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



Change-Id: Ib34b5a06910063d3383474c416e9c58e4ea629ff
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 62120d24 ef131583

media/libstagefright/MediaCodec.cpp

+2 −2
Original line number Diff line number Diff line
@@ -6699,8 +6699,8 @@ sp<Surface> MediaCodec::getOrCreateDetachedSurface() { 
    if (!mDetachedSurface) {

        uint64_t usage = 0;

        if (!mSurface || mSurface->getConsumerUsage(&usage) != OK) {

            // TODO: should we use a/the default consumer usage?

            usage = 0;

            // By default prepare buffer to be displayed on any of the common surfaces

            usage = (GRALLOC_USAGE_HW_TEXTURE | GRALLOC_USAGE_HW_COMPOSER);

        }

        mDetachedSurface.reset(new ReleaseSurface(usage));

    }