-
Notifications
You must be signed in to change notification settings - Fork 516
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: order streams in manifest based on command-line order (#1329)
This will force the muxer to order streams in the order given on the command-line. Closes #560 Closes #1280 Closes #1313 --------- Co-authored-by: Joey Parrish <[email protected]> Co-authored-by: Cosmin Stejerean <[email protected]>
- Loading branch information
1 parent
df04d0e
commit aad2a12
Showing
94 changed files
with
980 additions
and
584 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
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
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
Binary file added
BIN
+798 KB
...ata/audio-video-with-codec-switching-and-forced-commandline_order/bear-1280x720-video.mp4
Binary file not shown.
Binary file added
BIN
+42.7 KB
...data/audio-video-with-codec-switching-and-forced-commandline_order/bear-640x360-audio.mp4
Binary file not shown.
Binary file added
BIN
+88.4 KB
...audio-video-with-codec-switching-and-forced-commandline_order/bear-640x360-hevc-video.mp4
Binary file not shown.
Binary file added
BIN
+295 KB
...data/audio-video-with-codec-switching-and-forced-commandline_order/bear-640x360-video.mp4
Binary file not shown.
41 changes: 41 additions & 0 deletions
41
...pp/test/testdata/audio-video-with-codec-switching-and-forced-commandline_order/output.mpd
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,41 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<!--Generated with https://github.com/shaka-project/shaka-packager version <tag>-<hash>-<test>--> | ||
<MPD xmlns="urn:mpeg:dash:schema:mpd:2011" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:mpeg:dash:schema:mpd:2011 DASH-MPD.xsd" profiles="urn:mpeg:dash:profile:isoff-on-demand:2011" minBufferTime="PT2S" type="static" mediaPresentationDuration="PT2.8028S"> | ||
<Period id="0"> | ||
<AdaptationSet id="0" contentType="audio" subsegmentAlignment="true"> | ||
<Representation id="0" bandwidth="133334" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100"> | ||
<AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/> | ||
<BaseURL>bear-640x360-audio.mp4</BaseURL> | ||
<SegmentBase indexRange="804-871" timescale="44100"> | ||
<Initialization range="0-803"/> | ||
</SegmentBase> | ||
</Representation> | ||
</AdaptationSet> | ||
<AdaptationSet id="1" contentType="video" width="640" height="360" frameRate="30000/1001" subsegmentAlignment="true" par="16:9"> | ||
<SupplementalProperty schemeIdUri="urn:mpeg:dash:adaptation-set-switching:2016" value="2"/> | ||
<Role schemeIdUri="urn:mpeg:dash:role:2011" value="main"/> | ||
<Representation id="1" bandwidth="277411" codecs="hev1.1.6.L63.90" mimeType="video/mp4" sar="1:1"> | ||
<BaseURL>bear-640x360-hevc-video.mp4</BaseURL> | ||
<SegmentBase indexRange="1910-1977" timescale="30000"> | ||
<Initialization range="0-1909"/> | ||
</SegmentBase> | ||
</Representation> | ||
</AdaptationSet> | ||
<AdaptationSet id="2" contentType="video" maxWidth="1280" maxHeight="720" frameRate="30000/1001" subsegmentAlignment="true" par="16:9"> | ||
<SupplementalProperty schemeIdUri="urn:mpeg:dash:adaptation-set-switching:2016" value="1"/> | ||
<Role schemeIdUri="urn:mpeg:dash:role:2011" value="main"/> | ||
<Representation id="2" bandwidth="973483" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1" width="640" height="360"> | ||
<BaseURL>bear-640x360-video.mp4</BaseURL> | ||
<SegmentBase indexRange="870-937" timescale="30000"> | ||
<Initialization range="0-869"/> | ||
</SegmentBase> | ||
</Representation> | ||
<Representation id="3" bandwidth="2627285" codecs="avc1.64001f" mimeType="video/mp4" sar="1:1" width="1280" height="720"> | ||
<BaseURL>bear-1280x720-video.mp4</BaseURL> | ||
<SegmentBase indexRange="869-936" timescale="30000"> | ||
<Initialization range="0-868"/> | ||
</SegmentBase> | ||
</Representation> | ||
</AdaptationSet> | ||
</Period> | ||
</MPD> |
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
Oops, something went wrong.