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

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

Merge "MediaCodec: configure to reclaim resources before reset" am: 2c40890d am: 79c1cf9b 

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

Change-Id: I9de3d59304d75bc9089f6948855c4f20b386a46c
parents ac2d02c4 79c1cf9b

media/libstagefright/MediaCodec.cpp

+3 −7
Original line number Diff line number Diff line
@@ -1369,16 +1369,12 @@ status_t MediaCodec::configure( 
    // the reclaimResource call doesn't consider the requester's buffer size for now.

    resources.push_back(MediaResource::GraphicMemoryResource(1));

    for (int i = 0; i <= kMaxRetry; ++i) {

        if (i > 0) {

            // Don't try to reclaim resource for the first time.

            if (!mResourceManagerProxy->reclaimResource(resources)) {

                break;

            }

        }



        sp<AMessage> response;

        err = PostAndAwaitResponse(msg, &response);

        if (err != OK && err != INVALID_OPERATION) {

            if (isResourceError(err) && !mResourceManagerProxy->reclaimResource(resources)) {

                break;

            }

            // MediaCodec now set state to UNINITIALIZED upon any fatal error.

            // To maintain backward-compatibility, do a reset() to put codec

            // back into INITIALIZED state.