summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/httplive/LiveSession.h
diff options
context:
space:
mode:
authorRobert Shih <robertshih@google.com>2014-09-12 18:24:02 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-09-12 18:24:02 +0000
commit84de1dc2512aa886638c103ee3e9f5c19f4a4a04 (patch)
treed86e7b3d4947d9cc3382757a77ff88ce76907cee /media/libstagefright/httplive/LiveSession.h
parentf2a74aad5efc01e5b9939c7cbbfde058ce64bfec (diff)
parent0ad776d2e4c6b4968d9dcd9bf34b962366b312a9 (diff)
downloadframeworks_av-84de1dc2512aa886638c103ee3e9f5c19f4a4a04.zip
frameworks_av-84de1dc2512aa886638c103ee3e9f5c19f4a4a04.tar.gz
frameworks_av-84de1dc2512aa886638c103ee3e9f5c19f4a4a04.tar.bz2
Merge "LiveSession: added onSwitchDown" into lmp-dev
Diffstat (limited to 'media/libstagefright/httplive/LiveSession.h')
-rw-r--r--media/libstagefright/httplive/LiveSession.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/media/libstagefright/httplive/LiveSession.h b/media/libstagefright/httplive/LiveSession.h
index aa06a3f..8a800da 100644
--- a/media/libstagefright/httplive/LiveSession.h
+++ b/media/libstagefright/httplive/LiveSession.h
@@ -108,6 +108,8 @@ private:
kWhatChangeConfiguration3 = 'chC3',
kWhatFinishDisconnect2 = 'fin2',
kWhatSwapped = 'swap',
+ kWhatCheckSwitchDown = 'ckSD',
+ kWhatSwitchDown = 'sDwn',
};
struct BandwidthItem {
@@ -202,6 +204,7 @@ private:
bool mFirstTimeUsValid;
int64_t mFirstTimeUs;
int64_t mLastSeekTimeUs;
+ sp<AMessage> mSwitchDownMonitor;
KeyedVector<size_t, int64_t> mDiscontinuityAbsStartTimesUs;
KeyedVector<size_t, int64_t> mDiscontinuityOffsetTimesUs;
@@ -246,6 +249,8 @@ private:
void onChangeConfiguration2(const sp<AMessage> &msg);
void onChangeConfiguration3(const sp<AMessage> &msg);
void onSwapped(const sp<AMessage> &msg);
+ void onCheckSwitchDown();
+ void onSwitchDown();
void tryToFinishBandwidthSwitch();
void scheduleCheckBandwidthEvent();