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

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

Merge "Nuplayer: Handle get input/output format errors cleanly" into main am:... 

Merge "Nuplayer: Handle get input/output format errors cleanly" into main am: e96460a6 am: bde97ecc

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



Change-Id: I7d88fe7aa880e3ceb339c4fe5964e1c0c0a9566f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3cd39340 bde97ecc

media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp

+12 −3
Original line number Diff line number Diff line
@@ -374,9 +374,18 @@ void NuPlayer::Decoder::onConfigure(const sp<AMessage> &format) { 
    }

    rememberCodecSpecificData(format);



    // the following should work in configured state

    CHECK_EQ((status_t)OK, mCodec->getOutputFormat(&mOutputFormat));

    CHECK_EQ((status_t)OK, mCodec->getInputFormat(&mInputFormat));

    err = mCodec->getOutputFormat(&mOutputFormat);

    if (err == OK) {

        err = mCodec->getInputFormat(&mInputFormat);

    }

    if (err != OK) {

        ALOGE("Failed to get input/output format from [%s] decoder (err=%d)",

                mComponentName.c_str(), err);

        mCodec->release();

        mCodec.clear();

        handleError(err);

        return;

    }



    {

        Mutex::Autolock autolock(mStatsLock);