summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-01-21 10:15:23 -0800
committerAndreas Huber <andih@google.com>2011-01-21 10:34:40 -0800
commitbc7f5b2e56107cfeaeeab13cf8979379e3c2f139 (patch)
treedffbfa1a0c661a0bd986d3ef8d80287cb0bcc513 /media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
parentb408222bd9479c291874b607acae1425d6154fe7 (diff)
downloadframeworks_av-bc7f5b2e56107cfeaeeab13cf8979379e3c2f139.zip
frameworks_av-bc7f5b2e56107cfeaeeab13cf8979379e3c2f139.tar.gz
frameworks_av-bc7f5b2e56107cfeaeeab13cf8979379e3c2f139.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/NuPlayerRenderer.cpp')
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp12
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;
}