Commit 3a60ec4b authored by Francois Cartegnie's avatar Francois Cartegnie

stream_filter: dash: remove duplicate member

parent e9a42b2d
...@@ -32,9 +32,9 @@ using namespace dash::xml; ...@@ -32,9 +32,9 @@ using namespace dash::xml;
using namespace dash::mpd; using namespace dash::mpd;
AbstractAdaptationLogic::AbstractAdaptationLogic (MPDManager *mpdManager, stream_t *stream) : AbstractAdaptationLogic::AbstractAdaptationLogic (MPDManager *mpdManager, stream_t *stream) :
mpdManager (mpdManager),
bpsAvg (0), bpsAvg (0),
bpsLastChunk (0), bpsLastChunk (0),
mpdManager (mpdManager),
stream (stream), stream (stream),
bufferedMicroSec (0), bufferedMicroSec (0),
bufferedPercent (0) bufferedPercent (0)
......
...@@ -53,10 +53,12 @@ namespace dash ...@@ -53,10 +53,12 @@ namespace dash
uint64_t getBpsLastChunk () const; uint64_t getBpsLastChunk () const;
int getBufferPercent () const; int getBufferPercent () const;
protected:
dash::mpd::MPDManager *mpdManager;
private: private:
int bpsAvg; int bpsAvg;
long bpsLastChunk; long bpsLastChunk;
dash::mpd::MPDManager *mpdManager;
stream_t *stream; stream_t *stream;
mtime_t bufferedMicroSec; mtime_t bufferedMicroSec;
int bufferedPercent; int bufferedPercent;
......
...@@ -35,7 +35,6 @@ using namespace dash::mpd; ...@@ -35,7 +35,6 @@ using namespace dash::mpd;
AlwaysBestAdaptationLogic::AlwaysBestAdaptationLogic (MPDManager *mpdManager, stream_t *stream) : AlwaysBestAdaptationLogic::AlwaysBestAdaptationLogic (MPDManager *mpdManager, stream_t *stream) :
AbstractAdaptationLogic (mpdManager, stream) AbstractAdaptationLogic (mpdManager, stream)
{ {
this->mpdManager = mpdManager;
this->count = 0; this->count = 0;
this->initSchedule(); this->initSchedule();
} }
......
...@@ -49,7 +49,6 @@ namespace dash ...@@ -49,7 +49,6 @@ namespace dash
private: private:
std::vector<mpd::ISegment *> schedule; std::vector<mpd::ISegment *> schedule;
dash::mpd::MPDManager *mpdManager;
size_t count; size_t count;
dash::mpd::Representation *bestRepresentation; dash::mpd::Representation *bestRepresentation;
......
#include "AlwaysLowestAdaptationLogic.hpp"
AlwaysLowestAdaptationLogic::AlwaysLowestAdaptationLogic()
{
}
#ifndef ALWAYSLOWESTADAPTATIONLOGIC_HPP
#define ALWAYSLOWESTADAPTATIONLOGIC_HPP
class AlwaysLowestAdaptationLogic
{
public:
AlwaysLowestAdaptationLogic();
};
#endif // ALWAYSLOWESTADAPTATIONLOGIC_HPP
...@@ -35,7 +35,6 @@ using namespace dash::mpd; ...@@ -35,7 +35,6 @@ using namespace dash::mpd;
RateBasedAdaptationLogic::RateBasedAdaptationLogic (MPDManager *mpdManager, stream_t *stream) : RateBasedAdaptationLogic::RateBasedAdaptationLogic (MPDManager *mpdManager, stream_t *stream) :
AbstractAdaptationLogic (mpdManager, stream), AbstractAdaptationLogic (mpdManager, stream),
mpdManager (mpdManager),
count (0), count (0),
currentPeriod (mpdManager->getFirstPeriod()) currentPeriod (mpdManager->getFirstPeriod())
{ {
......
...@@ -48,7 +48,6 @@ namespace dash ...@@ -48,7 +48,6 @@ namespace dash
const dash::mpd::Representation *getCurrentRepresentation() const; const dash::mpd::Representation *getCurrentRepresentation() const;
private: private:
dash::mpd::MPDManager *mpdManager;
size_t count; size_t count;
dash::mpd::Period *currentPeriod; dash::mpd::Period *currentPeriod;
int width; int width;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment