Integrate CueAlignmentHandler

Also changed ChunkingHandler to be one-one handler. Issue: #355 Change-Id: Ie98a96bcc0ddded347699c9f333f604826976d11
shaka-project · Mar 26, 2018 · 4e57259 · 4e57259
1 parent 2b337e2
commit 4e57259
Show file tree

Hide file tree

Showing 136 changed files with 384 additions and 708 deletions.
diff --git a/...r/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-audio.mp4 b/...r/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-audio.mp4
diff --git a/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-audio.mp4 b/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-audio.mp4
diff --git a/packager/app/test/testdata/audio-video-with-trick-play/bear-640x360-audio.mp4 b/packager/app/test/testdata/audio-video-with-trick-play/bear-640x360-audio.mp4
diff --git a/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-audio.mp4 b/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-audio.mp4
diff --git a/packager/app/test/testdata/audio-video/bear-640x360-audio.mp4 b/packager/app/test/testdata/audio-video/bear-640x360-audio.mp4
diff --git a/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio-1.ts b/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio-1.ts
diff --git a/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio-2.ts b/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio-2.ts
diff --git a/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio-3.ts b/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio-3.ts
diff --git a/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio.m3u8 b/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio.m3u8
@@ -3,10 +3,10 @@
 ## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
 #EXT-X-TARGETDURATION:2
 #EXT-X-PLAYLIST-TYPE:VOD
-#EXTINF:0.952,
+#EXTINF:0.975,
 bear-640x360-audio-1.ts
 #EXTINF:0.998,
 bear-640x360-audio-2.ts
-#EXTINF:0.813,
+#EXTINF:0.789,
 bear-640x360-audio-3.ts
 #EXT-X-ENDLIST
diff --git a/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-audio.m3u8 b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-audio.m3u8
@@ -7,10 +7,10 @@
 #EXTINF:0.975,
 #EXT-X-BYTERANGE:23728@794
 bear-640x360-ac3-audio.mp4
-#EXTINF:0.975,
-#EXT-X-BYTERANGE:23730
+#EXTINF:1.010,
+#EXT-X-BYTERANGE:24574
 bear-640x360-ac3-audio.mp4
-#EXTINF:0.836,
-#EXT-X-BYTERANGE:20354
+#EXTINF:0.801,
+#EXT-X-BYTERANGE:19510
 bear-640x360-ac3-audio.mp4
 #EXT-X-ENDLIST
diff --git a/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-audio.mp4 b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-audio.mp4
diff --git a/packager/app/test/testdata/avc-ac3-ts-to-mp4/output.m3u8 b/packager/app/test/testdata/avc-ac3-ts-to-mp4/output.m3u8
@@ -3,7 +3,7 @@
 
 #EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-ac3-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
 
-#EXT-X-STREAM-INF:BANDWIDTH=1168277,CODECS="avc1.64001e,ac-3",RESOLUTION=640x360,AUDIO="default-audio-group"
+#EXT-X-STREAM-INF:BANDWIDTH=1168319,CODECS="avc1.64001e,ac-3",RESOLUTION=640x360,AUDIO="default-audio-group"
 bear-640x360-ac3-video.m3u8
 
 #EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=214291,CODECS="avc1.64001e",RESOLUTION=640x360,URI="bear-640x360-ac3-video-iframe.m3u8"
diff --git a/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio-2.ts b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio-2.ts
diff --git a/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio-3.ts b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio-3.ts
diff --git a/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio.m3u8 b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio.m3u8
@@ -7,8 +7,8 @@
 bear-640x360-ac3-audio-1.ts
 #EXT-X-DISCONTINUITY
 #EXT-X-KEY:METHOD=SAMPLE-AES,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",IV=0x3334353637383930,KEYFORMAT="identity"
-#EXTINF:0.975,
+#EXTINF:1.010,
 bear-640x360-ac3-audio-2.ts
-#EXTINF:0.836,
+#EXTINF:0.801,
 bear-640x360-ac3-audio-3.ts
 #EXT-X-ENDLIST
diff --git a/packager/app/test/testdata/avc-ac3-ts-with-encryption/output.m3u8 b/packager/app/test/testdata/avc-ac3-ts-with-encryption/output.m3u8
@@ -3,7 +3,7 @@
 
 #EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-ac3-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
 
