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

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

Merge "Fix race b/w prepareInitialInputBuffers and... 

Merge "Fix race b/w  prepareInitialInputBuffers and feedInputBuffersIfAvailable" into udc-dev am: 9f896f2f

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



Change-Id: I0e1a210bfab58d7d299f8558dac383a279443c1a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5397d5f1 9f896f2f

media/codec2/sfplugin/CCodec.cpp

+20 −8
Original line number Diff line number Diff line
@@ -1828,6 +1828,7 @@ void CCodec::start() { 
        mCallback->onError(err2, ACTION_CODE_FATAL);

        return;

    }



    err2 = mChannel->start(inputFormat, outputFormat, buffersBoundToCodec);

    if (err2 != OK) {

        mCallback->onError(err2, ACTION_CODE_FATAL);
@@ -2131,6 +2132,25 @@ void CCodec::signalResume() { 
        RevertOutputFormatIfNeeded(outputFormat, config->mOutputFormat);

    }



    std::map<size_t, sp<MediaCodecBuffer>> clientInputBuffers;

    status_t err = mChannel->prepareInitialInputBuffers(&clientInputBuffers);

    if (err != OK) {

        if (err == NO_MEMORY) {

            // NO_MEMORY happens here when all the buffers are still

            // with the codec. That is not an error as it is momentarily

            // and the buffers are send to the client as soon as the codec

            // releases them

            ALOGI("Resuming with all input buffers still with codec");

        } else {

            ALOGE("Resume request for Input Buffers failed");

            mCallback->onError(err, ACTION_CODE_FATAL);

            return;

        }

    }



    // channel start should be called after prepareInitialBuffers

    // Calling before can cause a failure during prepare when

    // buffers are sent to the client before preparation from onWorkDone

    (void)mChannel->start(nullptr, nullptr, [&]{

        Mutexed<std::unique_ptr<Config>>::Locked configLocked(mConfig);

        const std::unique_ptr<Config> &config = *configLocked;
@@ -2148,14 +2168,6 @@ void CCodec::signalResume() { 
        state->set(RUNNING);

    }



    std::map<size_t, sp<MediaCodecBuffer>> clientInputBuffers;

    status_t err = mChannel->prepareInitialInputBuffers(&clientInputBuffers);

    // FIXME(b/237656746)

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

        ALOGE("Resume request for Input Buffers failed");

        mCallback->onError(err, ACTION_CODE_FATAL);

        return;

    }

    mChannel->requestInitialInputBuffers(std::move(clientInputBuffers));

}