aboutsummaryrefslogtreecommitdiffstats
path: root/Managers
diff options
context:
space:
mode:
Diffstat (limited to 'Managers')
-rw-r--r--Managers/MultimediaManager.cpp1
-rw-r--r--Managers/MultimediaStream.cpp37
-rw-r--r--Managers/MultimediaStream.h31
3 files changed, 22 insertions, 47 deletions
diff --git a/Managers/MultimediaManager.cpp b/Managers/MultimediaManager.cpp
index 23118464..44473b04 100644
--- a/Managers/MultimediaManager.cpp
+++ b/Managers/MultimediaManager.cpp
@@ -280,7 +280,6 @@ void MultimediaManager::stopAudio()
bool MultimediaManager::setVideoQuality()
{
-
if (this->videoStream)
this->videoStream->setRepresentation();
return true;
diff --git a/Managers/MultimediaStream.cpp b/Managers/MultimediaStream.cpp
index 4b5b66fe..86cde35d 100644
--- a/Managers/MultimediaStream.cpp
+++ b/Managers/MultimediaStream.cpp
@@ -19,22 +19,20 @@ using namespace libdash::framework::mpd;
using namespace dash::mpd;
MultimediaStream::MultimediaStream(StreamType type, MPDWrapper *mpdWrapper, uint32_t bufferSize, bool icnEnabled, double icnAlpha, bool nodecoding, float beta, float drop) :
- type (type),
- segmentBufferSize (bufferSize),
- dashManager (NULL),
- mpdWrapper (mpdWrapper),
- icn (icnEnabled),
- icnAlpha (icnAlpha),
- noDecoding (nodecoding),
- beta (beta),
- drop (drop)
-{
-// InitializeCriticalSection (&this->monitorMutex);
+ type (type),
+ segmentBufferSize (bufferSize),
+ dashManager (NULL),
+ mpdWrapper (mpdWrapper),
+ icn (icnEnabled),
+ icnAlpha (icnAlpha),
+ noDecoding (nodecoding),
+ beta (beta),
+ drop (drop)
+{
this->init();
}
MultimediaStream::~MultimediaStream ()
{
-// DestroyCriticalSection (&this->monitorMutex);
this->stop();
delete this->dashManager;
}
@@ -106,15 +104,6 @@ void MultimediaStream::clear()
this->dashManager->clear();
}
-void MultimediaStream::addFrame(QImage *frame)
-{
-}
-
-QImage* MultimediaStream::getFrame()
-{
- return NULL;
-}
-
void MultimediaStream::attachStreamObserver(IStreamObserver *observer)
{
this->observers.push_back(observer);
@@ -210,12 +199,6 @@ void MultimediaStream::notifyBufferChange(uint32_t bufferfill, int maxC)
this->dashManager->onBufferStateChanged(libdash::framework::buffer::VIDEO, bufferfill, maxC);
}
-void MultimediaStream::updateMPD (IMPD* mpd)
-{
-// this->mpd = mpd;
-// this->dashManager->updateMPD(mpd);
-}
-
void MultimediaStream::fetchMPD()
{
for(size_t i=0; i < this->observers.size(); i++)
diff --git a/Managers/MultimediaStream.h b/Managers/MultimediaStream.h
index d9db5f66..d5661b01 100644
--- a/Managers/MultimediaStream.h
+++ b/Managers/MultimediaStream.h
@@ -57,15 +57,9 @@ public:
void setLooping(bool looping);
void setPositionInMsec(uint32_t milliSecs);
- void addFrame(QImage *frame);
- QImage* getFrame();
libdash::framework::input::MediaObject* getSegment();
-
void setEOS(bool value);
-
void notifyBufferChange(uint32_t bufferfill, int maxC);
-
-// void setRepresentation(dash::mpd::IPeriod *period, dash::mpd::IAdaptationSet *adaptationSet, dash::mpd::IRepresentation *representation);
void setRepresentation();
void enqueueRepresentation(dash::mpd::IPeriod *period, dash::mpd::IAdaptationSet *adaptationSet, dash::mpd::IRepresentation *representation);
void setAdaptationLogic(libdash::framework::adaptation::IAdaptationLogic *logic);
@@ -82,23 +76,22 @@ public:
bool isICN();
void shouldAbort();
void setTargetDownloadingTime(double);
- void updateMPD(dash::mpd::IMPD* mpd);
void fetchMPD();
private:
- float beta;
- float drop;
- std::vector<IStreamObserver *> observers;
- libdash::framework::mpd::MPDWrapper *mpdWrapper;
- libdash::framework::adaptation::IAdaptationLogic *logic;
- libdash::framework::input::DASHManager *dashManager;
- uint32_t segmentBufferSize;
- StreamType type;
- bool icn;
- double icnAlpha;
- mutable CRITICAL_SECTION monitorMutex;
+ float beta;
+ float drop;
+ std::vector<IStreamObserver *> observers;
+ libdash::framework::mpd::MPDWrapper *mpdWrapper;
+ libdash::framework::adaptation::IAdaptationLogic *logic;
+ libdash::framework::input::DASHManager *dashManager;
+ uint32_t segmentBufferSize;
+ StreamType type;
+ bool icn;
+ double icnAlpha;
+ mutable CRITICAL_SECTION monitorMutex;
+ bool noDecoding;
- bool noDecoding;
void init ();
};
}