-#EXT-X-STREAM-INF:BANDWIDTH=1242703,CODECS="avc1.64001e,ac-3",RESOLUTION=640x360,AUDIO="default-audio-group"
+#EXT-X-STREAM-INF:BANDWIDTH=1242861,CODECS="avc1.64001e,ac-3",RESOLUTION=640x360,AUDIO="default-audio-group"
 bear-640x360-ac3-video.m3u8
 
 #EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=238897,CODECS="avc1.64001e",RESOLUTION=640x360,URI="bear-640x360-ac3-video-iframe.m3u8"
diff --git a/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio-2.ts b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio-2.ts
diff --git a/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio-3.ts b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio-3.ts
diff --git a/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio.m3u8 b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio.m3u8
@@ -5,8 +5,8 @@
 #EXT-X-PLAYLIST-TYPE:VOD
 #EXTINF:0.975,
 bear-640x360-ac3-audio-1.ts
-#EXTINF:0.975,
+#EXTINF:1.010,
 bear-640x360-ac3-audio-2.ts
-#EXTINF:0.836,
+#EXTINF:0.801,
 bear-640x360-ac3-audio-3.ts
 #EXT-X-ENDLIST
diff --git a/packager/app/test/testdata/avc-ac3-ts/output.m3u8 b/packager/app/test/testdata/avc-ac3-ts/output.m3u8
@@ -3,7 +3,7 @@
 
 #EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-ac3-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
 
-#EXT-X-STREAM-INF:BANDWIDTH=1242703,CODECS="avc1.64001e,ac-3",RESOLUTION=640x360,AUDIO="default-audio-group"
+#EXT-X-STREAM-INF:BANDWIDTH=1242861,CODECS="avc1.64001e,ac-3",RESOLUTION=640x360,AUDIO="default-audio-group"
 bear-640x360-ac3-video.m3u8
 
 #EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=238897,CODECS="avc1.64001e",RESOLUTION=640x360,URI="bear-640x360-ac3-video-iframe.m3u8"
diff --git a/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio-1.ts b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio-1.ts
diff --git a/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio-2.ts b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio-2.ts
diff --git a/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio-3.ts b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio-3.ts
diff --git a/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio.m3u8 b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio.m3u8
@@ -3,9 +3,9 @@
 ## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
 #EXT-X-TARGETDURATION:2
 #EXT-X-PLAYLIST-TYPE:EVENT
-#EXTINF:0.952,
+#EXTINF:0.975,
 bear-640x360-audio-1.ts
 #EXTINF:0.998,
 bear-640x360-audio-2.ts
-#EXTINF:0.813,
+#EXTINF:0.789,
 bear-640x360-audio-3.ts
diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio-1.ts b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio-1.ts
diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio-2.ts b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio-2.ts
diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio-3.ts b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio-3.ts
diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio.m3u8 b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio.m3u8
@@ -4,9 +4,9 @@
 #EXT-X-TARGETDURATION:2
 #EXT-X-MEDIA-SEQUENCE:1
 #EXT-X-DISCONTINUITY-SEQUENCE:1
-#EXT-X-KEY:METHOD=SAMPLE-AES,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",IV=0x3334353637383930,KEYFORMAT="identity"
+#EXT-X-KEY:METHOD=SAMPLE-AES,URI="data:text/plain;base64,MjM0NTY3ODkwMTIzNDU2MQ==",IV=0x3334353637383930,KEYFORMAT="identity"
 #EXTINF:0.998,
 bear-640x360-audio-2.ts
-#EXT-X-KEY:METHOD=SAMPLE-AES,URI="data:text/plain;base64,MjM0NTY3ODkwMTIzNDU2MQ==",IV=0x3334353637383930,KEYFORMAT="identity"
-#EXTINF:0.813,
+#EXT-X-KEY:METHOD=SAMPLE-AES,URI="data:text/plain;base64,MzQ1Njc4OTAxMjM0NTYxMg==",IV=0x3334353637383930,KEYFORMAT="identity"
+#EXTINF:0.789,
 bear-640x360-audio-3.ts
diff --git a/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio-1.ts b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio-1.ts
diff --git a/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio-2.ts b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio-2.ts
diff --git a/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio-3.ts b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio-3.ts
diff --git a/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio.m3u8 b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio.m3u8
@@ -5,5 +5,5 @@
 #EXT-X-MEDIA-SEQUENCE:1
 #EXTINF:0.998,
 bear-640x360-audio-2.ts
-#EXTINF:0.813,
+#EXTINF:0.789,
 bear-640x360-audio-3.ts
diff --git a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio-1.ts b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio-1.ts
diff --git a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio-2.ts b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio-2.ts
diff --git a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio-3.ts b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio-3.ts
diff --git a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio.m3u8 b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio.m3u8
@@ -3,12 +3,12 @@
 ## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
 #EXT-X-TARGETDURATION:2
 #EXT-X-PLAYLIST-TYPE:VOD
-#EXTINF:0.952,
+#EXTINF:0.975,
 bear-640x360-audio-1.ts
 #EXT-X-DISCONTINUITY
 #EXT-X-KEY:METHOD=SAMPLE-AES,URI="skd://www.license.com/getkey?KeyId=31323334-3536-3738-3930-313233343536",KEYFORMATVERSIONS="1",KEYFORMAT="com.apple.streamingkeydelivery"
 #EXTINF:0.998,
 bear-640x360-audio-2.ts
-#EXTINF:0.813,
+#EXTINF:0.789,
 bear-640x360-audio-3.ts
 #EXT-X-ENDLIST
diff --git a/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio-1.ts b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio-1.ts
diff --git a/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio-2.ts b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio-2.ts
diff --git a/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio-3.ts b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio-3.ts
diff --git a/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio.m3u8 b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio.m3u8
@@ -3,12 +3,12 @@
 ## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
 #EXT-X-TARGETDURATION:2
 #EXT-X-PLAYLIST-TYPE:VOD
-#EXTINF:0.952,
+#EXTINF:0.975,
 bear-640x360-audio-1.ts
 #EXT-X-DISCONTINUITY
 #EXT-X-KEY:METHOD=SAMPLE-AES,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",IV=0x3334353637383930,KEYFORMAT="identity"
 #EXTINF:0.998,
 bear-640x360-audio-2.ts
-#EXTINF:0.813,
+#EXTINF:0.789,
 bear-640x360-audio-3.ts
 #EXT-X-ENDLIST
diff --git a/packager/app/test/testdata/bear-320x240-opus-golden.mp4 b/packager/app/test/testdata/bear-320x240-opus-golden.mp4
diff --git a/packager/app/test/testdata/bear-640x360-a-cbcs-golden.mp4 b/packager/app/test/testdata/bear-640x360-a-cbcs-golden.mp4
diff --git a/packager/app/test/testdata/bear-640x360-a-cenc-golden.mp4 b/packager/app/test/testdata/bear-640x360-a-cenc-golden.mp4
diff --git a/packager/app/test/testdata/bear-640x360-a-live-cenc-golden-1.m4s b/packager/app/test/testdata/bear-640x360-a-live-cenc-golden-1.m4s
diff --git a/packager/app/test/testdata/bear-640x360-a-live-cenc-golden-2.m4s b/packager/app/test/testdata/bear-640x360-a-live-cenc-golden-2.m4s
diff --git a/packager/app/test/testdata/bear-640x360-a-live-cenc-golden-3.m4s b/packager/app/test/testdata/bear-640x360-a-live-cenc-golden-3.m4s
diff --git a/packager/app/test/testdata/bear-640x360-av-cenc-golden.mpd b/packager/app/test/testdata/bear-640x360-av-cenc-golden.mpd
@@ -19,7 +19,7 @@
       <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
         <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
       </ContentProtection>
-      <Representation id="1" bandwidth="129185" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
+      <Representation id="1" bandwidth="129162" 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="967-1034" timescale="44100">

diff --git a/packager/app/test/testdata/bear-640x360-av-cenc-non-iop-golden.mpd b/packager/app/test/testdata/bear-640x360-av-cenc-non-iop-golden.mpd
@@ -15,7 +15,7 @@
       </Representation>
     </AdaptationSet>
     <AdaptationSet id="1" contentType="audio" subsegmentAlignment="true">
