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

Commit 9dad026b authored by Marco Nelissen's avatar Marco Nelissen Committed by Android Git Automerger
Browse files

am 574aed90: Merge "When aggregating buffers, make sure we don\'t lose data" into lmp-mr1-dev 

* commit '574aed90':
  When aggregating buffers, make sure we don't lose data
parents 568689b1 574aed90

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);