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

Commit 2aca3794 authored by Dorin Drimus's avatar Dorin Drimus Committed by Automerger Merge Worker
Browse files

Merge "Refactor MediaCodec restart flow" into main am: 37032703 

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



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

media/libstagefright/MediaCodec.cpp

+6 −6
Original line number Diff line number Diff line
@@ -2994,12 +2994,6 @@ status_t MediaCodec::start() { 
                ALOGE("retrying start: failed to reset codec");

                break;

            }

            sp<AMessage> response;

            err = PostAndAwaitResponse(mConfigureMsg, &response);

            if (err != OK) {

                ALOGE("retrying start: failed to configure codec");

                break;

            }

            if (callback != nullptr) {

                err = setCallback(callback);

                if (err != OK) {
@@ -3008,6 +3002,12 @@ status_t MediaCodec::start() { 
                }

                ALOGD("succeed to set callback for reclaim");

            }

            sp<AMessage> response;

            err = PostAndAwaitResponse(mConfigureMsg, &response);

            if (err != OK) {

                ALOGE("retrying start: failed to configure codec");

                break;

            }

        }



        // Keep callback message after the first iteration if necessary.