-      <Representation id="1" bandwidth="129185" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
+      <Representation id="1" bandwidth="129162" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
         <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
         <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="31323334-3536-3738-3930-313233343536"/>
         <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">

diff --git a/...er/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-audio.m3u8 b/...er/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-audio.m3u8
@@ -8,10 +8,10 @@
 #EXTINF:1.010,
 #EXT-X-BYTERANGE:24460@977
 bear-640x360-ec3-audio.mp4
-#EXTINF:0.975,
-#EXT-X-BYTERANGE:23899
+#EXTINF:1.010,
+#EXT-X-BYTERANGE:24747
 bear-640x360-ec3-audio.mp4
-#EXTINF:0.766,
-#EXT-X-BYTERANGE:18811
+#EXTINF:0.731,
+#EXT-X-BYTERANGE:17963
 bear-640x360-ec3-audio.mp4
 #EXT-X-ENDLIST
diff --git a/...ger/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-audio.mp4 b/...ger/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-audio.mp4
diff --git a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/output.m3u8 b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/output.m3u8
@@ -3,7 +3,7 @@
 
 #EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-ec3-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
 
-#EXT-X-STREAM-INF:BANDWIDTH=1174135,CODECS="avc1.64001e,ec-3",RESOLUTION=640x360,AUDIO="default-audio-group"
+#EXT-X-STREAM-INF:BANDWIDTH=1174212,CODECS="avc1.64001e,ec-3",RESOLUTION=640x360,AUDIO="default-audio-group"
 bear-640x360-ec3-video.m3u8
 
 #EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=218704,CODECS="avc1.64001e",RESOLUTION=640x360,URI="bear-640x360-ec3-video-iframe.m3u8"
diff --git a/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-audio.mp4
diff --git a/packager/app/test/testdata/encryption-and-ad-cues/output.mpd b/packager/app/test/testdata/encryption-and-ad-cues/output.mpd
@@ -2,55 +2,55 @@
 <!--Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>-->
 <MPD xmlns="urn:mpeg:dash:schema:mpd:2011" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="urn:mpeg:dash:schema:mpd:2011 DASH-MPD.xsd" xmlns:cenc="urn:mpeg:cenc:2013" profiles="urn:mpeg:dash:profile:isoff-on-demand:2011" minBufferTime="PT2S" type="static" mediaPresentationDuration="PT2.73607S">
   <Period id="0" duration="PT2.002S">
-    <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" subsegmentAlignment="true" par="16:9">
+    <AdaptationSet id="0" contentType="audio" subsegmentAlignment="true">
       <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="31323334-3536-3738-3930-313233343536"/>
       <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
         <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
       </ContentProtection>
-      <Representation id="0" bandwidth="885590" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
-        <BaseURL>bear-640x360-video.mp4</BaseURL>
-        <SegmentBase indexRange="1091-1158" timescale="30000">
-          <Initialization range="0-1090"/>
+      <Representation id="0" bandwidth="129651" 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="967-1046" timescale="44100">
+          <Initialization range="0-966"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>
-    <AdaptationSet id="1" contentType="audio" subsegmentAlignment="true">
+    <AdaptationSet id="1" contentType="video" width="640" height="360" frameRate="30000/1001" subsegmentAlignment="true" par="16:9">
       <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="31323334-3536-3738-3930-313233343536"/>
       <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
         <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
       </ContentProtection>
-      <Representation id="1" bandwidth="129185" 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="967-1034" timescale="44100">
-          <Initialization range="0-966"/>
+      <Representation id="1" bandwidth="885590" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
+        <BaseURL>bear-640x360-video.mp4</BaseURL>
+        <SegmentBase indexRange="1091-1158" timescale="30000">
+          <Initialization range="0-1090"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>
   </Period>
   <Period id="1" duration="PT0.734067S">
-    <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" subsegmentAlignment="true" par="16:9">
+    <AdaptationSet id="0" contentType="audio" subsegmentAlignment="true">
       <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="31323334-3536-3738-3930-313233343536"/>
       <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
         <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
       </ContentProtection>
