summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Shih <robertshih@google.com>2014-02-24 23:01:24 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-02-24 23:01:25 +0000
commitabe70ef5771b9dee1d8cbbef957ba48fdc9cad8f (patch)
tree0dd77f9fa9ccecd3181bf8af8a7c0c9c972e0e3e
parent3f73448090d99612c6d8f579e4164507d8848cc1 (diff)
parentdc793ce8c0ead27ab43e40ce09f27fe338323502 (diff)
downloadframeworks_av-abe70ef5771b9dee1d8cbbef957ba48fdc9cad8f.zip
frameworks_av-abe70ef5771b9dee1d8cbbef957ba48fdc9cad8f.tar.gz
frameworks_av-abe70ef5771b9dee1d8cbbef957ba48fdc9cad8f.tar.bz2
Merge "LiveSession refactor: reverted loop indice change."
-rw-r--r--media/libstagefright/httplive/LiveSession.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/media/libstagefright/httplive/LiveSession.cpp b/media/libstagefright/httplive/LiveSession.cpp
index bc26de1..95779c4 100644
--- a/media/libstagefright/httplive/LiveSession.cpp
+++ b/media/libstagefright/httplive/LiveSession.cpp
@@ -1007,8 +1007,7 @@ void LiveSession::onChangeConfiguration3(const sp<AMessage> &msg) {
uint32_t resumeMask = 0;
sp<AnotherPacketSource> sources[kMaxStreams];
- // TRICKY: looping from i as earlier streams are already removed from streamMask
- for (size_t j = i; j < kMaxStreams; ++j) {
+ for (size_t j = 0; j < kMaxStreams; ++j) {
if ((streamMask & indexToType(j)) && uri == mStreams[j].mUri) {
sources[j] = mPacketSources.valueFor(indexToType(j));
resumeMask |= indexToType(j);