Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed off-by-one bug in WebM muxer 

There was a bug in the single-segment WebM muxer where the index
range was incorrect.

Closes #99

Change-Id: I7cde98f9b5e88615fcf0ab406b22f65f0b14e15f
This commit is contained in:
Jacob Trimble 2016-04-01 16:16:51 -07:00
parent c9645bc21b
commit fe6775a509
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packager/app/test/testdata/bear-320x240-vorbis-webm-golden.mpd vendored
View File

@ -6,7 +6,7 @@
<Representation id="0" bandwidth="69362" codecs="vorbis" mimeType="audio/webm" audioSamplingRate="44100"> <Representation id="0" bandwidth="69362" codecs="vorbis" mimeType="audio/webm" audioSamplingRate="44100">
<AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/> <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
<BaseURL>output_audio.webm</BaseURL> <BaseURL>output_audio.webm</BaseURL>
<SegmentBase indexRange="23950-23999" timescale="1000000"> <SegmentBase indexRange="23950-23998" timescale="1000000">
<Initialization range="0-4158"/> <Initialization range="0-4158"/>
</SegmentBase> </SegmentBase>
</Representation> </Representation>

2
packager/app/test/testdata/bear-320x240-vp9-webm-golden.mpd vendored
View File

@ -5,7 +5,7 @@
<AdaptationSet id="0" contentType="video" width="320" height="240" frameRate="1000000/34000" par="16:9"> <AdaptationSet id="0" contentType="video" width="320" height="240" frameRate="1000000/34000" par="16:9">
<Representation id="0" bandwidth="203313" codecs="vp9" mimeType="video/webm" sar="427:320"> <Representation id="0" bandwidth="203313" codecs="vp9" mimeType="video/webm" sar="427:320">
<BaseURL>output_video.webm</BaseURL> <BaseURL>output_video.webm</BaseURL>
<SegmentBase indexRange="69485-69533" timescale="1000000"> <SegmentBase indexRange="69485-69532" timescale="1000000">
<Initialization range="0-286"/> <Initialization range="0-286"/>
</SegmentBase> </SegmentBase>
</Representation> </Representation>

2
packager/app/test/testdata/bear-640x360-vp8-cenc-webm-golden.mpd vendored
View File

@ -8,7 +8,7 @@
<cenc:pssh>AAAAMHBzc2gAAAAA7e+LqXnWSs6jyCfc1R0h7QAAABAxMjM0NTY3ODkwMTIzNDU2</cenc:pssh> <cenc:pssh>AAAAMHBzc2gAAAAA7e+LqXnWSs6jyCfc1R0h7QAAABAxMjM0NTY3ODkwMTIzNDU2</cenc:pssh>
</ContentProtection> </ContentProtection>
<BaseURL>output_video.webm</BaseURL> <BaseURL>output_video.webm</BaseURL>
<SegmentBase indexRange="115225-115275" timescale="1000000"> <SegmentBase indexRange="115225-115274" timescale="1000000">
<Initialization range="0-339"/> <Initialization range="0-339"/>
</SegmentBase> </SegmentBase>
</Representation> </Representation>

2
packager/app/test/testdata/bear-640x360-vp8-webm-golden.mpd vendored
View File

@ -5,7 +5,7 @@
<AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="1000000/33000" par="16:9"> <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="1000000/33000" par="16:9">
<Representation id="0" bandwidth="335454" codecs="vp8" mimeType="video/webm" sar="1:1"> <Representation id="0" bandwidth="335454" codecs="vp8" mimeType="video/webm" sar="1:1">
<BaseURL>output_video.webm</BaseURL> <BaseURL>output_video.webm</BaseURL>
<SegmentBase indexRange="114676-114725" timescale="1000000"> <SegmentBase indexRange="114676-114724" timescale="1000000">
<Initialization range="0-288"/> <Initialization range="0-288"/>
</SegmentBase> </SegmentBase>
</Representation> </Representation>

2
packager/media/formats/webm/single_segment_segmenter.cc
View File

@ -80,7 +80,7 @@ bool SingleSegmentSegmenter::GetIndexRangeStartAndEnd(uint32_t* start,
// The index is the Cues element, which is always placed at the end of the // The index is the Cues element, which is always placed at the end of the
// file. // file.
*start = index_start_; *start = index_start_;
*end = writer_->file()->Size(); *end = writer_->file()->Size() - 1;
return true; return true;
} }