diff options
| author | Chong Zhang <chz@google.com> | 2015-04-21 17:36:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-21 17:36:43 +0000 |
| commit | c9c3804a2caf3c0f96e7a8985f82db7ceef490df (patch) | |
| tree | 0e59989e54752cb2214575f360aac3a248cad4c8 /media/libmediaplayerservice | |
| parent | 56ef88d6219f624d8c50424c28a77d7d27166157 (diff) | |
| parent | 81636761bead03f13b4ed9320a7f25ce1354f1ae (diff) | |
| download | frameworks_av-c9c3804a2caf3c0f96e7a8985f82db7ceef490df.zip frameworks_av-c9c3804a2caf3c0f96e7a8985f82db7ceef490df.tar.gz frameworks_av-c9c3804a2caf3c0f96e7a8985f82db7ceef490df.tar.bz2 | |
Merge "HLS: remove no more than 10% of bandwidth history at a time"
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp index f8be16a..f229452 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp @@ -621,7 +621,8 @@ bool NuPlayer::Renderer::onDrainAudioQueue() { return false; } - if (entry->mOffset == 0) { + // ignore 0-sized buffer which could be EOS marker with no data + if (entry->mOffset == 0 && entry->mBuffer->size() > 0) { int64_t mediaTimeUs; CHECK(entry->mBuffer->meta()->findInt64("timeUs", &mediaTimeUs)); ALOGV("rendering audio at media time %.2f secs", mediaTimeUs / 1E6); |