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

Commit 574aed90 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "When aggregating buffers, make sure we don't lose data" into lmp-mr1-dev

parents 3a2a32b5 6c41e622

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

+6 −0
Original line number Diff line number Diff line
@@ -1345,6 +1345,12 @@ status_t NuPlayer::feedDecoderInputData(bool audio, const sp<AMessage> &msg) { 
                    // This stream is unaffected by the discontinuity

                    return -EWOULDBLOCK;

                }

            } else if (err == ERROR_END_OF_STREAM

                    && doBufferAggregation && (mAggregateBuffer != NULL)) {

                // send out the last bit of aggregated data

                reply->setBuffer("buffer", mAggregateBuffer);

                mAggregateBuffer.clear();

                err = OK;

            }



            reply->setInt32("err", err);