Skip to content

support for Acessibility element in AdaptationSet #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

support for Acessibility element in AdaptationSet #62

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5427950
return element name unrecognized in adaptation set
flavioribeiro Oct 31, 2019
b6bd25e
extend elements in adaptation set to cover accessibility elements
flavioribeiro Nov 1, 2019
abd1b79
Merge pull request #1 from zencoder/master
flavioribeiro Dec 19, 2019
22110e3
mpd: support float durations for SegmentTemplate
flavioribeiro Dec 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions mpd/mpd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,14 @@ func (as *AdaptationSet) UnmarshalXML(d *xml.Decoder, start xml.StartElement) er
return err
}
representations = append(representations, rp)
case "Accessibility":
ac := new(Accessibility)
err = d.DecodeElement(ac, &tt)
if err != nil {
return err
}
default:
return errors.New("Unrecognized element in AdaptationSet")
return errors.New("Unrecognized element in AdaptationSet: " + tt.Name.Local)
}
case xml.EndElement:
if tt == start.End() {
Expand Down Expand Up @@ -411,7 +417,7 @@ type SegmentTemplate struct {
AdaptationSet *AdaptationSet `xml:"-"`
SegmentTimeline *SegmentTimeline `xml:"SegmentTimeline,omitempty"`
PresentationTimeOffset *uint64 `xml:"presentationTimeOffset,attr,omitempty"`
Duration *int64 `xml:"duration,attr"`
Duration *float64 `xml:"duration,attr"`
Initialization *string `xml:"initialization,attr"`
Media *string `xml:"media,attr"`
StartNumber *int64 `xml:"startNumber,attr"`
Expand All @@ -435,6 +441,11 @@ type Representation struct {
SegmentTemplate *SegmentTemplate `xml:"SegmentTemplate,omitempty"`
}

type Accessibility struct {
SchemeIdUri *string `xml:"schemeIdUri,omitempty"`
Value *int64 `xml:"value,omitempty"`
}

type AudioChannelConfiguration struct {
SchemeIDURI *string `xml:"schemeIdUri,attr"`
// Value will be an int for non-Dolby Schemes, and a hexstring for Dolby Schemes, hence we make it a string
Expand Down Expand Up @@ -923,9 +934,9 @@ func (as *AdaptationSet) AddContentProtection(cp ContentProtectioner) error {
// media - template string for media segments.
// startNumber - the number to start segments from ($Number$) (i.e. 0).
// timescale - sets the timescale for duration (i.e. 1000, represents milliseconds).
func (as *AdaptationSet) SetNewSegmentTemplate(duration int64, init string, media string, startNumber int64, timescale int64) (*SegmentTemplate, error) {
func (as *AdaptationSet) SetNewSegmentTemplate(duration float64, init string, media string, startNumber int64, timescale int64) (*SegmentTemplate, error) {
st := &SegmentTemplate{
Duration: Int64ptr(duration),
Duration: Float64ptr(duration),
Initialization: Strptr(init),
Media: Strptr(media),
StartNumber: Int64ptr(startNumber),
Expand Down