demux: dash: rename startIndex -> startNumber

diff --git a/modules/demux/dash/mpd/IsoffMainParser.cpp b/modules/demux/dash/mpd/IsoffMainParser.cpp
index f781369cc34915d33994bd9a9547d7c80696c209..55bb8e36c2f5f2223a24f8ccc57a4d2bed4ff73a 100644 (file)
--- a/modules/demux/dash/mpd/IsoffMainParser.cpp
+++ b/modules/demux/dash/mpd/IsoffMainParser.cpp
@@ -117,7 +117,7 @@ size_t IsoffMainParser::parseSegmentTemplate(Node *templateNode, SegmentInformat
     mediaTemplate->setSourceUrl(mediaurl);
 
     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"))
         mediaTemplate->duration.Set(Integer<mtime_t>(templateNode->getAttributeValue("duration")));

diff --git a/modules/demux/dash/mpd/SegmentTemplate.cpp b/modules/demux/dash/mpd/SegmentTemplate.cpp
index 74cddae53bf31bb8ce770282615790b67c548386..b9e8c3fb3aaade2ee40a6fd614b5a52579ff874d 100644 (file)
--- a/modules/demux/dash/mpd/SegmentTemplate.cpp
+++ b/modules/demux/dash/mpd/SegmentTemplate.cpp
@@ -55,7 +55,7 @@ MediaSegmentTemplate::MediaSegmentTemplate( ICanonicalUrl *parent ) :
     debugName = "SegmentTemplate";
     classId = Segment::CLASSID_SEGMENT;
     timescale.Set( 0 );
-    startIndex.Set( 0 );
+    startNumber.Set( 0 );
     initialisationSegment.Set( NULL );
 }
 

diff --git a/modules/demux/dash/mpd/SegmentTemplate.h b/modules/demux/dash/mpd/SegmentTemplate.h
index f3aefdf3385c57120dd4f03919d183553d9d650e..df827f26620b25f5adcf1b06eaf4c4bd17df244a 100644 (file)
--- a/modules/demux/dash/mpd/SegmentTemplate.h
+++ b/modules/demux/dash/mpd/SegmentTemplate.h
@@ -48,7 +48,7 @@ namespace dash
         {
             public:
                 MediaSegmentTemplate( ICanonicalUrl * = NULL );
-                Property<size_t>        startIndex;
+                Property<size_t>        startNumber;
                 Property<uint64_t>      timescale;
         };
 

diff --git a/modules/demux/dash/mpd/Url.cpp b/modules/demux/dash/mpd/Url.cpp
index 70ed85cc4dc298e0318c4b902cf23d15c6e2f1ea..50151850ab2a085e0c3103ea596c4c3c20a2fc59 100644 (file)
--- a/modules/demux/dash/mpd/Url.cpp
+++ b/modules/demux/dash/mpd/Url.cpp
@@ -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
 {
-    index += templ->startIndex.Get();
+    index += templ->startNumber.Get();
     /* live streams / templated */
     if(rep->getMPD()->isLive() && templ->duration.Get())
     {