-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #31 from MPEGGroup/dev
merge dev into master - first cut at FDIS 4th Ed
- Loading branch information
Showing
9 changed files
with
323 additions
and
40 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,7 @@ | ||
| [28-Mar-2019] | ||
| [6-Aug-2019] | ||
|
|
||
| This project is for the maintenance of the DASH part 1 schemas (ISO/IEC 23009-1). | ||
|
|
||
| There are necessarily a few branches at this time as we have a few things going on in parallel: | ||
|
|
||
| master – verbatim from w18312 (draft FDIS 3rd Ed). Note that I did not include xlink.xsd since that’s not ISO’s and should not be in the electronic attachments. The master has various errors covered in the open issues. A release was created for the baseline master since it was published in the FDIS 3rd Ed. Do not make PRs against this master branch. | ||
|
|
||
| 3rd-Ed (from master) – schema typos are fixed and is the target for the final 3rd Ed schema and examples. No more edits should be made to this branch unless you find an error WRT to the spec text, in which case an issue should be filed. I will ensure that it matches the as-published 3rd Ed in a few months. Do not make PRs against this branch. | ||
|
|
||
| Amd5 (from 3rd-Ed) – this is the beginning of the schema for FDAM5 (as of this morning, aka FDIS 4th Ed). FYI, I have fixes committed for the errors in G4, G5 and G8, but I am along ways from adding the schema updates from COR3+DAM5+SoDAM5 found in my m47966-v6; which would then need to be modified per the DoC output from this meeting (which would include for example the mixed=true on Event). | ||
|
|
||
| This is the not forum for proposing changes to DASH. This is a forum for working through the details of the intent of approved contributions and TexOf text outputs, as well as fixing errors. | ||
|
|
||
| Please do any proposed Pull Requests on the dev branch. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <MPD | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xmlns="urn:mpeg:dash:schema:mpd:2011" | ||
| xsi:schemaLocation="urn:mpeg:dash:schema:mpd:2011 DASH-MPD.xsd" | ||
| type="dynamic" | ||
| availabilityStartTime="2018-12-20T06:04:22Z" | ||
| publishTime="2018-12-20T06:04:22Z" | ||
| minimumUpdatePeriod="PT2S" | ||
| mediaPresentationDuration="PT0H4M9.708S" | ||
| minBufferTime="PT4S" | ||
| profiles="urn:mpeg:dash:profile:isoff-live:2011"> | ||
|
|
||
| <Period id="1" start="PT0S"> | ||
| <!-- Video --> | ||
| <AdaptationSet id="1" mimeType="video/mp4" segmentAlignment="true" startWithSAP="1"> | ||
| <Role schemeIdUri="urn:mpeg:dash:role:2011" value="main"/> | ||
| <SegmentTemplate timescale="5994" media="video_$Number$.mp4" initialization="video.mp4"> | ||
| <SegmentTimeline> | ||
| <S t="0" d="12000" r="154"/> | ||
| </SegmentTimeline> | ||
| </SegmentTemplate> | ||
| <Representation id="1" bandwidth="3732256" codecs="hev1.1.6.L120.90" width="1920" height="1080"/> | ||
| </AdaptationSet> | ||
| <!-- Audio (M&E) --> | ||
| <AdaptationSet id="2" mimeType="audio/mp4" codecs="mhm2.0x0C" segmentAlignment="true" startWithSAP="1"> | ||
| <AudioChannelConfiguration schemeIdUri="urn:mpeg:mpegB:cicp:ChannelConfiguration" value="2"/> | ||
| <EssentialProperty schemeIdUri="urn:mpeg:dash:preselection:2016" value="1,2 3"/> | ||
| <EssentialProperty schemeIdUri="urn:mpeg:dash:preselection:2016" value="2,2 4"/> | ||
| <Role schemeIdUri="urn:mpeg:dash:role:2011" value="main"/> | ||
| <SegmentTemplate timescale="48000" media="audio0_$Number$.mp4" initialization="audio0.mp4"> | ||
| <SegmentTimeline> | ||
| <S t="0" d="90112" r="133"/> | ||
| </SegmentTimeline> | ||
| </SegmentTemplate> | ||
| <Representation id="2" bandwidth="132669" audioSamplingRate="48000"/> | ||
| </AdaptationSet> | ||
| <!-- Audio (English) --> | ||
| <AdaptationSet id="3" mimeType="audio/mp4" lang="en" codecs="mhm2.0x0C" segmentAlignment="true" startWithSAP="1"> | ||
| <AudioChannelConfiguration schemeIdUri="urn:mpeg:mpegB:cicp:ChannelConfiguration" value="1"/> | ||
| <EssentialProperty schemeIdUri="urn:mpeg:dash:preselection:2016"/> | ||
| <Role schemeIdUri="urn:mpeg:dash:role:2011" value="main"/> | ||
| <SegmentTemplate timescale="48000" media="audio1_$Number$.mp4" initialization="audio1.mp4"> | ||
| <SegmentTimeline> | ||
| <S t="0" d="90112" r="133"/> | ||
| </SegmentTimeline> | ||
| </SegmentTemplate> | ||
| <Representation id="3" bandwidth="32494" audioSamplingRate="48000"/> | ||
| </AdaptationSet> | ||
| <!-- Audio (Spanish) --> | ||
| <AdaptationSet id="4" mimeType="audio/mp4" lang="es" codecs="mhm2.0x0C" segmentAlignment="true" startWithSAP="1"> | ||
| <AudioChannelConfiguration schemeIdUri="urn:mpeg:mpegB:cicp:ChannelConfiguration" value="1"/> | ||
| <EssentialProperty schemeIdUri="urn:mpeg:dash:preselection:2016"/> | ||
| <Role schemeIdUri="urn:mpeg:dash:role:2011" value="dub"/> | ||
| <SegmentTemplate timescale="48000" media="audio2_$Number$.mp4" initialization="audio2.mp4"> | ||
| <SegmentTimeline> | ||
| <S t="0" d="90112" r="133"/> | ||
| </SegmentTimeline> | ||
| </SegmentTemplate> | ||
| <Representation id="4" bandwidth="32494" audioSamplingRate="48000"/> | ||
| </AdaptationSet> | ||
| </Period> | ||
| </MPD> |
Oops, something went wrong.