summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-07-18 09:04:28 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-07-18 09:04:28 -0700
commit67a124dcac0578aed94aebf451675a5f4c8a1e4e (patch)
treeb331cf88c9bcab98d24c956bda1727c39d35753a
parent634538b2017ca0760a68d8be016fedaeed30f136 (diff)
parent8dae4ca229d21f68f3ee76c76b49b6f0a47aad53 (diff)
downloadframeworks_av-67a124dcac0578aed94aebf451675a5f4c8a1e4e.zip
frameworks_av-67a124dcac0578aed94aebf451675a5f4c8a1e4e.tar.gz
frameworks_av-67a124dcac0578aed94aebf451675a5f4c8a1e4e.tar.bz2
Merge "Always consider playlists corresponding to different bandwidths different."
-rw-r--r--media/libstagefright/httplive/LiveSession.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/media/libstagefright/httplive/LiveSession.cpp b/media/libstagefright/httplive/LiveSession.cpp
index ca61b3d..73b3d5b 100644
--- a/media/libstagefright/httplive/LiveSession.cpp
+++ b/media/libstagefright/httplive/LiveSession.cpp
@@ -494,6 +494,12 @@ rinse_repeat:
bool firstTime = (mPlaylist == NULL);
+ if ((ssize_t)bandwidthIndex != mPrevBandwidthIndex) {
+ // If we switch bandwidths, do not pay any heed to whether
+ // playlists changed since the last time...
+ mPlaylist.clear();
+ }
+
bool unchanged;
sp<M3UParser> playlist = fetchPlaylist(url.c_str(), &unchanged);
if (playlist == NULL) {