Commit 4c3edf27 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

dash: Fix MSVC build

parent 1ae37b27
...@@ -42,6 +42,8 @@ ...@@ -42,6 +42,8 @@
#include "SegmentTracker.hpp" #include "SegmentTracker.hpp"
#include <vlc_stream.h> #include <vlc_stream.h>
#include <algorithm>
using namespace dash; using namespace dash;
using namespace dash::http; using namespace dash::http;
using namespace dash::logic; using namespace dash::logic;
......
...@@ -87,14 +87,14 @@ Format Stream::mimeToFormat(const std::string &mime) ...@@ -87,14 +87,14 @@ Format Stream::mimeToFormat(const std::string &mime)
return format; return format;
} }
void Stream::create(demux_t *demux, AbstractAdaptationLogic *logic, SegmentTracker *tracker) void Stream::create(demux_t *demux, AbstractAdaptationLogic *logic, dash::SegmentTracker *tracker)
{ {
switch(format) switch(format)
{ {
case Streams::MP4: case dash::Streams::MP4:
output = new MP4StreamOutput(demux); output = new MP4StreamOutput(demux);
break; break;
case Streams::MPEG2TS: case dash::Streams::MPEG2TS:
output = new MPEG2TSStreamOutput(demux); output = new MPEG2TSStreamOutput(demux);
break; break;
default: default:
......
...@@ -36,7 +36,7 @@ AlwaysBestAdaptationLogic::AlwaysBestAdaptationLogic (MPD *mpd) : ...@@ -36,7 +36,7 @@ AlwaysBestAdaptationLogic::AlwaysBestAdaptationLogic (MPD *mpd) :
{ {
} }
Representation *AlwaysBestAdaptationLogic::getCurrentRepresentation(Streams::Type type, mpd::Period *period) const Representation *AlwaysBestAdaptationLogic::getCurrentRepresentation(dash::Streams::Type type, Period *period) const
{ {
RepresentationSelector selector; RepresentationSelector selector;
return selector.select(period, type); return selector.select(period, type);
......
...@@ -23,12 +23,12 @@ ...@@ -23,12 +23,12 @@
using namespace dash::logic; using namespace dash::logic;
using namespace dash::mpd; using namespace dash::mpd;
AlwaysLowestAdaptationLogic::AlwaysLowestAdaptationLogic(mpd::MPD *mpd): AlwaysLowestAdaptationLogic::AlwaysLowestAdaptationLogic(MPD *mpd):
AbstractAdaptationLogic(mpd) AbstractAdaptationLogic(mpd)
{ {
} }
Representation *AlwaysLowestAdaptationLogic::getCurrentRepresentation(Streams::Type type, mpd::Period *period) const Representation *AlwaysLowestAdaptationLogic::getCurrentRepresentation(dash::Streams::Type type, Period *period) const
{ {
RepresentationSelector selector; RepresentationSelector selector;
return selector.select(period, type, 0); return selector.select(period, type, 0);
......
...@@ -44,7 +44,7 @@ RateBasedAdaptationLogic::RateBasedAdaptationLogic (MPD *mpd) : ...@@ -44,7 +44,7 @@ RateBasedAdaptationLogic::RateBasedAdaptationLogic (MPD *mpd) :
height = var_InheritInteger(mpd->getVLCObject(), "dash-prefheight"); height = var_InheritInteger(mpd->getVLCObject(), "dash-prefheight");
} }
Representation *RateBasedAdaptationLogic::getCurrentRepresentation(Streams::Type type, mpd::Period *period) const Representation *RateBasedAdaptationLogic::getCurrentRepresentation(dash::Streams::Type type, Period *period) const
{ {
if(period == NULL) if(period == NULL)
return NULL; return NULL;
...@@ -78,13 +78,13 @@ void RateBasedAdaptationLogic::updateDownloadRate(size_t size, mtime_t time) ...@@ -78,13 +78,13 @@ void RateBasedAdaptationLogic::updateDownloadRate(size_t size, mtime_t time)
currentBps = bpsAvg; currentBps = bpsAvg;
} }
FixedRateAdaptationLogic::FixedRateAdaptationLogic(mpd::MPD *mpd) : FixedRateAdaptationLogic::FixedRateAdaptationLogic(MPD *mpd) :
AbstractAdaptationLogic(mpd) AbstractAdaptationLogic(mpd)
{ {
currentBps = var_InheritInteger( mpd->getVLCObject(), "dash-prefbw" ) * 8192; currentBps = var_InheritInteger( mpd->getVLCObject(), "dash-prefbw" ) * 8192;
} }
Representation *FixedRateAdaptationLogic::getCurrentRepresentation(Streams::Type type, mpd::Period *period) const Representation *FixedRateAdaptationLogic::getCurrentRepresentation(dash::Streams::Type type, Period *period) const
{ {
if(period == NULL) if(period == NULL)
return NULL; return NULL;
......
...@@ -26,11 +26,11 @@ RepresentationSelector::RepresentationSelector() ...@@ -26,11 +26,11 @@ RepresentationSelector::RepresentationSelector()
{ {
} }
Representation * RepresentationSelector::select(Period *period, Streams::Type type) const Representation * RepresentationSelector::select(Period *period, dash::Streams::Type type) const
{ {
return select(period, type, std::numeric_limits<uint64_t>::max()); return select(period, type, std::numeric_limits<uint64_t>::max());
} }
Representation * RepresentationSelector::select(Period *period, Streams::Type type, uint64_t bitrate) const Representation * RepresentationSelector::select(Period *period, dash::Streams::Type type, uint64_t bitrate) const
{ {
if (period == NULL) if (period == NULL)
return NULL; return NULL;
...@@ -53,7 +53,7 @@ Representation * RepresentationSelector::select(Period *period, Streams::Type ty ...@@ -53,7 +53,7 @@ Representation * RepresentationSelector::select(Period *period, Streams::Type ty
return best; return best;
} }
Representation * RepresentationSelector::select(Period *period, Streams::Type type, uint64_t bitrate, Representation * RepresentationSelector::select(Period *period, dash::Streams::Type type, uint64_t bitrate,
int width, int height) const int width, int height) const
{ {
if(period == NULL) if(period == NULL)
......
...@@ -54,7 +54,7 @@ const std::vector<AdaptationSet*>& Period::getAdaptationSets() const ...@@ -54,7 +54,7 @@ const std::vector<AdaptationSet*>& Period::getAdaptationSets() const
return this->adaptationSets; return this->adaptationSets;
} }
const std::vector<AdaptationSet*> Period::getAdaptationSets(Streams::Type type) const const std::vector<AdaptationSet*> Period::getAdaptationSets(dash::Streams::Type type) const
{ {
std::vector<AdaptationSet*> list; std::vector<AdaptationSet*> list;
std::vector<AdaptationSet*>::const_iterator it; std::vector<AdaptationSet*>::const_iterator it;
...@@ -75,7 +75,7 @@ void Period::addAdaptationSet(AdaptationSet *adap ...@@ -75,7 +75,7 @@ void Period::addAdaptationSet(AdaptationSet *adap
} }
} }
AdaptationSet * Period::getAdaptationSet(Streams::Type type) const AdaptationSet * Period::getAdaptationSet(dash::Streams::Type type) const
{ {
std::vector<AdaptationSet *>::const_iterator it; std::vector<AdaptationSet *>::const_iterator it;
for(it = adaptationSets.begin(); it != adaptationSets.end(); it++) for(it = adaptationSets.begin(); it != adaptationSets.end(); it++)
......
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
#include "SegmentTimeline.h" #include "SegmentTimeline.h"
#include <algorithm>
using namespace dash::mpd; using namespace dash::mpd;
SegmentTimeline::SegmentTimeline(TimescaleAble *parent) SegmentTimeline::SegmentTimeline(TimescaleAble *parent)
......
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