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

Commit 4b8e3fb5 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 22777 into eclair 

* changes:
  Disregard the EOS buffer flag while flushing or shutting down the decoder.
parents c27bff91 d7795892

media/libstagefright/OMXCodec.cpp

+2 −1
Original line number Diff line number Diff line
@@ -857,7 +857,8 @@ void OMXCodec::on_message(const omx_message &msg) { 
                CHECK_EQ(err, OK);



                buffers->removeAt(i);

            } else if (flags & OMX_BUFFERFLAG_EOS) {

            } else if (mPortStatus[kPortIndexOutput] == ENABLED

                       && (flags & OMX_BUFFERFLAG_EOS)) {

                LOGV("No more output data.");

                mNoMoreOutputData = true;

                mBufferFilled.signal();