diff options
author | Luca Muscariello <lumuscar+fdio@cisco.com> | 2017-06-23 14:51:19 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@fd.io> | 2017-06-23 14:51:19 +0000 |
commit | ea99c36cadfab26fe4bf523931f87132c01a54a2 (patch) | |
tree | 13fc8ff2f6072add96f987a1a68a15c22d68d911 /UI/DASHPlayerNoGUI.h | |
parent | e207b82a2b7e70e2700cf1c4237a2e819c655809 (diff) | |
parent | a644414fd2c3a3f7f41e716b6875a78981e4cfe1 (diff) |
Merge "adding mpd live handling + automatic mpd fetching" into viper/master
Diffstat (limited to 'UI/DASHPlayerNoGUI.h')
-rw-r--r-- | UI/DASHPlayerNoGUI.h | 47 |
1 files changed, 15 insertions, 32 deletions
diff --git a/UI/DASHPlayerNoGUI.h b/UI/DASHPlayerNoGUI.h index 58ba52c4..4b070de8 100644 --- a/UI/DASHPlayerNoGUI.h +++ b/UI/DASHPlayerNoGUI.h @@ -50,42 +50,25 @@ public: virtual void notifyStatistics(int, uint32_t, int, uint32_t); virtual void notifyQualityDownloading(uint32_t); virtual bool onDownloadMPDPressed(const std::string &url); + virtual void setMPDWrapper(libdash::framework::mpd::MPDWrapper* mpdWrapper); bool isRunning(); private: - dash::mpd::IMPD *mpd; - viper::managers::MultimediaManager *multimediaManager; - CRITICAL_SECTION monitorMutex; - char *url; - bool isICN; - libdash::framework::adaptation::LogicType adaptLogic; - pthread_cond_t *mainCond; - bool running; +// dash::mpd::IMPD *mpd; + libdash::framework::mpd::MPDWrapper *mpdWrapper; + viper::managers::MultimediaManager *multimediaManager; + CRITICAL_SECTION monitorMutex; + char *url; + bool isICN; + libdash::framework::adaptation::LogicType adaptLogic; + pthread_cond_t *mainCond; + bool running; struct libdash::framework::adaptation::AdaptationParameters *parameterAdaptation; - float segmentDuration; - int segmentBufferSize; - double alpha; - double rateAlpha; - double bolaAlpha; - double bolaBufferTargetSeconds; - int bufferBasedReservoirThreshold; - int bufferBasedMaxThreshold; - double adaptechAlpha; - int adaptechFirstThreshold; - int adaptechSecondThreshold; - int adaptechSwitchUpThreshold; - int bufferThreeThreshold_FirstThreshold; - int bufferThreeThreshold_SecondThreshold; - int bufferThreeThreshold_ThirdThreshold; - double pandaAlpha; - double pandaParam_Beta; - double pandaParam_Bmin; - double pandaParam_K; - double pandaParam_W; - double pandaParamEpsilon; - bool repeat; - GraphDataSource *graphData; - bool noDecoding; + double alpha; + bool repeat; + GraphDataSource *graphData; + bool noDecoding; + bool settingsChanged(int period, int videoAdaptationSet, int videoRepresentation, int audioAdaptationSet, int audioRepresentation); }; |