vlc | branch: master | Steve Lhomme <rob...@videolabs.io> | Fri Jun 26 09:03:45 2015 +0200| [a7c8fbc3300258edd0f71e8f2fb73ab3dd8c7a28] | committer: Jean-Baptiste Kempf
adaptive: fix StreamType namespace missing Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a7c8fbc3300258edd0f71e8f2fb73ab3dd8c7a28 --- modules/demux/adaptative/logic/AlwaysBestAdaptationLogic.cpp | 2 +- modules/demux/adaptative/logic/AlwaysLowestAdaptationLogic.cpp | 2 +- modules/demux/adaptative/logic/RateBasedAdaptationLogic.cpp | 4 ++-- modules/demux/adaptative/logic/Representationselectors.cpp | 6 +++--- modules/demux/adaptative/playlist/BasePeriod.cpp | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/demux/adaptative/logic/AlwaysBestAdaptationLogic.cpp b/modules/demux/adaptative/logic/AlwaysBestAdaptationLogic.cpp index c2a44cc..9ff9eda 100644 --- a/modules/demux/adaptative/logic/AlwaysBestAdaptationLogic.cpp +++ b/modules/demux/adaptative/logic/AlwaysBestAdaptationLogic.cpp @@ -36,7 +36,7 @@ AlwaysBestAdaptationLogic::AlwaysBestAdaptationLogic () : { } -BaseRepresentation *AlwaysBestAdaptationLogic::getCurrentRepresentation(StreamType type, BasePeriod *period) const +BaseRepresentation *AlwaysBestAdaptationLogic::getCurrentRepresentation(adaptative::StreamType type, BasePeriod *period) const { RepresentationSelector selector; return selector.select(period, type); diff --git a/modules/demux/adaptative/logic/AlwaysLowestAdaptationLogic.cpp b/modules/demux/adaptative/logic/AlwaysLowestAdaptationLogic.cpp index b0d3827..dfedfd3 100644 --- a/modules/demux/adaptative/logic/AlwaysLowestAdaptationLogic.cpp +++ b/modules/demux/adaptative/logic/AlwaysLowestAdaptationLogic.cpp @@ -28,7 +28,7 @@ AlwaysLowestAdaptationLogic::AlwaysLowestAdaptationLogic(): { } -BaseRepresentation *AlwaysLowestAdaptationLogic::getCurrentRepresentation(StreamType type, BasePeriod *period) const +BaseRepresentation *AlwaysLowestAdaptationLogic::getCurrentRepresentation(adaptative::StreamType type, BasePeriod *period) const { RepresentationSelector selector; return selector.select(period, type, 0); diff --git a/modules/demux/adaptative/logic/RateBasedAdaptationLogic.cpp b/modules/demux/adaptative/logic/RateBasedAdaptationLogic.cpp index 98f139b..0928623 100644 --- a/modules/demux/adaptative/logic/RateBasedAdaptationLogic.cpp +++ b/modules/demux/adaptative/logic/RateBasedAdaptationLogic.cpp @@ -47,7 +47,7 @@ RateBasedAdaptationLogic::RateBasedAdaptationLogic (int w, int h) : stabilizer = 16; } -BaseRepresentation *RateBasedAdaptationLogic::getCurrentRepresentation(StreamType type, BasePeriod *period) const +BaseRepresentation *RateBasedAdaptationLogic::getCurrentRepresentation(adaptative::StreamType type, BasePeriod *period) const { if(period == NULL) return NULL; @@ -98,7 +98,7 @@ FixedRateAdaptationLogic::FixedRateAdaptationLogic(size_t bps) : currentBps = bps; } -BaseRepresentation *FixedRateAdaptationLogic::getCurrentRepresentation(StreamType type, BasePeriod *period) const +BaseRepresentation *FixedRateAdaptationLogic::getCurrentRepresentation(adaptative::StreamType type, BasePeriod *period) const { if(period == NULL) return NULL; diff --git a/modules/demux/adaptative/logic/Representationselectors.cpp b/modules/demux/adaptative/logic/Representationselectors.cpp index 6b4f79c..b4b1fda 100644 --- a/modules/demux/adaptative/logic/Representationselectors.cpp +++ b/modules/demux/adaptative/logic/Representationselectors.cpp @@ -29,11 +29,11 @@ RepresentationSelector::RepresentationSelector() { } -BaseRepresentation * RepresentationSelector::select(BasePeriod *period, StreamType type) const +BaseRepresentation * RepresentationSelector::select(BasePeriod *period, adaptative::StreamType type) const { return select(period, type, std::numeric_limits<uint64_t>::max()); } -BaseRepresentation * RepresentationSelector::select(BasePeriod *period, StreamType type, uint64_t bitrate) const +BaseRepresentation * RepresentationSelector::select(BasePeriod *period, adaptative::StreamType type, uint64_t bitrate) const { if (period == NULL) return NULL; @@ -56,7 +56,7 @@ BaseRepresentation * RepresentationSelector::select(BasePeriod *period, StreamTy return best; } -BaseRepresentation * RepresentationSelector::select(BasePeriod *period, StreamType type, uint64_t bitrate, +BaseRepresentation * RepresentationSelector::select(BasePeriod *period, adaptative::StreamType type, uint64_t bitrate, int width, int height) const { if(period == NULL) diff --git a/modules/demux/adaptative/playlist/BasePeriod.cpp b/modules/demux/adaptative/playlist/BasePeriod.cpp index 18486e9..3a7e4f5 100644 --- a/modules/demux/adaptative/playlist/BasePeriod.cpp +++ b/modules/demux/adaptative/playlist/BasePeriod.cpp @@ -61,7 +61,7 @@ const std::vector<BaseAdaptationSet*>& BasePeriod::getAdaptationSets() const return adaptationSets; } -const std::vector<BaseAdaptationSet*> BasePeriod::getAdaptationSets(StreamType type) const +const std::vector<BaseAdaptationSet*> BasePeriod::getAdaptationSets(adaptative::StreamType type) const { std::vector<BaseAdaptationSet*> list; std::vector<BaseAdaptationSet*>::const_iterator it; @@ -82,7 +82,7 @@ void BasePeriod::addAdaptationSet(BaseAdaptationSet *adaptationSet) } } -BaseAdaptationSet * BasePeriod::getAdaptationSet(StreamType type) const +BaseAdaptationSet * BasePeriod::getAdaptationSet(adaptative::StreamType type) const { std::vector<BaseAdaptationSet *>::const_iterator it; for(it = adaptationSets.begin(); it != adaptationSets.end(); ++it) _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits