First stage adding additional parameters to match spec

Author: Andrew Sinclair

mpd/mpd.go

@@ -81,13 +81,50 @@ type Period struct {
 	AdaptationSets  []*AdaptationSet `xml:"AdaptationSet,omitempty"`
 }
 
+type DescriptorType struct {
+	SchemeIDURI *string `xml:"schemeIDURI,attr"`
+	Value       *string `xml:"value,attr"`
+	ID          *string `xml:"id,attr"`
+}
+
+// ISO 23009-1-2014 5.3.7
+type CommonAttributesAndElements struct {
+	Profiles                  *string         `xml:"profiles,attr"`
+	Width                     *string         `xml:"width,attr"`
+	Height                    *string         `xml:"height,attr"`
+	Sar                       *string         `xml:"sar,attr"`
+	FrameRate                 *string         `xml:"frameRate,attr"`
+	AudioSamplingRate         *string         `xml:"audioSamplingRate,attr"`
+	MimeType                  *string         `xml:"mimeType,attr"`
+	SegmentProfiles           *string         `xml:"segmentProfiles,attr"`
+	Codecs                    *string         `xml:"codecs,attr"`
+	MaximumSAPPeriod          *string         `xml:"MaximumSAPPeriod,attr"`
+	StartWithSAP              *string         `xml:"startWithSAP,attr"`
+	MaxPlayoutRate            *string         `xml:"maxPlayoutRate,attr"`
+	ScanType                  *string         `xml:"scanType,attr"`
+	FramePacking              *DescriptorType `xml:"framePacking,attr"`
+	AudioChannelConfiguration *DescriptorType `xml:"audioChannelConfiguration,attr"`
+	ContentProtection         *DescriptorType `xml:"contentProtection,attr"`
+	EssentialProperty         *DescriptorType `xml:"essentialProperty,attr"`
+	SupplementalProperty      *DescriptorType `xml:"supplmentalProperty,attr"`
+	InbandEventStream         *DescriptorType `xml:"inbandEventStream,attr"`
+}
+
 type AdaptationSet struct {
-	MimeType          *string               `xml:"mimeType,attr"`
-	ScanType          *string               `xml:"scanType,attr"`
+	CommonAttributesAndElements
+	MimeType          *string               `xml:"mimeType,attr"` // Common attribute, can be deprecated here
+	ScanType          *string               `xml:"scanType,attr"` // Common attribute, can be deprecated here
 	SegmentAlignment  *bool                 `xml:"segmentAlignment,attr"`
-	StartWithSAP      *int64                `xml:"startWithSAP,attr"`
+	StartWithSAP      *int64                `xml:"startWithSAP,attr"` // Common attribute, can be deprecated here
 	Lang              *string               `xml:"lang,attr"`
-	ContentProtection []ContentProtectioner `xml:"ContentProtection,omitempty"`
+	ID                *string               `xml:"id,attr"`
+	Group             *string               `xml:"group,attr"`
+	PAR               *string               `xml:"par,attr"`
+	MinBandwidth      *string               `xml:"minBandwidth,attr"`
+	MaxBandwidth      *string               `xml:"maxBandwidth,attr"`
+	MinWidth          *string               `xml:"minWidth,attr"`
+	MaxWidth          *string               `xml:"maxWidth,attr"`
+	ContentProtection []ContentProtectioner `xml:"ContentProtection,omitempty"` // Common attribute, can be deprecated here
 	Roles             []*Role               `xml:"Role,omitempty"`
 	SegmentBase       *SegmentBase          `xml:"SegmentBase,omitempty"`
 	SegmentList       *SegmentList          `xml:"SegmentList,omitempty"`
@@ -159,6 +196,7 @@ type SegmentTemplate struct {
 }
 
 type Representation struct {
+	CommonAttributesAndElements
 	AdaptationSet             *AdaptationSet             `xml:"-"`
 	AudioChannelConfiguration *AudioChannelConfiguration `xml:"AudioChannelConfiguration,omitempty"`
 	AudioSamplingRate         *int64                     `xml:"audioSamplingRate,attr"`   // Audio

mpd/mpd_test.go

@@ -184,6 +184,44 @@ func (s *MPDSuite) TestAddNewAdaptationSetAudio() {
 	assert.Equal(s.T(), expectedAS, as)
 }
 
+func (s *MPDSuite) TestAddNewAdaptationSetAudioSetAdditionalAttributes() {
+	m := NewMPD(DASH_PROFILE_LIVE, VALID_MEDIA_PRESENTATION_DURATION, VALID_MIN_BUFFER_TIME)
+	as, err := m.AddNewAdaptationSetAudio(DASH_MIME_TYPE_AUDIO_MP4, VALID_SEGMENT_ALIGNMENT, VALID_START_WITH_SAP, VALID_LANG)
+	assert.NotNil(s.T(), as)
+	assert.Nil(s.T(), err)
+	as.ID = Strptr("1")
+	as.CommonAttributesAndElements.Codecs = Strptr(VALID_AUDIO_CODEC)
+	expectedAS := &AdaptationSet{
+		MimeType:         Strptr(VALID_MIME_TYPE_AUDIO),
+		SegmentAlignment: Boolptr(VALID_SEGMENT_ALIGNMENT),
+		StartWithSAP:     Int64ptr(VALID_START_WITH_SAP),
+		Lang:             Strptr(VALID_LANG),
+		ID:               Strptr("1"),
+		CommonAttributesAndElements: CommonAttributesAndElements{
+			Profiles:                  nil,
+			Width:                     nil,
+			Height:                    nil,
+			Sar:                       nil,
+			FrameRate:                 nil,
+			AudioSamplingRate:         nil,
+			MimeType:                  nil,
+			SegmentProfiles:           nil,
+			Codecs:                    Strptr(VALID_AUDIO_CODEC),
+			MaximumSAPPeriod:          nil,
+			StartWithSAP:              nil,
+			MaxPlayoutRate:            nil,
+			ScanType:                  nil,
+			FramePacking:              nil,
+			AudioChannelConfiguration: nil,
+			ContentProtection:         nil,
+			EssentialProperty:         nil,
+			SupplementalProperty:      nil,
+			InbandEventStream:         nil,
+		},
+	}
+	assert.Equal(s.T(), expectedAS, as)
+}
+
 func (s *MPDSuite) TestAddNewAdaptationSetVideo() {
 	m := NewMPD(DASH_PROFILE_LIVE, VALID_MEDIA_PRESENTATION_DURATION, VALID_MIN_BUFFER_TIME)