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

Commit 37032703 authored by Dorin Drimus's avatar Dorin Drimus Committed by Gerrit Code Review
Browse files

Merge "Refactor MediaCodec restart flow" into main

parents 4e9aef50 5d258a4b

media/libstagefright/MediaCodec.cpp

+6 −6
Original line number Diff line number Diff line
@@ -2991,12 +2991,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) {
@@ -3005,6 +2999,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.