Skip to content

V
vlc
Commit a7c8fbc3 authored by Steve Lhomme's avatar Steve Lhomme Committed by Jean-Baptiste Kempf
Browse files
Options

adaptive: fix StreamType namespace missing 

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent a65d213b
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
modules/demux/adaptative/logic/AlwaysBestAdaptationLogic.cpp
View file @ a7c8fbc3
...@@ -36,7 +36,7 @@ AlwaysBestAdaptationLogic::AlwaysBestAdaptationLogic () : ...@@ -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; RepresentationSelector selector;
return selector.select(period, type); return selector.select(period, type);
......
modules/demux/adaptative/logic/AlwaysLowestAdaptationLogic.cpp
View file @ a7c8fbc3
...@@ -28,7 +28,7 @@ AlwaysLowestAdaptationLogic::AlwaysLowestAdaptationLogic(): ...@@ -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; RepresentationSelector selector;
return selector.select(period, type, 0); return selector.select(period, type, 0);
......
modules/demux/adaptative/logic/RateBasedAdaptationLogic.cpp
View file @ a7c8fbc3
...@@ -47,7 +47,7 @@ RateBasedAdaptationLogic::RateBasedAdaptationLogic (int w, int h) : ...@@ -47,7 +47,7 @@ RateBasedAdaptationLogic::RateBasedAdaptationLogic (int w, int h) :
stabilizer = 16; stabilizer = 16;
} }
BaseRepresentation *RateBasedAdaptationLogic::getCurrentRepresentation(StreamType type, BasePeriod *period) const BaseRepresentation *RateBasedAdaptationLogic::getCurrentRepresentation(adaptative::StreamType type, BasePeriod *period) const
{ {
if(period == NULL) if(period == NULL)
return NULL; return NULL;
...@@ -98,7 +98,7 @@ FixedRateAdaptationLogic::FixedRateAdaptationLogic(size_t bps) : ...@@ -98,7 +98,7 @@ FixedRateAdaptationLogic::FixedRateAdaptationLogic(size_t bps) :
currentBps = bps; currentBps = bps;
} }
BaseRepresentation *FixedRateAdaptationLogic::getCurrentRepresentation(StreamType type, BasePeriod *period) const BaseRepresentation *FixedRateAdaptationLogic::getCurrentRepresentation(adaptative::StreamType type, BasePeriod *period) const
{ {
if(period == NULL) if(period == NULL)
return NULL; return NULL;
......
modules/demux/adaptative/logic/Representationselectors.cpp
View file @ a7c8fbc3
...@@ -29,11 +29,11 @@ RepresentationSelector::RepresentationSelector() ...@@ -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()); 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) if (period == NULL)
return NULL; return NULL;
...@@ -56,7 +56,7 @@ BaseRepresentation * RepresentationSelector::select(BasePeriod *period, StreamTy ...@@ -56,7 +56,7 @@ BaseRepresentation * RepresentationSelector::select(BasePeriod *period, StreamTy
return best; 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 int width, int height) const
{ {
if(period == NULL) if(period == NULL)
......
modules/demux/adaptative/playlist/BasePeriod.cpp
View file @ a7c8fbc3
...@@ -61,7 +61,7 @@ const std::vector<BaseAdaptationSet*>& BasePeriod::getAdaptationSets() const ...@@ -61,7 +61,7 @@ const std::vector<BaseAdaptationSet*>& BasePeriod::getAdaptationSets() const
return adaptationSets; 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*> list;
std::vector<BaseAdaptationSet*>::const_iterator it; std::vector<BaseAdaptationSet*>::const_iterator it;
...@@ -82,7 +82,7 @@ void BasePeriod::addAdaptationSet(BaseAdaptationSet *adaptationSet) ...@@ -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; std::vector<BaseAdaptationSet *>::const_iterator it;
for(it = adaptationSets.begin(); it != adaptationSets.end(); ++it) for(it = adaptationSets.begin(); it != adaptationSets.end(); ++it)
......
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