diff options
Diffstat (limited to 'libdash')
| -rw-r--r-- | libdash/include/ISegmentTemplate.h | 6 | ||||
| -rw-r--r-- | libdash/include/ITimeline.h | 8 | ||||
| -rw-r--r-- | libdash/source/mpd/SegmentTemplate.cpp | 15 | ||||
| -rw-r--r-- | libdash/source/mpd/SegmentTemplate.h | 10 | ||||
| -rw-r--r-- | libdash/source/mpd/Timeline.cpp | 14 | ||||
| -rw-r--r-- | libdash/source/mpd/Timeline.h | 18 | ||||
| -rw-r--r-- | libdash/source/xml/Node.cpp | 1 |
7 files changed, 36 insertions, 36 deletions
diff --git a/libdash/include/ISegmentTemplate.h b/libdash/include/ISegmentTemplate.h index d7072956..19fe6418 100644 --- a/libdash/include/ISegmentTemplate.h +++ b/libdash/include/ISegmentTemplate.h @@ -126,7 +126,7 @@ namespace dash * This integer will be formated according to a possibly contained format tag in the \em \$Time\$ identifier. * @return a pointer to a dash::mpd::ISegment object */ - virtual ISegment* GetMediaSegmentFromTime (const std::vector<IBaseUrl *>& baseurls, const std::string& representationID, uint32_t bandwidth, uint32_t time) const = 0; + virtual ISegment* GetMediaSegmentFromTime (const std::vector<IBaseUrl *>& baseurls, const std::string& representationID, uint32_t bandwidth, uint64_t time) const = 0; /** * Returns a pointer to a dash::mpd::ISegment object that represents a Index Segment and can be downloaded. @@ -140,9 +140,9 @@ namespace dash * This integer will be formated according to a possibly contained format tag in the \em \$Time\$ identifier. * @return a pointer to a dash::mpd::ISegment object */ - virtual ISegment* GetIndexSegmentFromTime (const std::vector<IBaseUrl *>& baseurls, const std::string& representationID, uint32_t bandwidth, uint32_t time) const = 0; + virtual ISegment* GetIndexSegmentFromTime (const std::vector<IBaseUrl *>& baseurls, const std::string& representationID, uint32_t bandwidth, uint64_t time) const = 0; }; } } -#endif /* ISEGMENTTEMPLATE_H_ */
\ No newline at end of file +#endif /* ISEGMENTTEMPLATE_H_ */ diff --git a/libdash/include/ITimeline.h b/libdash/include/ITimeline.h index e1f8e953..0315fba3 100644 --- a/libdash/include/ITimeline.h +++ b/libdash/include/ITimeline.h @@ -43,14 +43,14 @@ namespace dash * \em StartTime corresponds to the \c \@t attribute. * @return an unsigned integer */ - virtual uint32_t GetStartTime () const = 0; + virtual uint64_t GetStartTime () const = 0; /** * Returns the integer that specifies the Segment duration, in units of the value of the \c \@timescale. \n\n * \em Duration corresponds to the \c \@d attribute. * @return an unsigned integer */ - virtual uint32_t GetDuration () const = 0; + virtual uint64_t GetDuration () const = 0; /** * Returns an integer that specifies the repeat count of the number of following contiguous Segments with the same duration expressed by the value of \c \@d. @@ -58,9 +58,9 @@ namespace dash * \em RepeatCount corresponds to the \c \@r attribute. * @return an unsigned integer */ - virtual uint32_t GetRepeatCount () const = 0; + virtual uint64_t GetRepeatCount () const = 0; }; } } -#endif /* ITIMELINE_H_ */
\ No newline at end of file +#endif /* ITIMELINE_H_ */ diff --git a/libdash/source/mpd/SegmentTemplate.cpp b/libdash/source/mpd/SegmentTemplate.cpp index b92c4692..f64f58c1 100644 --- a/libdash/source/mpd/SegmentTemplate.cpp +++ b/libdash/source/mpd/SegmentTemplate.cpp @@ -73,15 +73,15 @@ ISegment* SegmentTemplate::GetIndexSegmentFromNumber (const std:: { return ToSegment(this->index, baseurls, representationID, bandwidth, dash::metrics::IndexSegment, number); } -ISegment* SegmentTemplate::GetMediaSegmentFromTime (const std::vector<IBaseUrl *>& baseurls, const std::string& representationID, uint32_t bandwidth, uint32_t time) const +ISegment* SegmentTemplate::GetMediaSegmentFromTime (const std::vector<IBaseUrl *>& baseurls, const std::string& representationID, uint32_t bandwidth, uint64_t time) const { return ToSegment(this->media, baseurls, representationID, bandwidth, dash::metrics::MediaSegment, 0, time); } -ISegment* SegmentTemplate::GetIndexSegmentFromTime (const std::vector<IBaseUrl *>& baseurls, const std::string& representationID, uint32_t bandwidth, uint32_t time) const +ISegment* SegmentTemplate::GetIndexSegmentFromTime (const std::vector<IBaseUrl *>& baseurls, const std::string& representationID, uint32_t bandwidth, uint64_t time) const { return ToSegment(this->index, baseurls, representationID, bandwidth, dash::metrics::IndexSegment, 0, time); } -std::string SegmentTemplate::ReplaceParameters (const std::string& uri, const std::string& representationID, uint32_t bandwidth, uint32_t number, uint32_t time) const +std::string SegmentTemplate::ReplaceParameters (const std::string& uri, const std::string& representationID, uint32_t bandwidth, uint32_t number, uint64_t time) const { std::vector<std::string> chunks; std::string replacedUri = ""; @@ -127,19 +127,18 @@ std::string SegmentTemplate::ReplaceParameters (const std:: return replacedUri; } } -void SegmentTemplate::FormatChunk (std::string& uri, uint32_t number) const +void SegmentTemplate::FormatChunk (std::string& uri, uint64_t number) const { char formattedNumber [50]; size_t pos = 0; - std::string formatTag = "%01d"; + std::string formatTag = "%01lu"; if ( (pos = uri.find("%0")) != std::string::npos) formatTag = uri.substr(pos).append("d"); - sprintf(formattedNumber, formatTag.c_str(), number); uri = formattedNumber; } -ISegment* SegmentTemplate::ToSegment (const std::string& uri, const std::vector<IBaseUrl *>& baseurls, const std::string& representationID, uint32_t bandwidth, HTTPTransactionType type, uint32_t number, uint32_t time) const +ISegment* SegmentTemplate::ToSegment (const std::string& uri, const std::vector<IBaseUrl *>& baseurls, const std::string& representationID, uint32_t bandwidth, HTTPTransactionType type, uint32_t number, uint64_t time) const { Segment *seg = new Segment(); @@ -149,4 +148,4 @@ ISegment* SegmentTemplate::ToSegment (const std:: delete(seg); return NULL; -}
\ No newline at end of file +} diff --git a/libdash/source/mpd/SegmentTemplate.h b/libdash/source/mpd/SegmentTemplate.h index e5782a83..52aae8ab 100644 --- a/libdash/source/mpd/SegmentTemplate.h +++ b/libdash/source/mpd/SegmentTemplate.h @@ -36,8 +36,8 @@ namespace dash ISegment* ToBitstreamSwitchingSegment (const std::vector<IBaseUrl *>& baseurls, const std::string& representationID, uint32_t bandwidth) const; ISegment* GetMediaSegmentFromNumber (const std::vector<IBaseUrl *>& baseurls, const std::string& representationID, uint32_t bandwidth, uint32_t number) const; ISegment* GetIndexSegmentFromNumber (const std::vector<IBaseUrl *>& baseurls, const std::string& representationID, uint32_t bandwidth, uint32_t number) const; - ISegment* GetMediaSegmentFromTime (const std::vector<IBaseUrl *>& baseurls, const std::string& representationID, uint32_t bandwidth, uint32_t time) const; - ISegment* GetIndexSegmentFromTime (const std::vector<IBaseUrl *>& baseurls, const std::string& representationID, uint32_t bandwidth, uint32_t time) const; + ISegment* GetMediaSegmentFromTime (const std::vector<IBaseUrl *>& baseurls, const std::string& representationID, uint32_t bandwidth, uint64_t time) const; + ISegment* GetIndexSegmentFromTime (const std::vector<IBaseUrl *>& baseurls, const std::string& representationID, uint32_t bandwidth, uint64_t time) const; void SetMedia (const std::string& media); void SetIndex (const std::string& index); @@ -45,10 +45,10 @@ namespace dash void SetBitstreamSwitching (const std::string& bitstreamSwichting); private: - std::string ReplaceParameters (const std::string& uri, const std::string& representationID, uint32_t bandwidth, uint32_t number, uint32_t time) const; - void FormatChunk (std::string& uri, uint32_t number) const; + std::string ReplaceParameters (const std::string& uri, const std::string& representationID, uint32_t bandwidth, uint32_t number, uint64_t time) const; + void FormatChunk (std::string& uri, uint64_t number) const; ISegment* ToSegment (const std::string& uri, const std::vector<IBaseUrl *>& baseurls, const std::string& representationID, uint32_t bandwidth, - dash::metrics::HTTPTransactionType type, uint32_t number = 0, uint32_t time = 0) const; + dash::metrics::HTTPTransactionType type, uint32_t number = 0, uint64_t time = 0) const; std::string media; std::string index; diff --git a/libdash/source/mpd/Timeline.cpp b/libdash/source/mpd/Timeline.cpp index 624c6585..d054f655 100644 --- a/libdash/source/mpd/Timeline.cpp +++ b/libdash/source/mpd/Timeline.cpp @@ -23,27 +23,27 @@ Timeline::~Timeline () { } -uint32_t Timeline::GetStartTime () const +uint64_t Timeline::GetStartTime () const { return this->startTime; } -void Timeline::SetStartTime (uint32_t startTime) +void Timeline::SetStartTime (uint64_t startTime) { this->startTime = startTime; } -uint32_t Timeline::GetDuration () const +uint64_t Timeline::GetDuration () const { return this->duration; } -void Timeline::SetDuration (uint32_t duration) +void Timeline::SetDuration (uint64_t duration) { this->duration = duration; } -uint32_t Timeline::GetRepeatCount () const +uint64_t Timeline::GetRepeatCount () const { return this->repeatCount; } -void Timeline::SetRepeatCount (uint32_t repeatCount) +void Timeline::SetRepeatCount (uint64_t repeatCount) { this->repeatCount = repeatCount; -}
\ No newline at end of file +} diff --git a/libdash/source/mpd/Timeline.h b/libdash/source/mpd/Timeline.h index 3caa331f..eea3cd55 100644 --- a/libdash/source/mpd/Timeline.h +++ b/libdash/source/mpd/Timeline.h @@ -27,18 +27,18 @@ namespace dash Timeline (); virtual ~Timeline (); - uint32_t GetStartTime () const; - uint32_t GetDuration () const; - uint32_t GetRepeatCount () const; + uint64_t GetStartTime () const; + uint64_t GetDuration () const; + uint64_t GetRepeatCount () const; - void SetStartTime (uint32_t startTime); - void SetDuration (uint32_t duration); - void SetRepeatCount (uint32_t repeatCount); + void SetStartTime (uint64_t startTime); + void SetDuration (uint64_t duration); + void SetRepeatCount (uint64_t repeatCount); private: - uint32_t startTime; - uint32_t duration; - uint32_t repeatCount; + uint64_t startTime; + uint64_t duration; + uint64_t repeatCount; }; } } diff --git a/libdash/source/xml/Node.cpp b/libdash/source/xml/Node.cpp index 53193207..0747a8e1 100644 --- a/libdash/source/xml/Node.cpp +++ b/libdash/source/xml/Node.cpp @@ -209,6 +209,7 @@ dash::mpd::Timeline* Node::ToTimeline () cons if (this->HasAttribute("t")) { + uint64_t yolo = strtoul(this->GetAttributeValue("t").c_str(), NULL, 10); timeline->SetStartTime(strtoul(this->GetAttributeValue("t").c_str(), NULL, 10)); } if (this->HasAttribute("d")) |