summaryrefslogtreecommitdiffstats
path: root/media
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
commit919511a6da6a8d49857d7c0c5fa2e9d66d42efc2 (patch)
tree43cbe32c65e640617bcb1bf6dd84f2541ecee296 /media
parente16b2955292d7f1e596896cf80d8781d47ae9433 (diff)
parent86806f75b49a18c4d7f7b2c986a628a0f7c1864f (diff)
downloadframeworks_base-919511a6da6a8d49857d7c0c5fa2e9d66d42efc2.zip
frameworks_base-919511a6da6a8d49857d7c0c5fa2e9d66d42efc2.tar.gz
frameworks_base-919511a6da6a8d49857d7c0c5fa2e9d66d42efc2.tar.bz2
Merge "Always consider playlists corresponding to different bandwidths different."
Diffstat (limited to 'media')
-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) {