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

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

Merge "CCodec: ignore prepareInitialInputBuffers returning NO_MEMORY error"... 

Merge "CCodec: ignore prepareInitialInputBuffers returning NO_MEMORY error" into tm-qpr-dev am: 0dc459d7 am: 672aae8d

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



Change-Id: Ibdecd23d4f476bda0eff19a4015e07e0120b9a47
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8bbf27e3 672aae8d

media/codec2/sfplugin/CCodec.cpp

+2 −1
Original line number Diff line number Diff line
@@ -2141,7 +2141,8 @@ void CCodec::signalResume() { 


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

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

    if (err != OK) {

    // FIXME(b/237656746)

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

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

        mCallback->onError(err, ACTION_CODE_FATAL);

        return;