-      <Representation id="0" bandwidth="885590" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
-        <BaseURL>bear-640x360-video.mp4</BaseURL>
-        <SegmentBase indexRange="1091-1158" timescale="30000" presentationTimeOffset="62061">
-          <Initialization range="0-1090"/>
+      <Representation id="0" bandwidth="129651" 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="967-1046" timescale="44100" presentationTimeOffset="91230">
+          <Initialization range="0-966"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>
-    <AdaptationSet id="1" contentType="audio" subsegmentAlignment="true">
+    <AdaptationSet id="1" contentType="video" width="640" height="360" frameRate="30000/1001" subsegmentAlignment="true" par="16:9">
       <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="31323334-3536-3738-3930-313233343536"/>
       <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
         <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
       </ContentProtection>
-      <Representation id="1" bandwidth="129185" 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="967-1034" timescale="44100" presentationTimeOffset="91230">
-          <Initialization range="0-966"/>
+      <Representation id="1" bandwidth="885590" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
+        <BaseURL>bear-640x360-video.mp4</BaseURL>
+        <SegmentBase indexRange="1091-1158" timescale="30000" presentationTimeOffset="62061">
+          <Initialization range="0-1090"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>

diff --git a/packager/app/test/testdata/encryption-and-no-clear-lead/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-and-no-clear-lead/bear-640x360-audio.mp4
diff --git a/packager/app/test/testdata/encryption-and-no-pssh-in-stream/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-and-no-pssh-in-stream/bear-640x360-audio.mp4
diff --git a/packager/app/test/testdata/encryption-and-no-pssh-in-stream/output.mpd b/packager/app/test/testdata/encryption-and-no-pssh-in-stream/output.mpd
@@ -19,7 +19,7 @@
       <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
         <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
       </ContentProtection>
-      <Representation id="1" bandwidth="129035" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
+      <Representation id="1" bandwidth="129012" 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="915-982" timescale="44100">

