From 9babfb883b44281d300444cf82a912159a16546b Mon Sep 17 00:00:00 2001
From: Jacob Trimble <modmaker@google.com>
Date: Wed, 16 Sep 2020 13:24:16 -0700
Subject: [PATCH] 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
---
 .../bear-english-text-1.m4s                     | Bin 239 -> 243 bytes
 .../bear-english-text-2.m4s                     | Bin 237 -> 241 bytes
 .../bear-english-text-3.m4s                     | Bin 237 -> 241 bytes
 .../bear-english-text-4.m4s                     | Bin 237 -> 241 bytes
 .../bear-english-text-5.m4s                     | Bin 253 -> 257 bytes
 .../bear-english-text-init.mp4                  | Bin 724 -> 728 bytes
 .../output.mpd                                  |   2 +-
 packager/media/base/byte_queue.cc               |   1 -
 8 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/packager/app/test/testdata/segmented-webvtt-with-language-override/bear-english-text-1.m4s b/packager/app/test/testdata/segmented-webvtt-with-language-override/bear-english-text-1.m4s
index 577826f3fa2f1e33884dbb39ced2392c4c69a734..7f6fea5f0301b5140ec26bede2b97e8ca57b12d4 100644
GIT binary patch
delta 32
kcmaFQ_?c0Hfq_A#xTLZmx4^^@$Y#ha&bI*K+=(K$0hsv-?f?J)

delta 28
hcmey&_?}UOfq_AxxTLZmvp7E&$Yuc27850I0|0r>2&e!6

diff --git a/packager/app/test/testdata/segmented-webvtt-with-language-override/bear-english-text-2.m4s b/packager/app/test/testdata/segmented-webvtt-with-language-override/bear-english-text-2.m4s
index 806b3320daab87cea63225e297b376b4a0096f46..a59e2a79add424b7aa7307d6577b63fbc9931d2b 100644
GIT binary patch
delta 32
kcmaFM_>ob9fq_A#xTLZmx4^^@$Y#ha&bI*K+=(JL0hoIU=l}o!

delta 28
hcmey!_?A(Gfq_AxxTLZmvp7E&$Yuc27850I0swhn2%-Q0

diff --git a/packager/app/test/testdata/segmented-webvtt-with-language-override/bear-english-text-3.m4s b/packager/app/test/testdata/segmented-webvtt-with-language-override/bear-english-text-3.m4s
index 22368c5f3059c45cb457a5b0a801bccbbcd55a38..08140209f9e829b7e4888d39439138e7b6f8d64f 100644
GIT binary patch
delta 32
kcmaFM_>ob9fq_A#xTLZmx4^^@$Y#ha&bI*K+=(JL0hoIU=l}o!

delta 28
hcmey!_?A(Gfq_AxxTLZmvp7E&$Yuc27850I0swhn2%-Q0

diff --git a/packager/app/test/testdata/segmented-webvtt-with-language-override/bear-english-text-4.m4s b/packager/app/test/testdata/segmented-webvtt-with-language-override/bear-english-text-4.m4s
index a4abbbe1de51824187f47a0e4638b8bc49ab3e38..666cbc3c1ed710944b034430a5cbd1993f25725f 100644
GIT binary patch
delta 32
kcmaFM_>ob9fq_A#xTLZmx4^^@$Y#ha&bI*K+=(JL0hoIU=l}o!

delta 28
hcmey!_?A(Gfq_AxxTLZmvp7E&$Yuc27850I0swhn2%-Q0

diff --git a/packager/app/test/testdata/segmented-webvtt-with-language-override/bear-english-text-5.m4s b/packager/app/test/testdata/segmented-webvtt-with-language-override/bear-english-text-5.m4s
index 904dea7dbe30572b437b8b02fbf898d35a6b2fc8..5c8f82c5da402b4ecbd1634ce793eae6566bb949 100644
GIT binary patch
delta 32
kcmey%*vKToz`&qVTvAz(TVP@cWHV$I=UV`A?nIH70F8(VnE(I)

delta 28
gcmZo<`pYQ7z`&qTTvAz(S)88>WHSJ1i-{610dDIEQvd(}

diff --git a/packager/app/test/testdata/segmented-webvtt-with-language-override/bear-english-text-init.mp4 b/packager/app/test/testdata/segmented-webvtt-with-language-override/bear-english-text-init.mp4
index 5336b976b5c8abdf36f57bfda22bb16c5dc49457..a61c68a57e2ce04bc38bc50af6508ab122c4c970 100644
GIT binary patch
delta 33
lcmcb@dV^Jhfq_9Kt)#Lbx4^^@$Y#ha&bI*K+>Ig!m;jtJ3Az9P

delta 29
icmcb?dWBVlfq_9Gt)#Lbvp7E&$Yuc278@lFFaZF3t_XAh

diff --git a/packager/app/test/testdata/segmented-webvtt-with-language-override/output.mpd b/packager/app/test/testdata/segmented-webvtt-with-language-override/output.mpd
index 758e2d37f7..ac0d53be9f 100644
--- a/packager/app/test/testdata/segmented-webvtt-with-language-override/output.mpd
+++ b/packager/app/test/testdata/segmented-webvtt-with-language-override/output.mpd
@@ -4,7 +4,7 @@
   <Period id="0" start="PT0S">
     <AdaptationSet id="0" contentType="text" lang="pt" segmentAlignment="true">
       <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">
           <SegmentTimeline>
             <S t="0" d="1000" r="4"/>
diff --git a/packager/media/base/byte_queue.cc b/packager/media/base/byte_queue.cc
index eb5028bc9a..e8f3deeace 100644
--- a/packager/media/base/byte_queue.cc
+++ b/packager/media/base/byte_queue.cc
@@ -28,7 +28,6 @@ void ByteQueue::Reset() {
 
 void ByteQueue::Push(const uint8_t* data, int size) {
   DCHECK(data);
-  DCHECK_GT(size, 0);
 
   size_t size_needed = used_ + size;