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

Commit 65344483 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "CCodec: request initial input buffers after start complete callback"... 

Merge "CCodec: request initial input buffers after start complete callback" into tm-dev am: a9c6db92 am: cf52841c

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



Change-Id: I6d74b2c3b318cbc815aeaafcab7d3ecb8bd08548
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 94560b2d cf52841c

media/codec2/sfplugin/CCodec.cpp

+8 −6
Original line number Diff line number Diff line
@@ -1826,15 +1826,13 @@ void CCodec::start() { 
        return;

    }



    err2 = mChannel->requestInitialInputBuffers();

    mCallback->onStartCompleted();



    err2 = mChannel->requestInitialInputBuffers();

    if (err2 != OK) {

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

        mCallback->onError(err2, ACTION_CODE_FATAL);

        return;

    }

    mCallback->onStartCompleted();



}



void CCodec::initiateShutdown(bool keepComponentAllocated) {
@@ -2128,7 +2126,11 @@ void CCodec::signalResume() { 
        state->set(RUNNING);

    }



    (void)mChannel->requestInitialInputBuffers();

    status_t err = mChannel->requestInitialInputBuffers();

    if (err != OK) {

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

        mCallback->onError(err, ACTION_CODE_FATAL);

    }

}



void CCodec::signalSetParameters(const sp<AMessage> &msg) {