diff options
| author | Apurupa Pattapu <apurupa@codeaurora.org> | 2015-02-02 15:29:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-02 15:29:49 +0000 |
| commit | ff430c633e52f15acdd305953e6071b75f1e700c (patch) | |
| tree | f3adf7e366437f31c3a830d35acf0c81f29a6e80 /media/libstagefright/httplive | |
| parent | e33dee9e041c6ad8d822f717ef141d657da96c32 (diff) | |
| parent | e3ada5d580a32b0133ac3db881e1574af57cb4fc (diff) | |
| download | frameworks_av-ff430c633e52f15acdd305953e6071b75f1e700c.zip frameworks_av-ff430c633e52f15acdd305953e6071b75f1e700c.tar.gz frameworks_av-ff430c633e52f15acdd305953e6071b75f1e700c.tar.bz2 | |
am e3ada5d5: am 678bcdc8: httplive: Defer switch down if a switch is in progress
* commit 'e3ada5d580a32b0133ac3db881e1574af57cb4fc':
httplive: Defer switch down if a switch is in progress
Diffstat (limited to 'media/libstagefright/httplive')
| -rw-r--r-- | media/libstagefright/httplive/LiveSession.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/media/libstagefright/httplive/LiveSession.cpp b/media/libstagefright/httplive/LiveSession.cpp index 190188a..d3f25a1 100644 --- a/media/libstagefright/httplive/LiveSession.cpp +++ b/media/libstagefright/httplive/LiveSession.cpp @@ -1627,6 +1627,12 @@ void LiveSession::onCheckSwitchDown() { return; } + if (mSwitchInProgress || mReconfigurationInProgress) { + ALOGV("Switch/Reconfig in progress, defer switch down"); + mSwitchDownMonitor->post(1000000ll); + return; + } + for (size_t i = 0; i < kMaxStreams; ++i) { int32_t targetDuration; sp<AnotherPacketSource> packetSource = mPacketSources.valueFor(indexToType(i)); @@ -1657,7 +1663,6 @@ void LiveSession::onSwitchDown() { return; } - changeConfiguration(-1, mCurBandwidthIndex - 1, false); } // Mark switch done when: |