aboutsummaryrefslogtreecommitdiffstats
path: root/Input
diff options
context:
space:
mode:
Diffstat (limited to 'Input')
-rw-r--r--Input/DASHManager.cpp5
-rw-r--r--Input/DASHManager.h1
-rw-r--r--Input/DASHReceiver.cpp40
-rw-r--r--Input/DASHReceiver.h8
-rw-r--r--Input/IDASHManagerObserver.h1
5 files changed, 2 insertions, 53 deletions
diff --git a/Input/DASHManager.cpp b/Input/DASHManager.cpp
index 4d52a638..3377c1a8 100644
--- a/Input/DASHManager.cpp
+++ b/Input/DASHManager.cpp
@@ -161,11 +161,6 @@ void DASHManager::onBufferStateChanged(BufferType type, uint32_t fillstateInPerc
this->receiver->OnSegmentBufferStateChanged(fillstateInPercent, maxC);
}
-void DASHManager::updateMPD(IMPD* mpd)
-{
-// this->receiver->updateMPD(mpd);
-}
-
void DASHManager::fetchMPD()
{
this->multimediaStream->fetchMPD();
diff --git a/Input/DASHManager.h b/Input/DASHManager.h
index 6bd54da9..c2b4a88b 100644
--- a/Input/DASHManager.h
+++ b/Input/DASHManager.h
@@ -62,7 +62,6 @@ public:
void setTargetDownloadingTime(double);
MediaObject* getSegment();
void onBufferStateChanged(BufferType type, uint32_t fillstateInPercent, int maxC);
- void updateMPD(dash::mpd::IMPD* mpd);
void fetchMPD();
private:
diff --git a/Input/DASHReceiver.cpp b/Input/DASHReceiver.cpp
index aaa75205..c6dafb93 100644
--- a/Input/DASHReceiver.cpp
+++ b/Input/DASHReceiver.cpp
@@ -204,10 +204,7 @@ libdash::framework::adaptation::IAdaptationLogic* DASHReceiver::GetAdaptationLog
{
return this->adaptationLogic;
}
-dash::mpd::IRepresentation* DASHReceiver::GetRepresentation ()
-{
- return NULL;
-}
+
uint32_t DASHReceiver::CalculateSegmentOffset ()
{
return this->mpdWrapper->calculateSegmentOffset(type, bufferSize);
@@ -218,14 +215,6 @@ void DASHReceiver::NotifySegmentDownloaded ()
this->observer->onSegmentDownloaded();
}
-void DASHReceiver::NotifyBitrateChange(dash::mpd::IRepresentation *representation)
-{
-// if(this->representation != representation)
-// {
-// this->representation = representation;
-// this->SetRepresentation(this->period,this->adaptationSet,this->representation);
-// }
-}
void DASHReceiver::DownloadInitSegmentWithoutLock ()
{
int rep = std::stoi(this->mpdWrapper->getRepresentationIDWithoutLock(type).c_str());
@@ -419,30 +408,3 @@ void DASHReceiver::SetDrop (float drop)
this->drop = drop;
}
-void DASHReceiver::updateMPD(IMPD* mpd)
-{
-// EnterCriticalSection(&this->monitorMutex);
- //First we need to find the new segmentNumber -> what is the segment time now?
-// uint32_t time = this->representationStream->getTime(this->segmentNumber);
-// printf("old segmentNumber!: %d\n", this->segmentNumber);
-// printf("time: %u\n", time);
- //Second, replace the MPD with the new one
-// delete(this->mpd);
-// this->mpd = mpd;
-//
- //Third, Update all the structures associated to the mpd
-// this->period = this->mpd->GetPeriods().at(0);
-// this->adaptationSet = this->period->GetAdaptationSets().at(0);
-// this->representation = this->adaptationSet->GetRepresentation().at(0);
-// delete(this->adaptationSetStream);
-// this->adaptationSetStream = new AdaptationSetStream(mpd, period, adaptationSet);
-// this->representationStream = adaptationSetStream->getRepresentationStream(this->representation);
-// this->segmentOffset = CalculateSegmentOffset();
-// this->representationStream->setSegmentOffset(this->segmentOffset);
-//
- //Fourth, Set the new segmentNumber by finding the index of the segment associated to 'uint32_t time' in the new mpd
-// this->segmentNumber = this->representationStream->getSegmentNumber(time);
-// printf("new segmentNumber!: %d\n", this->segmentNumber);
-// LeaveCriticalSection(&this->monitorMutex);
-}
-
diff --git a/Input/DASHReceiver.h b/Input/DASHReceiver.h
index cf56166b..ed98b9e1 100644
--- a/Input/DASHReceiver.h
+++ b/Input/DASHReceiver.h
@@ -57,23 +57,18 @@ public:
input::MediaObject* GetSegment(uint32_t segmentNumber);
input::MediaObject* GetInitSegment();
input::MediaObject* GetInitSegmentWithoutLock();
-// input::MediaObject* FindInitSegment(dash::mpd::IRepresentation *representation);
input::MediaObject* FindInitSegment(int representation);
uint32_t GetPosition();
void SetPosition(uint32_t segmentNumber);
void SetLooping(bool isLoopinp);
void SetPositionInMsecs(uint32_t milliSecs);
- dash::mpd::IRepresentation* GetRepresentation();
-// void SetRepresentation(dash::mpd::IPeriod *period,
-// dash::mpd::IAdaptationSet *adaptationSet,
-// dash::mpd::IRepresentation *representation);
+
void SetRepresentation();
void SetAdaptationLogic(adaptation::IAdaptationLogic *_adaptationLogic);
libdash::framework::adaptation::IAdaptationLogic* GetAdaptationLogic();
void NotifyQualityDownloading(uint32_t quality);
void Notifybps(uint64_t bps);
void NotifyDLTime(double time);
- void NotifyBitrateChange(dash::mpd::IRepresentation *representation);
void OnSegmentBufferStateChanged(uint32_t fillstateInPercent, int maxC);
bool IsICN();
void ShouldAbort();
@@ -85,7 +80,6 @@ public:
bool CanPush();
void SetBeta(float beta);
void SetDrop(float drop);
- void updateMPD(dash::mpd::IMPD* mpd);
private:
float beta;
diff --git a/Input/IDASHManagerObserver.h b/Input/IDASHManagerObserver.h
index 1003d8a1..57f15726 100644
--- a/Input/IDASHManagerObserver.h
+++ b/Input/IDASHManagerObserver.h
@@ -26,7 +26,6 @@ class IDASHManagerObserver
public:
virtual ~IDASHManagerObserver() {}
- virtual void addFrame(QImage *frame) = 0;
virtual void setEOS(bool value)= 0;
virtual void onSegmentBufferStateChanged(uint32_t fillstateInPercent, int maxC) = 0;