diff options
| author | Lajos Molnar <lajos@google.com> | 2014-09-17 19:54:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-17 19:54:34 +0000 |
| commit | 888d02568996e0a554bad1839f62796b305e5f3a (patch) | |
| tree | 76c23b483cd7e86fd5e115906925990f0a60aed4 /media | |
| parent | 69d411ee449063c4a6ebc0177dd506b92a02882d (diff) | |
| parent | 3a6a0f9daa766b280326c7f6007dd388a71fbccb (diff) | |
| download | frameworks_av-888d02568996e0a554bad1839f62796b305e5f3a.zip frameworks_av-888d02568996e0a554bad1839f62796b305e5f3a.tar.gz frameworks_av-888d02568996e0a554bad1839f62796b305e5f3a.tar.bz2 | |
am 3a6a0f9d: Merge "mediaplayer: reset flags when pre-reading multiple buffers" into lmp-dev
* commit '3a6a0f9daa766b280326c7f6007dd388a71fbccb':
mediaplayer: reset flags when pre-reading multiple buffers
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/GenericSource.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp index bd67cbd..3eb87a4 100644 --- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp +++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp @@ -1256,6 +1256,8 @@ void NuPlayer::GenericSource::readBuffer( sp<ABuffer> buffer = mediaBufferToABuffer(mbuf, trackType, actualTimeUs); track->mPackets->queueAccessUnit(buffer); + formatChange = false; + seeking = false; ++numBuffers; } else if (err == WOULD_BLOCK) { break; |