diff options
author | Andreas Huber <andih@google.com> | 2011-01-21 10:15:23 -0800 |
---|---|---|
committer | Andreas Huber <andih@google.com> | 2011-01-21 10:34:40 -0800 |
commit | 19922adceb29a3192a63e35a07fb02412aa2a4a2 (patch) | |
tree | 35fff4a4b1be99a3e25313dcefa6b8f91bf614fe /media/libmediaplayerservice/nuplayer | |
parent | c2ff2ec0d987dd1372183d2a18ea59a0c4d71c2c (diff) | |
download | frameworks_base-19922adceb29a3192a63e35a07fb02412aa2a4a2.zip frameworks_base-19922adceb29a3192a63e35a07fb02412aa2a4a2.tar.gz frameworks_base-19922adceb29a3192a63e35a07fb02412aa2a4a2.tar.bz2 |
Some tweaks to HTTP live / nuplayer behaviour
- play audio-only streams again
- workaround for malformed streams that switch PIDs across bandwidths
- attempt to pick a different bandwidth stream if the previously chosen one appears
to be malformed/unsupported.
Change-Id: I426d0a40dc725aa242f619d4c9d048b69aca55c9
related-to-bug: 2368598
Diffstat (limited to 'media/libmediaplayerservice/nuplayer')
-rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp index 93e5c14..369a3a8 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp @@ -40,9 +40,9 @@ NuPlayer::Renderer::Renderer( mAnchorTimeRealUs(-1), mFlushingAudio(false), mFlushingVideo(false), - mHasAudio(mAudioSink != NULL), - mHasVideo(true), - mSyncQueues(mHasAudio && mHasVideo), + mHasAudio(false), + mHasVideo(false), + mSyncQueues(false), mPaused(false) { } @@ -360,6 +360,12 @@ void NuPlayer::Renderer::onQueueBuffer(const sp<AMessage> &msg) { int32_t audio; CHECK(msg->findInt32("audio", &audio)); + if (audio) { + mHasAudio = true; + } else { + mHasVideo = true; + } + if (dropBufferWhileFlushing(audio, msg)) { return; } |