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

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

Merge "MediaCodec: Report error when render surface is obsolete" am:... 

Merge "MediaCodec: Report error when render surface is obsolete" am: 36cd37ff am: d15d3bf2 am: 573a0948

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I933b277c51cce0299340e9f6fa83fe4d72d34d03
parents c173fc97 573a0948

media/libstagefright/MediaCodec.cpp

+9 −1
Original line number Diff line number Diff line
@@ -4094,7 +4094,15 @@ status_t MediaCodec::onReleaseOutputBuffer(const sp<AMessage> &msg) { 
                }

            }

        }

        mBufferChannel->renderOutputBuffer(buffer, renderTimeNs);

        status_t err = mBufferChannel->renderOutputBuffer(buffer, renderTimeNs);



        if (err == NO_INIT) {

            ALOGE("rendering to non-initilized(obsolete) surface");

            return err;

        }

        if (err != OK) {

            ALOGI("rendring output error %d", err);

        }

    } else {

        mBufferChannel->discardBuffer(buffer);

    }