[vlc-commits] demux: adaptive: deconstify logic's getNextRepresentation
Francois Cartegnie
git at videolan.org
Wed Sep 21 18:52:31 CEST 2016
vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Fri Sep 16 22:03:07 2016 +0200| [40ca98799cde78455d24440cdc2b9f0da688f82e] | committer: Francois Cartegnie
demux: adaptive: deconstify logic's getNextRepresentation
may want to store data
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=40ca98799cde78455d24440cdc2b9f0da688f82e
---
modules/demux/adaptive/logic/AbstractAdaptationLogic.h | 2 +-
modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.cpp | 2 +-
modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.h | 2 +-
modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.cpp | 2 +-
modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.hpp | 2 +-
modules/demux/adaptive/logic/RateBasedAdaptationLogic.cpp | 4 ++--
modules/demux/adaptive/logic/RateBasedAdaptationLogic.h | 4 ++--
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/modules/demux/adaptive/logic/AbstractAdaptationLogic.h b/modules/demux/adaptive/logic/AbstractAdaptationLogic.h
index 765bac9..3c56cd4 100644
--- a/modules/demux/adaptive/logic/AbstractAdaptationLogic.h
+++ b/modules/demux/adaptive/logic/AbstractAdaptationLogic.h
@@ -47,7 +47,7 @@ namespace adaptive
AbstractAdaptationLogic ();
virtual ~AbstractAdaptationLogic ();
- virtual BaseRepresentation* getNextRepresentation(BaseAdaptationSet *, BaseRepresentation *) const = 0;
+ virtual BaseRepresentation* getNextRepresentation(BaseAdaptationSet *, BaseRepresentation *) = 0;
virtual void updateDownloadRate (const ID &, size_t, mtime_t);
virtual void trackerEvent (const SegmentTrackerEvent &) {}
diff --git a/modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.cpp b/modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.cpp
index 0ba222b..ed01236 100644
--- a/modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.cpp
+++ b/modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.cpp
@@ -36,7 +36,7 @@ AlwaysBestAdaptationLogic::AlwaysBestAdaptationLogic () :
{
}
-BaseRepresentation *AlwaysBestAdaptationLogic::getNextRepresentation(BaseAdaptationSet *adaptSet, BaseRepresentation *) const
+BaseRepresentation *AlwaysBestAdaptationLogic::getNextRepresentation(BaseAdaptationSet *adaptSet, BaseRepresentation *)
{
RepresentationSelector selector;
return selector.select(adaptSet);
diff --git a/modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.h b/modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.h
index 9de0ab2..7610948 100644
--- a/modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.h
+++ b/modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.h
@@ -36,7 +36,7 @@ namespace adaptive
public:
AlwaysBestAdaptationLogic ();
- virtual BaseRepresentation *getNextRepresentation(BaseAdaptationSet *, BaseRepresentation *) const;
+ virtual BaseRepresentation *getNextRepresentation(BaseAdaptationSet *, BaseRepresentation *);
};
}
}
diff --git a/modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.cpp b/modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.cpp
index 51e20b3..cb8aa4f 100644
--- a/modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.cpp
+++ b/modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.cpp
@@ -32,7 +32,7 @@ AlwaysLowestAdaptationLogic::AlwaysLowestAdaptationLogic():
{
}
-BaseRepresentation *AlwaysLowestAdaptationLogic::getNextRepresentation(BaseAdaptationSet *adaptSet, BaseRepresentation *) const
+BaseRepresentation *AlwaysLowestAdaptationLogic::getNextRepresentation(BaseAdaptationSet *adaptSet, BaseRepresentation *)
{
RepresentationSelector selector;
return selector.select(adaptSet, 0);
diff --git a/modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.hpp b/modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.hpp
index f972f02..f965c43 100644
--- a/modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.hpp
+++ b/modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.hpp
@@ -31,7 +31,7 @@ namespace adaptive
public:
AlwaysLowestAdaptationLogic();
- virtual BaseRepresentation* getNextRepresentation(BaseAdaptationSet *, BaseRepresentation *) const;
+ virtual BaseRepresentation* getNextRepresentation(BaseAdaptationSet *, BaseRepresentation *);
};
}
}
diff --git a/modules/demux/adaptive/logic/RateBasedAdaptationLogic.cpp b/modules/demux/adaptive/logic/RateBasedAdaptationLogic.cpp
index 2388c83..7efd8b7 100644
--- a/modules/demux/adaptive/logic/RateBasedAdaptationLogic.cpp
+++ b/modules/demux/adaptive/logic/RateBasedAdaptationLogic.cpp
@@ -55,7 +55,7 @@ RateBasedAdaptationLogic::~RateBasedAdaptationLogic()
vlc_mutex_destroy(&lock);
}
-BaseRepresentation *RateBasedAdaptationLogic::getNextRepresentation(BaseAdaptationSet *adaptSet, BaseRepresentation *currep) const
+BaseRepresentation *RateBasedAdaptationLogic::getNextRepresentation(BaseAdaptationSet *adaptSet, BaseRepresentation *currep)
{
if(adaptSet == NULL)
return NULL;
@@ -131,7 +131,7 @@ FixedRateAdaptationLogic::FixedRateAdaptationLogic(size_t bps) :
currentBps = bps;
}
-BaseRepresentation *FixedRateAdaptationLogic::getNextRepresentation(BaseAdaptationSet *adaptSet, BaseRepresentation *) const
+BaseRepresentation *FixedRateAdaptationLogic::getNextRepresentation(BaseAdaptationSet *adaptSet, BaseRepresentation *)
{
if(adaptSet == NULL)
return NULL;
diff --git a/modules/demux/adaptive/logic/RateBasedAdaptationLogic.h b/modules/demux/adaptive/logic/RateBasedAdaptationLogic.h
index f5130aa..e2817fd 100644
--- a/modules/demux/adaptive/logic/RateBasedAdaptationLogic.h
+++ b/modules/demux/adaptive/logic/RateBasedAdaptationLogic.h
@@ -39,7 +39,7 @@ namespace adaptive
RateBasedAdaptationLogic (vlc_object_t *, int, int);
virtual ~RateBasedAdaptationLogic ();
- BaseRepresentation *getNextRepresentation(BaseAdaptationSet *, BaseRepresentation *) const;
+ BaseRepresentation *getNextRepresentation(BaseAdaptationSet *, BaseRepresentation *);
virtual void updateDownloadRate(const ID &, size_t, mtime_t); /* reimpl */
virtual void trackerEvent(const SegmentTrackerEvent &); /* reimpl */
@@ -64,7 +64,7 @@ namespace adaptive
public:
FixedRateAdaptationLogic(size_t);
- BaseRepresentation *getNextRepresentation(BaseAdaptationSet *, BaseRepresentation *) const;
+ BaseRepresentation *getNextRepresentation(BaseAdaptationSet *, BaseRepresentation *);
private:
size_t currentBps;
More information about the vlc-commits
mailing list