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 /Adaptation/AbstractAdaptationLogic.cpp | |
parent | e207b82a2b7e70e2700cf1c4237a2e819c655809 (diff) | |
parent | a644414fd2c3a3f7f41e716b6875a78981e4cfe1 (diff) |
Merge "adding mpd live handling + automatic mpd fetching" into viper/master
Diffstat (limited to 'Adaptation/AbstractAdaptationLogic.cpp')
-rw-r--r-- | Adaptation/AbstractAdaptationLogic.cpp | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/Adaptation/AbstractAdaptationLogic.cpp b/Adaptation/AbstractAdaptationLogic.cpp index 4f578958..ada388b7 100644 --- a/Adaptation/AbstractAdaptationLogic.cpp +++ b/Adaptation/AbstractAdaptationLogic.cpp @@ -14,17 +14,16 @@ using namespace libdash::framework::adaptation; using namespace dash::mpd; -AbstractAdaptationLogic::AbstractAdaptationLogic(dash::mpd::IMPD *mpd, dash::mpd::IPeriod *period, dash::mpd::IAdaptationSet *adaptationSet, bool isVid) : - mpd (mpd), - period (period), - adaptationSet (adaptationSet), - representation (NULL), - isVideo (isVid) +AbstractAdaptationLogic::AbstractAdaptationLogic(viper::managers::StreamType type, libdash::framework::mpd::MPDWrapper *mpdWrapper) : + mpdWrapper (mpdWrapper), + type (type) { + InitializeCriticalSection (&this->monitorLock); } AbstractAdaptationLogic::~AbstractAdaptationLogic() { + DeleteCriticalSection (&this->monitorLock); } uint32_t AbstractAdaptationLogic::getPosition() @@ -39,15 +38,19 @@ void AbstractAdaptationLogic::setPosition(uint32_t segmentNumber) IRepresentation* AbstractAdaptationLogic::getRepresentation() { - return this->representation; +// return this->representation; } -void AbstractAdaptationLogic::setRepresentation(IPeriod *period, IAdaptationSet *adaptationSet, IRepresentation *representation) -{ - this->period = period; - this->adaptationSet = adaptationSet; - this->representation = representation; -} +//void AbstractAdaptationLogic::setRepresentation(IPeriod *period, IAdaptationSet *adaptationSet, IRepresentation *representation) +//{ +// this->period = period; +// this->adaptationSet = adaptationSet; +// this->representation = representation; +//} + +//void AbstractAdaptationLogic::updateMPD(IMPD* mpd) +//{ +//} void AbstractAdaptationLogic::dLTimeUpdate(double time) { |