Commit 11969bc5 authored by Francois Cartegnie's avatar Francois Cartegnie

demux: adaptative: always fallback on representation format

parent c8be3492
...@@ -54,7 +54,10 @@ BaseAdaptationSet::~BaseAdaptationSet () ...@@ -54,7 +54,10 @@ BaseAdaptationSet::~BaseAdaptationSet ()
StreamFormat BaseAdaptationSet::getStreamFormat() const StreamFormat BaseAdaptationSet::getStreamFormat() const
{ {
return StreamFormat(); if (!representations.empty())
return representations.front()->getStreamFormat();
else
return StreamFormat();
} }
std::vector<BaseRepresentation*>& BaseAdaptationSet::getRepresentations() std::vector<BaseRepresentation*>& BaseAdaptationSet::getRepresentations()
......
...@@ -43,17 +43,9 @@ AdaptationSet::~AdaptationSet() ...@@ -43,17 +43,9 @@ AdaptationSet::~AdaptationSet()
StreamFormat AdaptationSet::getStreamFormat() const StreamFormat AdaptationSet::getStreamFormat() const
{ {
if(!getMimeType().empty()) if(!getMimeType().empty())
{
return DASHStreamFormat::mimeToFormat(getMimeType()); return DASHStreamFormat::mimeToFormat(getMimeType());
}
else if (!representations.empty())
{
return representations.front()->getStreamFormat();
}
else else
{ return BaseAdaptationSet::getStreamFormat();
return StreamFormat();
}
} }
bool AdaptationSet::getSubsegmentAlignmentFlag() const bool AdaptationSet::getSubsegmentAlignmentFlag() const
......
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