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

Fix segmented WebVTT test. 

The test added in the previous CL was broken due to a rebase on another
change.  This subtly changed some of the byte offsets that broke the
test.  This wasn't caught since I didn't rebase and re-run the tests
before merging.

Change-Id: Id7e4c7688278eae37da1a14f1648263b4dda98cd
This commit is contained in:
Jacob Trimble 2020-09-16 13:24:16 -07:00
parent e3bc85f12d
commit 9babfb883b
8 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
packager/app/test/testdata/segmented-webvtt-with-language-override/bear-english-text-1.m4s vendored
View File

Binary file not shown.

BIN
packager/app/test/testdata/segmented-webvtt-with-language-override/bear-english-text-2.m4s vendored
View File

Binary file not shown.

BIN
packager/app/test/testdata/segmented-webvtt-with-language-override/bear-english-text-3.m4s vendored
View File

Binary file not shown.

BIN
packager/app/test/testdata/segmented-webvtt-with-language-override/bear-english-text-4.m4s vendored
View File

Binary file not shown.

BIN
packager/app/test/testdata/segmented-webvtt-with-language-override/bear-english-text-5.m4s vendored
View File

Binary file not shown.

BIN
packager/app/test/testdata/segmented-webvtt-with-language-override/bear-english-text-init.mp4 vendored
View File

Binary file not shown.

2
packager/app/test/testdata/segmented-webvtt-with-language-override/output.mpd vendored
View File

@ -4,7 +4,7 @@
<Period id="0" start="PT0S"> <Period id="0" start="PT0S">
<AdaptationSet id="0" contentType="text" lang="pt" segmentAlignment="true"> <AdaptationSet id="0" contentType="text" lang="pt" segmentAlignment="true">
<Role schemeIdUri="urn:mpeg:dash:role:2011" value="subtitle"/> <Role schemeIdUri="urn:mpeg:dash:role:2011" value="subtitle"/>
<Representation id="0" bandwidth="2024" codecs="wvtt" mimeType="application/mp4"> <Representation id="0" bandwidth="2056" codecs="wvtt" mimeType="application/mp4">
<SegmentTemplate timescale="1000" initialization="bear-english-text-init.mp4" media="bear-english-text-$Number$.m4s" startNumber="1"> <SegmentTemplate timescale="1000" initialization="bear-english-text-init.mp4" media="bear-english-text-$Number$.m4s" startNumber="1">
<SegmentTimeline> <SegmentTimeline>
<S t="0" d="1000" r="4"/> <S t="0" d="1000" r="4"/>

1
packager/media/base/byte_queue.cc
View File

@ -28,7 +28,6 @@ void ByteQueue::Reset() {
void ByteQueue::Push(const uint8_t* data, int size) { void ByteQueue::Push(const uint8_t* data, int size) {
DCHECK(data); DCHECK(data);
DCHECK_GT(size, 0);
size_t size_needed = used_ + size; size_t size_needed = used_ + size;