[vlc-commits] stream_filter: dash: remove duplicate member
Francois Cartegnie
git at videolan.org
Thu Dec 18 22:39:51 CET 2014
vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Nov 27 11:29:33 2014 +0100| [3a60ec4b45614a26ed4af8635ece5c729b09d980] | committer: Francois Cartegnie
stream_filter: dash: remove duplicate member
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3a60ec4b45614a26ed4af8635ece5c729b09d980
---
.../dash/adaptationlogic/AbstractAdaptationLogic.cpp | 2 +-
.../dash/adaptationlogic/AbstractAdaptationLogic.h | 4 +++-
.../dash/adaptationlogic/AlwaysBestAdaptationLogic.cpp | 1 -
.../dash/adaptationlogic/AlwaysBestAdaptationLogic.h | 1 -
.../dash/adaptationlogic/AlwaysLowestAdaptationLogic.cpp | 5 +++++
.../dash/adaptationlogic/AlwaysLowestAdaptationLogic.hpp | 10 ++++++++++
.../dash/adaptationlogic/RateBasedAdaptationLogic.cpp | 1 -
.../dash/adaptationlogic/RateBasedAdaptationLogic.h | 1 -
8 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/modules/stream_filter/dash/adaptationlogic/AbstractAdaptationLogic.cpp b/modules/stream_filter/dash/adaptationlogic/AbstractAdaptationLogic.cpp
index 565aa95..410726c 100644
--- a/modules/stream_filter/dash/adaptationlogic/AbstractAdaptationLogic.cpp
+++ b/modules/stream_filter/dash/adaptationlogic/AbstractAdaptationLogic.cpp
@@ -32,9 +32,9 @@ using namespace dash::xml;
using namespace dash::mpd;
AbstractAdaptationLogic::AbstractAdaptationLogic (MPDManager *mpdManager, stream_t *stream) :
+ mpdManager (mpdManager),
bpsAvg (0),
bpsLastChunk (0),
- mpdManager (mpdManager),
stream (stream),
bufferedMicroSec (0),
bufferedPercent (0)
diff --git a/modules/stream_filter/dash/adaptationlogic/AbstractAdaptationLogic.h b/modules/stream_filter/dash/adaptationlogic/AbstractAdaptationLogic.h
index be21415..2b647fd 100644
--- a/modules/stream_filter/dash/adaptationlogic/AbstractAdaptationLogic.h
+++ b/modules/stream_filter/dash/adaptationlogic/AbstractAdaptationLogic.h
@@ -53,10 +53,12 @@ namespace dash
uint64_t getBpsLastChunk () const;
int getBufferPercent () const;
+ protected:
+ dash::mpd::MPDManager *mpdManager;
+
private:
int bpsAvg;
long bpsLastChunk;
- dash::mpd::MPDManager *mpdManager;
stream_t *stream;
mtime_t bufferedMicroSec;
int bufferedPercent;
diff --git a/modules/stream_filter/dash/adaptationlogic/AlwaysBestAdaptationLogic.cpp b/modules/stream_filter/dash/adaptationlogic/AlwaysBestAdaptationLogic.cpp
index 6fe3a5d..562e488 100644
--- a/modules/stream_filter/dash/adaptationlogic/AlwaysBestAdaptationLogic.cpp
+++ b/modules/stream_filter/dash/adaptationlogic/AlwaysBestAdaptationLogic.cpp
@@ -35,7 +35,6 @@ using namespace dash::mpd;
AlwaysBestAdaptationLogic::AlwaysBestAdaptationLogic (MPDManager *mpdManager, stream_t *stream) :
AbstractAdaptationLogic (mpdManager, stream)
{
- this->mpdManager = mpdManager;
this->count = 0;
this->initSchedule();
}
diff --git a/modules/stream_filter/dash/adaptationlogic/AlwaysBestAdaptationLogic.h b/modules/stream_filter/dash/adaptationlogic/AlwaysBestAdaptationLogic.h
index b72b8dc..e4c3223 100644
--- a/modules/stream_filter/dash/adaptationlogic/AlwaysBestAdaptationLogic.h
+++ b/modules/stream_filter/dash/adaptationlogic/AlwaysBestAdaptationLogic.h
@@ -49,7 +49,6 @@ namespace dash
private:
std::vector<mpd::ISegment *> schedule;
- dash::mpd::MPDManager *mpdManager;
size_t count;
dash::mpd::Representation *bestRepresentation;
diff --git a/modules/stream_filter/dash/adaptationlogic/AlwaysLowestAdaptationLogic.cpp b/modules/stream_filter/dash/adaptationlogic/AlwaysLowestAdaptationLogic.cpp
new file mode 100644
index 0000000..c5334f6
--- /dev/null
+++ b/modules/stream_filter/dash/adaptationlogic/AlwaysLowestAdaptationLogic.cpp
@@ -0,0 +1,5 @@
+#include "AlwaysLowestAdaptationLogic.hpp"
+
+AlwaysLowestAdaptationLogic::AlwaysLowestAdaptationLogic()
+{
+}
diff --git a/modules/stream_filter/dash/adaptationlogic/AlwaysLowestAdaptationLogic.hpp b/modules/stream_filter/dash/adaptationlogic/AlwaysLowestAdaptationLogic.hpp
new file mode 100644
index 0000000..3707b00
--- /dev/null
+++ b/modules/stream_filter/dash/adaptationlogic/AlwaysLowestAdaptationLogic.hpp
@@ -0,0 +1,10 @@
+#ifndef ALWAYSLOWESTADAPTATIONLOGIC_HPP
+#define ALWAYSLOWESTADAPTATIONLOGIC_HPP
+
+class AlwaysLowestAdaptationLogic
+{
+public:
+ AlwaysLowestAdaptationLogic();
+};
+
+#endif // ALWAYSLOWESTADAPTATIONLOGIC_HPP
diff --git a/modules/stream_filter/dash/adaptationlogic/RateBasedAdaptationLogic.cpp b/modules/stream_filter/dash/adaptationlogic/RateBasedAdaptationLogic.cpp
index 5e6c61b..b55eb7c 100644
--- a/modules/stream_filter/dash/adaptationlogic/RateBasedAdaptationLogic.cpp
+++ b/modules/stream_filter/dash/adaptationlogic/RateBasedAdaptationLogic.cpp
@@ -35,7 +35,6 @@ using namespace dash::mpd;
RateBasedAdaptationLogic::RateBasedAdaptationLogic (MPDManager *mpdManager, stream_t *stream) :
AbstractAdaptationLogic (mpdManager, stream),
- mpdManager (mpdManager),
count (0),
currentPeriod (mpdManager->getFirstPeriod())
{
diff --git a/modules/stream_filter/dash/adaptationlogic/RateBasedAdaptationLogic.h b/modules/stream_filter/dash/adaptationlogic/RateBasedAdaptationLogic.h
index fcecd66..c1d1306 100644
--- a/modules/stream_filter/dash/adaptationlogic/RateBasedAdaptationLogic.h
+++ b/modules/stream_filter/dash/adaptationlogic/RateBasedAdaptationLogic.h
@@ -48,7 +48,6 @@ namespace dash
const dash::mpd::Representation *getCurrentRepresentation() const;
private:
- dash::mpd::MPDManager *mpdManager;
size_t count;
dash::mpd::Period *currentPeriod;
int width;
More information about the vlc-commits
mailing list