summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/httplive/LiveSession.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2013-04-01 21:40:34 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-01 21:40:34 +0000
commite574eecea416c813d539a0977d5393c3ed291a1c (patch)
tree3d90f6c0e975a2757b8e5108f6ee0f8900c65057 /media/libstagefright/httplive/LiveSession.cpp
parentdde3ae3878c3ebed799dc7422a8df2b28f5f3969 (diff)
parent7069bdf24a9e3393479368e83f9009817869c33c (diff)
downloadframeworks_av-e574eecea416c813d539a0977d5393c3ed291a1c.zip
frameworks_av-e574eecea416c813d539a0977d5393c3ed291a1c.tar.gz
frameworks_av-e574eecea416c813d539a0977d5393c3ed291a1c.tar.bz2
Merge "Fix seek in response to OnPrepared() for HLS content" into jb-mr2-dev
Diffstat (limited to 'media/libstagefright/httplive/LiveSession.cpp')
-rw-r--r--media/libstagefright/httplive/LiveSession.cpp24
1 files changed, 11 insertions, 13 deletions
diff --git a/media/libstagefright/httplive/LiveSession.cpp b/media/libstagefright/httplive/LiveSession.cpp
index 962b01c..505bdb3 100644
--- a/media/libstagefright/httplive/LiveSession.cpp
+++ b/media/libstagefright/httplive/LiveSession.cpp
@@ -631,22 +631,20 @@ rinse_repeat:
if (index < mPlaylist->size()) {
int32_t newSeqNumber = firstSeqNumberInPlaylist + index;
- if (newSeqNumber != mSeqNumber) {
- ALOGI("seeking to seq no %d", newSeqNumber);
+ ALOGI("seeking to seq no %d", newSeqNumber);
- mSeqNumber = newSeqNumber;
+ mSeqNumber = newSeqNumber;
- mDataSource->reset();
+ mDataSource->reset();
- // reseting the data source will have had the
- // side effect of discarding any previously queued
- // bandwidth change discontinuity.
- // Therefore we'll need to treat these seek
- // discontinuities as involving a bandwidth change
- // even if they aren't directly.
- seekDiscontinuity = true;
- bandwidthChanged = true;
- }
+ // reseting the data source will have had the
+ // side effect of discarding any previously queued
+ // bandwidth change discontinuity.
+ // Therefore we'll need to treat these seek
+ // discontinuities as involving a bandwidth change
+ // even if they aren't directly.
+ seekDiscontinuity = true;
+ bandwidthChanged = true;
}
}