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

Commit 91e22933 authored by Arun Johnson's avatar Arun Johnson Committed by Automerger Merge Worker
Browse files

Merge "Fixes for out-of-memory error in MediaCodec" am: 5327070c am:... 

Merge "Fixes for out-of-memory error in MediaCodec" am: 5327070c am: 3fe0594b am: 49a05821 am: 9ed26435 am: b69f6f6f

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



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

media/codec2/sfplugin/CCodec.cpp

+8 −1
Original line number Diff line number Diff line
@@ -1803,9 +1803,16 @@ void CCodec::start() { 
    if (tryAndReportOnError(setRunning) != OK) {

        return;

    }



    err2 = mChannel->requestInitialInputBuffers();



    if (err2 != OK) {

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

        mCallback->onError(err2,ACTION_CODE_FATAL);

        return;

    }

    mCallback->onStartCompleted();



    (void)mChannel->requestInitialInputBuffers();

}



void CCodec::initiateShutdown(bool keepComponentAllocated) {

media/libstagefright/MediaCodec.cpp

+6 −1
Original line number Diff line number Diff line
@@ -1460,9 +1460,14 @@ status_t MediaCodec::init(const AString &name) { 
    if (mDomain == DOMAIN_VIDEO) {

        // video codec needs dedicated looper

        if (mCodecLooper == NULL) {

            status_t err = OK;

            mCodecLooper = new ALooper;

            mCodecLooper->setName("CodecLooper");

            mCodecLooper->start(false, false, ANDROID_PRIORITY_AUDIO);

            err = mCodecLooper->start(false, false, ANDROID_PRIORITY_AUDIO);

            if (OK != err) {

                ALOGE("Codec Looper failed to start");

                return err;

            }

        }



        mCodecLooper->registerHandler(mCodec);