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/DASHPlayer.h | |
| parent | e207b82a2b7e70e2700cf1c4237a2e819c655809 (diff) | |
| parent | a644414fd2c3a3f7f41e716b6875a78981e4cfe1 (diff) | |
Merge "adding mpd live handling + automatic mpd fetching" into viper/master
Diffstat (limited to 'UI/DASHPlayer.h')
| -rw-r--r-- | UI/DASHPlayer.h | 57 |
1 files changed, 30 insertions, 27 deletions
diff --git a/UI/DASHPlayer.h b/UI/DASHPlayer.h index fad28710..6204f46a 100644 --- a/UI/DASHPlayer.h +++ b/UI/DASHPlayer.h @@ -60,6 +60,7 @@ public: virtual void notifyStatistics(int, uint32_t, int, uint32_t); virtual void notifyQualityDownloading(uint32_t); virtual bool onDownloadMPDPressed(const std::string &url); + void setMPDWrapper(libdash::framework::mpd::MPDWrapper* mpdWrapper); void setConfig(Config *config); Q_INVOKABLE bool downloadMPD(const QString &url, const QString &adaptationLogic, bool icn); Q_INVOKABLE void pause(); @@ -160,34 +161,36 @@ public: Q_INVOKABLE int getRateEstimator(); private: - float gamma; - float beta; - float drop; - bool seek; - bool isLive; - Config *config; - bool repeat; - float segmentDuration; - uint64_t offset; - uint64_t position; - int segment; - int adaptationLogic; - dash::mpd::IMPD *mpd; - ViperGui *gui = NULL; - viper::managers::MultimediaManager *multimediaManager; - settings_t currentSettings; - CRITICAL_SECTION monitorMutex; - const char *url; - bool icn; - std::string icnPrefix; - std::string httpPrefix; - std::string icnSuffix; - std::string httpSuffix; - double alpha; + float gamma; + float beta; + float drop; + bool seek; + bool isLive; + Config *config; + bool repeat; + float segmentDuration; + uint64_t offset; + uint64_t position; + int segment; + int adaptationLogic; + dash::mpd::IMPD *mpd; + libdash::framework::mpd::MPDWrapper *mpdWrapper; + ViperGui *gui = NULL; + viper::managers::MultimediaManager *multimediaManager; + settings_t currentSettings; + CRITICAL_SECTION monitorMutex; + const char *url; + bool icn; + std::string icnPrefix; + std::string httpPrefix; + std::string icnSuffix; + std::string httpSuffix; + double alpha; struct libdash::framework::adaptation::AdaptationParameters *parametersAdaptation; - libdash::framework::adaptation::LogicType adaptLogic; - std::map<int,std::tuple<uint32_t, int, uint32_t>> mStats; - int qualityDownloading; + libdash::framework::adaptation::LogicType adaptLogic; + std::map<int,std::tuple<uint32_t, int, uint32_t>> mStats; + int qualityDownloading; + bool settingsChanged(int period, int videoAdaptationSet, int videoRepresentation, int audioAdaptationSet, int audioRepresentation); void setSettings(int period, int videoAdaptationSet, int videoRepresentation, int audioAdaptationSet, int audioRepresentation); std::string msec2string(uint64_t milliseconds); |