Merge pull request #19 from Eyevinn/contentprotection-getter

feat: GetContentProtection, GetMimeType, GetSegmentTemplate methods

CHANGELOG.md

@@ -7,7 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-- Nothing yet
+### Added
+
+- GetContentProtections, GetMimeType, and GetSegmentTemplate methods for AdaptationSet and Representation
 
 ## [0.10.0] - 2023-05-26
 

mpd/errors.go

@@ -6,6 +6,7 @@ var (
 	ErrASTRequired                 = errors.New("availabilityStartTime is required for dynamic MPDs")
 	ErrPeriodNotFound              = errors.New("period not found in MPD")
 	ErrParentNotSet                = errors.New("parent not set")
+	ErrSegmentTemplateNotSet       = errors.New("segmentTemplate not set")
 	ErrNoMediaPresentationDuration = errors.New("no MediaPresentationDuration in static MPD")
 	ErrUnknownPeriodDur            = errors.New("period duration cannot be derived")
 	ErrUnknownPeriodStart          = errors.New("period start cannot be derived")

mpd/mpd.go

@@ -286,6 +286,21 @@ func (a *AdaptationSetType) Clone() *AdaptationSetType {
 	return ac
 }
 
+// GetSegmentTemplate returns the segment template of the AdaptationSet or nil if not set.
+func (a *AdaptationSetType) GetSegmentTemplate() *SegmentTemplateType {
+	return a.SegmentTemplate
+}
+
+// GetMimeType returns the mime type.
+func (a *AdaptationSetType) GetMimeType() string {
+	return a.MimeType
+}
+
+// GetRepresentations returns the ContentProtections of the adaptation set.
+func (a *AdaptationSetType) GetContentProtections() []*ContentProtectionType {
+	return a.ContentProtections
+}
+
 // ContentComponentType is Content Component.
 type ContentComponentType struct {
 	XMLName         xml.Name               `xml:"ContentComponent"`
@@ -411,6 +426,13 @@ type RepresentationBaseType struct {
 	Resyncs                    []*ResyncType                `xml:"Resync"`
 }
 
+func (r *RepresentationType) GetSegmentTemplate() *SegmentTemplateType {
+	if r.SegmentTemplate == nil {
+		return r.parent.GetSegmentTemplate()
+	}
+	return r.SegmentTemplate
+}
+
 // GetInit returns the representation's initialization URI with replaced identifiers.
 //
 // TODO: Apply BaseURLs
@@ -419,39 +441,51 @@ func (r *RepresentationType) GetInit() (string, error) {
 	if a == nil {
 		return "", ErrParentNotSet
 	}
-	var initialization string
-	if a.SegmentTemplate != nil {
-		initialization = a.SegmentTemplate.Initialization
-	}
-	if r.SegmentTemplate != nil {
-		initialization = r.SegmentTemplate.Initialization
+	st := r.GetSegmentTemplate()
+	if st == nil {
+		return "", ErrSegmentTemplateNotSet
 	}
+	initialization := st.Initialization
 	initialization = strings.ReplaceAll(initialization, "$RepresentationID$", r.Id)
 	initialization = strings.ReplaceAll(initialization, "$Bandwidth$", strconv.Itoa(int(r.Bandwidth)))
 	return initialization, nil
 }
 
-// GetRepMedia returns the representaion's media path with replaced ID and bandwidth identifiers.
+// GetRepMedia returns the representation's media path with replaced ID and bandwidth identifiers.
 //
 // TODO: Apply BaseURLs.
 func (r *RepresentationType) GetMedia() (string, error) {
 	a := r.parent
 	if a == nil || r == nil {
 		return "", ErrParentNotSet
 	}
-	var media string
-	if a.SegmentTemplate != nil {
-		media = a.SegmentTemplate.Media
-	}
-	if r.SegmentTemplate != nil {
-		media = r.SegmentTemplate.Media
+	st := r.GetSegmentTemplate()
+	if st == nil {
+		return "", ErrSegmentTemplateNotSet
 	}
+	media := st.Media
 	media = strings.ReplaceAll(media, "$RepresentationID$", r.Id)
 	media = strings.ReplaceAll(media, "$Bandwidth$", strconv.Itoa(int(r.Bandwidth)))
 
 	return media, nil
 }
 
+// GetMimeType returns the representation's or its parent's mime type.
+func (r *RepresentationType) GetMimeType() string {
+	if r.MimeType == "" {
+		return r.parent.GetMimeType()
+	}
+	return r.MimeType
+}
+
+// GetContentProtections returns the representation's or its parent's content protections.
+func (r *RepresentationType) GetContentProtections() []*ContentProtectionType {
+	if len(r.ContentProtections) == 0 {
+		return r.parent.GetContentProtections()
+	}
+	return r.ContentProtections
+}
+
 // ContentProtectionType is Content Protection.
 type ContentProtectionType struct {
 	XMLName    xml.Name `xml:"ContentProtection"`
@@ -781,7 +815,7 @@ type StringNoWhitespaceType string
 // VideoScanType is enumeration "progressive", "interlaced", "unknown".
 type VideoScanType string
 
-// ProducerReferenceTimeTypeType is enumaration "encoder", "captured", "application".
+// ProducerReferenceTimeTypeType is enumeration "encoder", "captured", "application".
 type ProducerReferenceTimeTypeType string
 
 // PreselectionOrderType is enumeration "undefined", "time-ordered", "fully-ordered".