Merge "Addressing issue about different position of the segmentTemplate in MPD" into...

diff --cc MPD/MPDWrapper.cpp
index 6d6fa9e,1e08554..0b1d959
--- 1/MPD/MPDWrapper.cpp
--- 2/MPD/MPDWrapper.cpp
+++ b/MPD/MPDWrapper.cpp
@@@ -671,9 -656,37 +676,38 @@@ MediaObject*     MPDWrapper::getNextSegmen
      if(seg != NULL)
      {
          MediaObject *media = new MediaObject(seg, representation, withFeedBack);
+         if(segDuration == 0)
+         {
+             uint32_t duration = 0;
+             uint32_t timescale = 0;
+ 
+             if(representation->GetSegmentTemplate())
+             {
+                 duration = representation->GetSegmentTemplate()->GetDuration();
+                 timescale = representation->GetSegmentTemplate()->GetTimescale();
+             }
+             else
+             {
+                 if(adaptationSet->GetSegmentTemplate())
+                 {
+                     duration = adaptationSet->GetSegmentTemplate()->GetDuration();
+                     timescale = adaptationSet->GetSegmentTemplate()->GetTimescale();
+                 }
+                 else
+                 {
+                     if(this->period->GetSegmentTemplate())
+                     {
+                         duration = this->period->GetSegmentTemplate()->GetDuration();
+                         timescale = this->period->GetSegmentTemplate()->GetTimescale();
+                     }
+                 }
+             }
+             segDuration = 1.0*duration/(1.0*timescale) * 1000;
+ 
+         }
          media->SetSegmentDuration(segDuration);
          segmentNumber++;
 +
          switch(type)
          {
          case viper::managers::StreamType::AUDIO:

diff --cc MPD/SegmentTemplateStream.cpp
Simple merge