diff options
author | Chong Zhang <chz@google.com> | 2015-04-21 09:33:47 -0700 |
---|---|---|
committer | Chong Zhang <chz@google.com> | 2015-04-21 10:04:13 -0700 |
commit | 81636761bead03f13b4ed9320a7f25ce1354f1ae (patch) | |
tree | 310928bec3d9bfffae1bfc88f0cb1c744b843373 /media/libmediaplayerservice | |
parent | ea44f41bb142555e747cc11382296e94af99d312 (diff) | |
download | frameworks_av-81636761bead03f13b4ed9320a7f25ce1354f1ae.zip frameworks_av-81636761bead03f13b4ed9320a7f25ce1354f1ae.tar.gz frameworks_av-81636761bead03f13b4ed9320a7f25ce1354f1ae.tar.bz2 |
HLS: remove no more than 10% of bandwidth history at a time
- fix a 'possible video time jump' after seek, don't update
renderer anchor time for 0-sized audio buffers
- fix another 'possible video time jump' caused by some states
not reset in mStreams
- bandwidth estimator changes to not remove more than 10%
of total transfer duration at a time to avoid jumping up
too quickly
bug: 20267388
related-to-bug: 19864613
related-to-bug: 20138395
Change-Id: I8812332cd1e26bf562acfaf086fd679a3549debc
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); |