Commit d44c8a1e authored by Francois Cartegnie's avatar Francois Cartegnie

demux: dash: rename startIndex -> startNumber

parent 0d3181d5
...@@ -117,7 +117,7 @@ size_t IsoffMainParser::parseSegmentTemplate(Node *templateNode, SegmentInformat ...@@ -117,7 +117,7 @@ size_t IsoffMainParser::parseSegmentTemplate(Node *templateNode, SegmentInformat
mediaTemplate->setSourceUrl(mediaurl); mediaTemplate->setSourceUrl(mediaurl);
if(templateNode->hasAttribute("startNumber")) if(templateNode->hasAttribute("startNumber"))
mediaTemplate->startIndex.Set(Integer<uint64_t>(templateNode->getAttributeValue("startNumber"))); mediaTemplate->startNumber.Set(Integer<uint64_t>(templateNode->getAttributeValue("startNumber")));
if(templateNode->hasAttribute("duration")) if(templateNode->hasAttribute("duration"))
mediaTemplate->duration.Set(Integer<mtime_t>(templateNode->getAttributeValue("duration"))); mediaTemplate->duration.Set(Integer<mtime_t>(templateNode->getAttributeValue("duration")));
......
...@@ -55,7 +55,7 @@ MediaSegmentTemplate::MediaSegmentTemplate( ICanonicalUrl *parent ) : ...@@ -55,7 +55,7 @@ MediaSegmentTemplate::MediaSegmentTemplate( ICanonicalUrl *parent ) :
debugName = "SegmentTemplate"; debugName = "SegmentTemplate";
classId = Segment::CLASSID_SEGMENT; classId = Segment::CLASSID_SEGMENT;
timescale.Set( 0 ); timescale.Set( 0 );
startIndex.Set( 0 ); startNumber.Set( 0 );
initialisationSegment.Set( NULL ); initialisationSegment.Set( NULL );
} }
......
...@@ -48,7 +48,7 @@ namespace dash ...@@ -48,7 +48,7 @@ namespace dash
{ {
public: public:
MediaSegmentTemplate( ICanonicalUrl * = NULL ); MediaSegmentTemplate( ICanonicalUrl * = NULL );
Property<size_t> startIndex; Property<size_t> startNumber;
Property<uint64_t> timescale; Property<uint64_t> timescale;
}; };
......
...@@ -87,7 +87,7 @@ Url::Component::Component(const std::string & str, const MediaSegmentTemplate *t ...@@ -87,7 +87,7 @@ Url::Component::Component(const std::string & str, const MediaSegmentTemplate *t
size_t Url::Component::getSegmentNumber(size_t index, const Representation *rep) const size_t Url::Component::getSegmentNumber(size_t index, const Representation *rep) const
{ {
index += templ->startIndex.Get(); index += templ->startNumber.Get();
/* live streams / templated */ /* live streams / templated */
if(rep->getMPD()->isLive() && templ->duration.Get()) if(rep->getMPD()->isLive() && templ->duration.Get())
{ {
......
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