diff options
author | Andreas Gampe <agampe@google.com> | 2014-11-27 05:48:30 -0800 |
---|---|---|
committer | Andreas Gampe <agampe@google.com> | 2014-11-27 05:48:30 -0800 |
commit | 5a88501c8f677e34afb2043d7e81d8e09d6fa5f4 (patch) | |
tree | 4569ce180afcbc2aa3afaa35b06581e585294b4e /media/libstagefright/httplive/LiveSession.cpp | |
parent | 61280541836947ce0b281b240ffa4c55bbf5bd55 (diff) | |
parent | e5ba80c5c802ddad57e1132675c32b479c16758a (diff) | |
download | frameworks_av-5a88501c8f677e34afb2043d7e81d8e09d6fa5f4.zip frameworks_av-5a88501c8f677e34afb2043d7e81d8e09d6fa5f4.tar.gz frameworks_av-5a88501c8f677e34afb2043d7e81d8e09d6fa5f4.tar.bz2 |
resolved conflicts for merge of e5ba80c5 to lmp-mr1-dev-plus-aosp
Change-Id: Iea12c8a6cabf84584e4a89ad80e298c1f4ea3dd7
Diffstat (limited to 'media/libstagefright/httplive/LiveSession.cpp')
-rw-r--r-- | media/libstagefright/httplive/LiveSession.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/media/libstagefright/httplive/LiveSession.cpp b/media/libstagefright/httplive/LiveSession.cpp index 5eb4652..6522ad7 100644 --- a/media/libstagefright/httplive/LiveSession.cpp +++ b/media/libstagefright/httplive/LiveSession.cpp @@ -685,7 +685,6 @@ void LiveSession::onConnect(const sp<AMessage> &msg) { AString uri; mPlaylist->itemAt(i, &uri, &meta); - unsigned long bandwidth; CHECK(meta->findInt32("bandwidth", (int32_t *)&item.mBandwidth)); if (initialBandwidth == 0) { @@ -962,9 +961,11 @@ sp<M3UParser> LiveSession::fetchPlaylist( return playlist; } +#if 0 static double uniformRand() { return (double)rand() / RAND_MAX; } +#endif size_t LiveSession::getBandwidthIndex() { if (mBandwidthItems.size() == 0) { @@ -1441,7 +1442,6 @@ void LiveSession::onChangeConfiguration3(const sp<AMessage> &msg) { sp<PlaylistFetcher> fetcher = addFetcher(uri.c_str()); CHECK(fetcher != NULL); - int32_t latestSeq = -1; int64_t startTimeUs = -1; int64_t segmentStartTimeUs = -1ll; int32_t discontinuitySeq = -1; @@ -1469,7 +1469,6 @@ void LiveSession::onChangeConfiguration3(const sp<AMessage> &msg) { ATSParser::DISCONTINUITY_TIME, extra, true); } else { int32_t type; - int64_t srcSegmentStartTimeUs; sp<AMessage> meta; if (pickTrack) { // selecting |