diff options
| author | Marco Nelissen <marcone@google.com> | 2014-11-20 18:35:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-20 18:35:46 +0000 |
| commit | 574aed902443d41581684dc8bc5ddd2e067f4cdf (patch) | |
| tree | eab7a69bd4500f45674192a1366870579fc09d70 /media/libmediaplayerservice | |
| parent | 3a2a32b5e758854712caf638fe1f74bb49b50777 (diff) | |
| parent | 6c41e622512a99581afcbdbd6ad284237923c942 (diff) | |
| download | frameworks_av-574aed902443d41581684dc8bc5ddd2e067f4cdf.zip frameworks_av-574aed902443d41581684dc8bc5ddd2e067f4cdf.tar.gz frameworks_av-574aed902443d41581684dc8bc5ddd2e067f4cdf.tar.bz2 | |
Merge "When aggregating buffers, make sure we don't lose data" into lmp-mr1-dev
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayer.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp index dbc0441..c01f16a 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp @@ -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); |