diff --git a/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-audio.mp4
diff --git a/...ager/app/test/testdata/encryption-and-output-media-info/bear-640x360-audio.mp4.media_info b/...ager/app/test/testdata/encryption-and-output-media-info/bear-640x360-audio.mp4.media_info
@@ -1,4 +1,4 @@
-bandwidth: 129185
+bandwidth: 129162
 audio_info {
   codec: "mp4a.40.2"
   sampling_frequency: 44100

diff --git a/packager/app/test/testdata/encryption-and-trick-play/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-and-trick-play/bear-640x360-audio.mp4
diff --git a/packager/app/test/testdata/encryption-and-trick-play/output.mpd b/packager/app/test/testdata/encryption-and-trick-play/output.mpd
@@ -32,7 +32,7 @@
       <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
         <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
       </ContentProtection>
-      <Representation id="2" bandwidth="129185" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
+      <Representation id="2" bandwidth="129162" 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="967-1034" timescale="44100">

diff --git a/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-and-two-trick-plays/bear-640x360-audio.mp4
diff --git a/packager/app/test/testdata/encryption-and-two-trick-plays/output.mpd b/packager/app/test/testdata/encryption-and-two-trick-plays/output.mpd
@@ -38,7 +38,7 @@
       <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
         <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
       </ContentProtection>
-      <Representation id="3" bandwidth="129185" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
+      <Representation id="3" bandwidth="129162" 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="967-1034" timescale="44100">

diff --git a/packager/app/test/testdata/encryption-cbc-1/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-cbc-1/bear-640x360-audio.mp4
diff --git a/packager/app/test/testdata/encryption-cbc-1/output.mpd b/packager/app/test/testdata/encryption-cbc-1/output.mpd
@@ -19,7 +19,7 @@
       <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
         <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
       </ContentProtection>
-      <Representation id="1" bandwidth="129185" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
+      <Representation id="1" bandwidth="129162" 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="967-1034" timescale="44100">

diff --git a/packager/app/test/testdata/encryption-cens/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-cens/bear-640x360-audio.mp4
diff --git a/packager/app/test/testdata/encryption-cens/output.mpd b/packager/app/test/testdata/encryption-cens/output.mpd
@@ -19,7 +19,7 @@
       <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
         <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
       </ContentProtection>
-      <Representation id="1" bandwidth="129185" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
+      <Representation id="1" bandwidth="129162" 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="967-1034" timescale="44100">

diff --git a/packager/app/test/testdata/encryption-multi-keys-with-stream-label/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-multi-keys-with-stream-label/bear-640x360-audio.mp4
diff --git a/packager/app/test/testdata/encryption-multi-keys-with-stream-label/output.mpd b/packager/app/test/testdata/encryption-multi-keys-with-stream-label/output.mpd
@@ -19,7 +19,7 @@
       <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
         <cenc:pssh>AAAARHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAIQERITFBUWFxgZICEiIyQlICEiIyQlJicoKTAxMjM0NQAAAAA=</cenc:pssh>
       </ContentProtection>
-      <Representation id="1" bandwidth="129232" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
+      <Representation id="1" bandwidth="129208" 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="983-1050" timescale="44100">

diff --git a/packager/app/test/testdata/encryption-multi-keys/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-multi-keys/bear-640x360-audio.mp4
diff --git a/packager/app/test/testdata/encryption-multi-keys/output.mpd b/packager/app/test/testdata/encryption-multi-keys/output.mpd
@@ -19,7 +19,7 @@
       <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
         <cenc:pssh>AAAARHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAIQERITFBUWFxgZICEiIyQlICEiIyQlJicoKTAxMjM0NQAAAAA=</cenc:pssh>
       </ContentProtection>
-      <Representation id="1" bandwidth="129232" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
+      <Representation id="1" bandwidth="129208" 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="983-1050" timescale="44100">

diff --git a/.../app/test/testdata/encryption-of-only-video-stream/bear-640x360-audio-skip_encryption.mp4 b/.../app/test/testdata/encryption-of-only-video-stream/bear-640x360-audio-skip_encryption.mp4
diff --git a/packager/app/test/testdata/encryption-using-fixed-key/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption-using-fixed-key/bear-640x360-audio.mp4
diff --git a/packager/app/test/testdata/encryption-using-fixed-key/output.mpd b/packager/app/test/testdata/encryption-using-fixed-key/output.mpd
@@ -19,7 +19,7 @@
       <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
         <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
       </ContentProtection>
-      <Representation id="1" bandwidth="129185" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
+      <Representation id="1" bandwidth="129162" 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="967-1034" timescale="44100">

diff --git a/packager/app/test/testdata/encryption/bear-640x360-audio.mp4 b/packager/app/test/testdata/encryption/bear-640x360-audio.mp4
diff --git a/packager/app/test/testdata/encryption/output.mpd b/packager/app/test/testdata/encryption/output.mpd
@@ -19,7 +19,7 @@
       <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
         <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
       </ContentProtection>
-      <Representation id="1" bandwidth="129185" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
+      <Representation id="1" bandwidth="129162" 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="967-1034" timescale="44100">

diff --git a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio-1.m4s b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio-1.m4s
diff --git a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio-2.m4s b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio-2.m4s
diff --git a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio-3.m4s b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio-3.m4s
diff --git a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio.m3u8 b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/audio/audio.m3u8
@@ -4,10 +4,10 @@
 #EXT-X-TARGETDURATION:2
 #EXT-X-PLAYLIST-TYPE:VOD
 #EXT-X-MAP:URI="audio-init.mp4"
-#EXTINF:0.998,
+#EXTINF:1.022,
 audio-1.m4s
 #EXTINF:0.998,
 audio-2.m4s
-#EXTINF:0.766,
+#EXTINF:0.743,
 audio-3.m4s
 #EXT-X-ENDLIST
diff --git a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/output.m3u8 b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/output.m3u8
@@ -3,5 +3,5 @@
 
 #EXT-X-MEDIA:TYPE=AUDIO,URI="audio/audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
 
-#EXT-X-STREAM-INF:BANDWIDTH=1105163,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group"
+#EXT-X-STREAM-INF:BANDWIDTH=1105129,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group"
 video/video.m3u8
diff --git a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-1.m4s b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-1.m4s
diff --git a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-2.m4s b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-2.m4s
diff --git a/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-3.m4s b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-3.m4s