Add support for EditLists in ISO-BMFF

- EditLists in input files are parsed and applied to sample timestamps.
- An EditList will be inserted in the ISO-BMFF output if
  - There is an offset between the initial presentation timestamp (pts)
    and decoding timestamp (dts). Chrome, as of M67, still uses dts in
    buffered range API [1], which creates various problems when buffered
    range by pts does not align with buffered range by dts. There is
    another bug in Chrome that applies EditList to pts only [2]. This
    means that we can insert an EditList to align pts range and dts range.
  - MediaSamples have negative timestamps (e.g. for Audio Priming).

You may notice the below change on some contents:
- Some media duration is reduced by one or two frames. This is because
  EditList in the input file was ignored in the previous code, so video
  streams start with a zero dts and a non-zero pts; the smaller of dts
  and pts was used as the starting timestamp (related to the earlier
  workaround for Chrome's dts bug), so the calculated duration was
  actually a bit larger than the actual duration. Now with EditList
  applied, the initial pts is reduced to zero, so the media duration is
  also reduced to reflect the actual and correct media duration.

It may also result in negative timestamps in TS/HLS Packed Audio, which
will be addressed in a follow up CL.

Fixes #112.
Partially address b/110782437.

[1] https://crbug.com/718641, fixed but behind MseBufferByPts.
[2] https://crbug.com/354518. Chrome is planning to enable the fix for
    [1] before addressing this bug, so we are safe.

Change-Id: I59317740ad3807ca66fa74b3a18fdf7f32c96aeb

packager/app/test/testdata/acc-he/output.mpd

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--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.877868413925171S">
+<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.763174533843994S">
   <Period id="0">
     <AdaptationSet id="0" contentType="audio" subsegmentAlignment="true">
-      <Representation id="0" bandwidth="66777" codecs="mp4a.40.5" mimeType="audio/mp4" audioSamplingRate="44100">
+      <Representation id="0" bandwidth="73677" codecs="mp4a.40.5" mimeType="audio/mp4" audioSamplingRate="44100">
         <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
         <BaseURL>bear-640x360-aac_he-silent_right-audio.mp4</BaseURL>
-        <SegmentBase indexRange="756-823" timescale="44100">
+        <SegmentBase indexRange="792-859" timescale="44100">
-          <Initialization range="0-755"/>
+          <Initialization range="0-791"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>

packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-audio.m3u8

@@ -3,14 +3,14 @@
 ## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
 #EXT-X-TARGETDURATION:2
 #EXT-X-PLAYLIST-TYPE:VOD
-#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="757@0"
+#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="793@0"
 #EXTINF:1.022,
-#EXT-X-BYTERANGE:16655@825
+#EXT-X-BYTERANGE:17028@861
 bear-640x360-audio.mp4
 #EXTINF:0.998,
-#EXT-X-BYTERANGE:16253
+#EXT-X-BYTERANGE:16285
 bear-640x360-audio.mp4
-#EXTINF:0.743,
+#EXTINF:0.720,
-#EXT-X-BYTERANGE:9963
+#EXT-X-BYTERANGE:9558
 bear-640x360-audio.mp4
 #EXT-X-ENDLIST

packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video-iframe.m3u8

@@ -4,14 +4,14 @@
 #EXT-X-TARGETDURATION:2
 #EXT-X-PLAYLIST-TYPE:VOD
 #EXT-X-I-FRAMES-ONLY
-#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="823@0"
+#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="859@0"
 #EXTINF:1.001,
-#EXT-X-BYTERANGE:15581@891
+#EXT-X-BYTERANGE:15581@927
 bear-640x360-video.mp4
 #EXTINF:1.001,
-#EXT-X-BYTERANGE:18221@100204
+#EXT-X-BYTERANGE:18221@100240
 bear-640x360-video.mp4
 #EXTINF:0.734,
-#EXT-X-BYTERANGE:19663@222011
+#EXT-X-BYTERANGE:19663@222047
 bear-640x360-video.mp4
 #EXT-X-ENDLIST

packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video.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:VOD
-#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="823@0"
+#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="859@0"
-#EXTINF:1.068,
+#EXTINF:1.001,
-#EXT-X-BYTERANGE:99313@891
+#EXT-X-BYTERANGE:99313@927
 bear-640x360-video.mp4
 #EXTINF:1.001,
 #EXT-X-BYTERANGE:121807

packager/app/test/testdata/audio-video-with-language-override-with-subtag/output.m3u8

@@ -3,7 +3,7 @@
 
 #EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",LANGUAGE="pt-BR",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
 
-#EXT-X-STREAM-INF:BANDWIDTH=1103896,AVERAGE-BANDWIDTH=982641,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group"
+#EXT-X-STREAM-INF:BANDWIDTH=1106817,AVERAGE-BANDWIDTH=1004632,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group"
 bear-640x360-video.m3u8
 
 #EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=214292,AVERAGE-BANDWIDTH=156327,CODECS="avc1.64001e",RESOLUTION=640x360,URI="bear-640x360-video-iframe.m3u8"

packager/app/test/testdata/audio-video-with-language-override-with-subtag/output.mpd

@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--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.802799940109253S">
+<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.7360665798187256S">
   <Period id="0">
     <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" subsegmentAlignment="true" par="16:9">
       <Representation id="0" bandwidth="973483" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
         <BaseURL>bear-640x360-video.mp4</BaseURL>
-        <SegmentBase indexRange="823-890" timescale="30000">
+        <SegmentBase indexRange="859-926" timescale="30000">
-          <Initialization range="0-822"/>
+          <Initialization range="0-858"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>
     <AdaptationSet id="1" contentType="audio" lang="pt-BR" subsegmentAlignment="true">
-      <Representation id="1" bandwidth="130413" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
+      <Representation id="1" 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="757-824" timescale="44100">
+        <SegmentBase indexRange="793-860" timescale="44100">
-          <Initialization range="0-756"/>
+          <Initialization range="0-792"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>

packager/app/test/testdata/audio-video-with-language-override/bear-640x360-audio.m3u8

@@ -3,14 +3,14 @@
 ## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
 #EXT-X-TARGETDURATION:2
 #EXT-X-PLAYLIST-TYPE:VOD
-#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="757@0"
+#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="793@0"
 #EXTINF:1.022,
-#EXT-X-BYTERANGE:16655@825
+#EXT-X-BYTERANGE:17028@861
 bear-640x360-audio.mp4
 #EXTINF:0.998,
-#EXT-X-BYTERANGE:16253
+#EXT-X-BYTERANGE:16285
 bear-640x360-audio.mp4
-#EXTINF:0.743,
+#EXTINF:0.720,
-#EXT-X-BYTERANGE:9963
+#EXT-X-BYTERANGE:9558
 bear-640x360-audio.mp4
 #EXT-X-ENDLIST

packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video-iframe.m3u8

@@ -4,14 +4,14 @@
 #EXT-X-TARGETDURATION:2
 #EXT-X-PLAYLIST-TYPE:VOD
 #EXT-X-I-FRAMES-ONLY
-#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="823@0"
+#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="859@0"
 #EXTINF:1.001,
-#EXT-X-BYTERANGE:15581@891
+#EXT-X-BYTERANGE:15581@927
 bear-640x360-video.mp4
 #EXTINF:1.001,
-#EXT-X-BYTERANGE:18221@100204
+#EXT-X-BYTERANGE:18221@100240
 bear-640x360-video.mp4
 #EXTINF:0.734,
-#EXT-X-BYTERANGE:19663@222011
+#EXT-X-BYTERANGE:19663@222047
 bear-640x360-video.mp4
 #EXT-X-ENDLIST

packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video.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:VOD
-#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="823@0"
+#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="859@0"
-#EXTINF:1.068,
+#EXTINF:1.001,
-#EXT-X-BYTERANGE:99313@891
+#EXT-X-BYTERANGE:99313@927
 bear-640x360-video.mp4
 #EXTINF:1.001,
 #EXT-X-BYTERANGE:121807

packager/app/test/testdata/audio-video-with-language-override/output.m3u8

@@ -3,7 +3,7 @@
 
 #EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",LANGUAGE="pt",NAME="stream_0",DEFAULT=YES,AUTOSELECT=YES,CHANNELS="2"
 
-#EXT-X-STREAM-INF:BANDWIDTH=1103896,AVERAGE-BANDWIDTH=982641,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group"
+#EXT-X-STREAM-INF:BANDWIDTH=1106817,AVERAGE-BANDWIDTH=1004632,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group"
 bear-640x360-video.m3u8
 
 #EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=214292,AVERAGE-BANDWIDTH=156327,CODECS="avc1.64001e",RESOLUTION=640x360,URI="bear-640x360-video-iframe.m3u8"

packager/app/test/testdata/audio-video-with-language-override/output.mpd

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--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.802799940109253S">
+<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.7360665798187256S">
   <Period id="0">
     <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" subsegmentAlignment="true" par="16:9">
       <Representation id="0" bandwidth="973483" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
         <BaseURL>bear-640x360-video.mp4</BaseURL>
-        <SegmentBase indexRange="823-890" timescale="30000">
+        <SegmentBase indexRange="859-926" timescale="30000">
-          <Initialization range="0-822"/>
+          <Initialization range="0-858"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>
     <AdaptationSet id="1" contentType="audio" lang="pt" subsegmentAlignment="true">
       <Role schemeIdUri="urn:mpeg:dash:role:2011" value="main"/>
-      <Representation id="1" bandwidth="130413" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
+      <Representation id="1" 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="757-824" timescale="44100">
+        <SegmentBase indexRange="793-860" timescale="44100">
-          <Initialization range="0-756"/>
+          <Initialization range="0-792"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>

packager/app/test/testdata/audio-video-with-trick-play/output.mpd

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--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.802799940109253S">
+<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.7360665798187256S">
   <Period id="0">
     <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" subsegmentAlignment="true" par="16:9">
       <Representation id="0" bandwidth="973483" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
         <BaseURL>bear-640x360-video.mp4</BaseURL>
-        <SegmentBase indexRange="823-890" timescale="30000">
+        <SegmentBase indexRange="859-926" timescale="30000">
-          <Initialization range="0-822"/>
+          <Initialization range="0-858"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>
@@ -14,17 +14,17 @@
       <EssentialProperty schemeIdUri="http://dashif.org/guidelines/trickmode" value="0"/>
       <Representation id="1" bandwidth="211545" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1" maxPlayoutRate="30" codingDependency="false">
         <BaseURL>bear-640x360-video-trick_play_factor_1.mp4</BaseURL>
-        <SegmentBase indexRange="823-890" timescale="30000">
+        <SegmentBase indexRange="859-926" timescale="30000">
-          <Initialization range="0-822"/>
+          <Initialization range="0-858"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>
     <AdaptationSet id="2" contentType="audio" subsegmentAlignment="true">
-      <Representation id="2" bandwidth="130413" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
+      <Representation id="2" 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="757-824" timescale="44100">
+        <SegmentBase indexRange="793-860" timescale="44100">
-          <Initialization range="0-756"/>
+          <Initialization range="0-792"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>

packager/app/test/testdata/audio-video-with-two-trick-play/output.mpd

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--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.802799940109253S">
+<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.7360665798187256S">
   <Period id="0">
     <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" subsegmentAlignment="true" par="16:9">
       <Representation id="0" bandwidth="973483" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
         <BaseURL>bear-640x360-video.mp4</BaseURL>
-        <SegmentBase indexRange="823-890" timescale="30000">
+        <SegmentBase indexRange="859-926" timescale="30000">
-          <Initialization range="0-822"/>
+          <Initialization range="0-858"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>
@@ -14,23 +14,23 @@
       <EssentialProperty schemeIdUri="http://dashif.org/guidelines/trickmode" value="0"/>
       <Representation id="1" bandwidth="211545" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1" frameRate="30000/60060" maxPlayoutRate="60" codingDependency="false">
         <BaseURL>bear-640x360-video-trick_play_factor_2.mp4</BaseURL>
-        <SegmentBase indexRange="823-878" timescale="30000">
+        <SegmentBase indexRange="859-914" timescale="30000">
-          <Initialization range="0-822"/>
+          <Initialization range="0-858"/>
         </SegmentBase>
       </Representation>
       <Representation id="2" bandwidth="211545" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1" frameRate="30000/30030" maxPlayoutRate="30" codingDependency="false">
         <BaseURL>bear-640x360-video-trick_play_factor_1.mp4</BaseURL>
-        <SegmentBase indexRange="823-890" timescale="30000">
+        <SegmentBase indexRange="859-926" timescale="30000">
-          <Initialization range="0-822"/>
+          <Initialization range="0-858"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>
     <AdaptationSet id="2" contentType="audio" subsegmentAlignment="true">
-      <Representation id="3" bandwidth="130413" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
+      <Representation id="3" 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="757-824" timescale="44100">
+        <SegmentBase indexRange="793-860" timescale="44100">
-          <Initialization range="0-756"/>
+          <Initialization range="0-792"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>

packager/app/test/testdata/audio-video/output.mpd

@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--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.802799940109253S">
+<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.7360665798187256S">
   <Period id="0">
     <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" subsegmentAlignment="true" par="16:9">
       <Representation id="0" bandwidth="973483" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
         <BaseURL>bear-640x360-video.mp4</BaseURL>
-        <SegmentBase indexRange="823-890" timescale="30000">
+        <SegmentBase indexRange="859-926" timescale="30000">
-          <Initialization range="0-822"/>
+          <Initialization range="0-858"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>
     <AdaptationSet id="1" contentType="audio" subsegmentAlignment="true">
-      <Representation id="1" bandwidth="130413" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
+      <Representation id="1" 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="757-824" timescale="44100">
+        <SegmentBase indexRange="793-860" timescale="44100">
-          <Initialization range="0-756"/>
+          <Initialization range="0-792"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>

packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video-iframe.m3u8

@@ -4,14 +4,14 @@
 #EXT-X-TARGETDURATION:2
 #EXT-X-PLAYLIST-TYPE:VOD
 #EXT-X-I-FRAMES-ONLY
-#EXT-X-MAP:URI="bear-640x360-ac3-video.mp4",BYTERANGE="823@0"
+#EXT-X-MAP:URI="bear-640x360-ac3-video.mp4",BYTERANGE="859@0"
 #EXTINF:1.001,
-#EXT-X-BYTERANGE:15581@891
+#EXT-X-BYTERANGE:15581@927
 bear-640x360-ac3-video.mp4
 #EXTINF:1.001,
-#EXT-X-BYTERANGE:18221@100204
+#EXT-X-BYTERANGE:18221@100240
 bear-640x360-ac3-video.mp4
 #EXTINF:0.734,
-#EXT-X-BYTERANGE:19663@222011
+#EXT-X-BYTERANGE:19663@222047
 bear-640x360-ac3-video.mp4
 #EXT-X-ENDLIST

packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video.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:VOD
-#EXT-X-MAP:URI="bear-640x360-ac3-video.mp4",BYTERANGE="823@0"
+#EXT-X-MAP:URI="bear-640x360-ac3-video.mp4",BYTERANGE="859@0"
-#EXTINF:1.068,
+#EXTINF:1.001,
-#EXT-X-BYTERANGE:99313@891
+#EXT-X-BYTERANGE:99313@927
 bear-640x360-ac3-video.mp4
 #EXTINF:1.001,
 #EXT-X-BYTERANGE:121807

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=1168321,AVERAGE-BANDWIDTH=1053216,CODECS="avc1.64001e,ac-3",RESOLUTION=640x360,AUDIO="default-audio-group"
+#EXT-X-STREAM-INF:BANDWIDTH=1168321,AVERAGE-BANDWIDTH=1074156,CODECS="avc1.64001e,ac-3",RESOLUTION=640x360,AUDIO="default-audio-group"
 bear-640x360-ac3-video.m3u8
 
 #EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=214292,AVERAGE-BANDWIDTH=156327,CODECS="avc1.64001e",RESOLUTION=640x360,URI="bear-640x360-ac3-video-iframe.m3u8"

packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/output.m3u8

@@ -1,7 +1,7 @@
 #EXTM3U
 ## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
 
-#EXT-X-STREAM-INF:BANDWIDTH=1183949,AVERAGE-BANDWIDTH=390289,CODECS="avc1.64001f",RESOLUTION=1024x436
+#EXT-X-STREAM-INF:BANDWIDTH=1183949,AVERAGE-BANDWIDTH=390288,CODECS="avc1.64001f",RESOLUTION=1024x436
 sintel-1024x436-video.m3u8
 
 #EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=447591,AVERAGE-BANDWIDTH=40358,CODECS="avc1.64001f",RESOLUTION=1024x436,URI="sintel-1024x436-video-iframe.m3u8"

packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-iframe.m3u8

@@ -16,10 +16,10 @@ sintel-1024x436-video-2.ts
 #EXT-X-BYTERANGE:376@376
 sintel-1024x436-video-3.ts
 #EXTINF:0.958,
-#EXT-X-BYTERANGE:376@376
+#EXT-X-BYTERANGE:376@4700
-sintel-1024x436-video-4.ts
+sintel-1024x436-video-3.ts
 #EXTINF:0.917,
-#EXT-X-BYTERANGE:5452@41924
+#EXT-X-BYTERANGE:5452@376
 sintel-1024x436-video-4.ts
 #EXTINF:1.000,
 #EXT-X-BYTERANGE:11092@376

packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video.m3u8

@@ -9,9 +9,9 @@ sintel-1024x436-video-1.ts
 #EXT-X-KEY:METHOD=SAMPLE-AES,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",IV=0x3334353637383930,KEYFORMAT="identity"
 #EXTINF:1.000,
 sintel-1024x436-video-2.ts
-#EXTINF:0.917,
-sintel-1024x436-video-3.ts
 #EXTINF:1.875,
+sintel-1024x436-video-3.ts
+#EXTINF:0.917,
 sintel-1024x436-video-4.ts
 #EXTINF:1.000,
 sintel-1024x436-video-5.ts

packager/app/test/testdata/bandwidth-override/bear-640x360-audio.m3u8

@@ -3,14 +3,14 @@
 ## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
 #EXT-X-TARGETDURATION:2
 #EXT-X-PLAYLIST-TYPE:VOD
-#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="757@0"
+#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="793@0"
 #EXTINF:1.022,
-#EXT-X-BYTERANGE:16655@825
+#EXT-X-BYTERANGE:17028@861
 bear-640x360-audio.mp4
 #EXTINF:0.998,
-#EXT-X-BYTERANGE:16253
+#EXT-X-BYTERANGE:16285
 bear-640x360-audio.mp4
-#EXTINF:0.743,
+#EXTINF:0.720,
-#EXT-X-BYTERANGE:9963
+#EXT-X-BYTERANGE:9558
 bear-640x360-audio.mp4
 #EXT-X-ENDLIST

packager/app/test/testdata/bandwidth-override/bear-640x360-video-iframe.m3u8

@@ -4,14 +4,14 @@
 #EXT-X-TARGETDURATION:2
 #EXT-X-PLAYLIST-TYPE:VOD
 #EXT-X-I-FRAMES-ONLY
-#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="823@0"
+#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="859@0"
 #EXTINF:1.001,
-#EXT-X-BYTERANGE:15581@891
+#EXT-X-BYTERANGE:15581@927
 bear-640x360-video.mp4
 #EXTINF:1.001,
-#EXT-X-BYTERANGE:18221@100204
+#EXT-X-BYTERANGE:18221@100240
 bear-640x360-video.mp4
 #EXTINF:0.734,
-#EXT-X-BYTERANGE:19663@222011
+#EXT-X-BYTERANGE:19663@222047
 bear-640x360-video.mp4
 #EXT-X-ENDLIST

packager/app/test/testdata/bandwidth-override/bear-640x360-video.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:VOD
-#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="823@0"
+#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="859@0"
-#EXTINF:1.068,
+#EXTINF:1.001,
-#EXT-X-BYTERANGE:99313@891
+#EXT-X-BYTERANGE:99313@927
 bear-640x360-video.mp4
 #EXTINF:1.001,
 #EXT-X-BYTERANGE:121807

packager/app/test/testdata/bandwidth-override/output.m3u8

@@ -3,7 +3,7 @@
 
 #EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
 
-#EXT-X-STREAM-INF:BANDWIDTH=55555,AVERAGE-BANDWIDTH=982641,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group"
+#EXT-X-STREAM-INF:BANDWIDTH=55555,AVERAGE-BANDWIDTH=1004632,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group"
 bear-640x360-video.m3u8
 
 #EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=44444,AVERAGE-BANDWIDTH=156327,CODECS="avc1.64001e",RESOLUTION=640x360,URI="bear-640x360-video-iframe.m3u8"

packager/app/test/testdata/bandwidth-override/output.mpd

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--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.802799940109253S">
+<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.7360665798187256S">
   <Period id="0">
     <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" subsegmentAlignment="true" par="16:9">
       <Representation id="0" bandwidth="44444" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
         <BaseURL>bear-640x360-video.mp4</BaseURL>
-        <SegmentBase indexRange="823-890" timescale="30000">
+        <SegmentBase indexRange="859-926" timescale="30000">
-          <Initialization range="0-822"/>
+          <Initialization range="0-858"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>
@@ -14,8 +14,8 @@
       <Representation id="1" bandwidth="11111" 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="757-824" timescale="44100">
+        <SegmentBase indexRange="793-860" timescale="44100">
-          <Initialization range="0-756"/>
+          <Initialization range="0-792"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>

packager/app/test/testdata/bear-640x360-av-cenc-golden.mpd

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--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.7360665798187256S">
+  <Period id="0">
+    <AdaptationSet id="0" 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="0" bandwidth="977743" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
+        <BaseURL>bear-640x360-video.mp4</BaseURL>
+        <SegmentBase indexRange="1127-1194" timescale="30000">
+          <Initialization range="0-1126"/>
+        </SegmentBase>
+      </Representation>
+    </AdaptationSet>
+    <AdaptationSet id="1" 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="1" bandwidth="133663" 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="1003-1070" timescale="44100">
+          <Initialization range="0-1002"/>
+        </SegmentBase>
+      </Representation>
+    </AdaptationSet>
+  </Period>
+</MPD>

packager/app/test/testdata/dash-with-bandwidth-override/output.mpd

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--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.802799940109253S">
+<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.7360665798187256S">
   <Period id="0">
     <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" subsegmentAlignment="true" par="16:9">
       <Representation id="0" bandwidth="44444" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
         <BaseURL>bear-640x360-video.mp4</BaseURL>
-        <SegmentBase indexRange="823-890" timescale="30000">
+        <SegmentBase indexRange="859-926" timescale="30000">
-          <Initialization range="0-822"/>
+          <Initialization range="0-858"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>
@@ -14,8 +14,8 @@
       <Representation id="1" bandwidth="11111" 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="757-824" timescale="44100">
+        <SegmentBase indexRange="793-860" timescale="44100">
-          <Initialization range="0-756"/>
+          <Initialization range="0-792"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>

packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-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
-#EXT-X-MAP:URI="bear-640x360-ec3-audio.mp4",BYTERANGE="909@0"
+#EXT-X-MAP:URI="bear-640x360-ec3-audio.mp4",BYTERANGE="945@0"
 #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity"
-#EXTINF:1.010,
+#EXTINF:1.004,
-#EXT-X-BYTERANGE:24460@977
+#EXT-X-BYTERANGE:24460@1013
 bear-640x360-ec3-audio.mp4
 #EXTINF:1.010,
 #EXT-X-BYTERANGE:24747

packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video-iframe.m3u8

@@ -4,15 +4,15 @@
 #EXT-X-TARGETDURATION:2
 #EXT-X-PLAYLIST-TYPE:VOD
 #EXT-X-I-FRAMES-ONLY
-#EXT-X-MAP:URI="bear-640x360-ec3-video.mp4",BYTERANGE="1091@0"
+#EXT-X-MAP:URI="bear-640x360-ec3-video.mp4",BYTERANGE="1127@0"
 #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity"
 #EXTINF:1.001,
-#EXT-X-BYTERANGE:15665@1159
+#EXT-X-BYTERANGE:15665@1195
 bear-640x360-ec3-video.mp4
 #EXTINF:1.001,
-#EXT-X-BYTERANGE:18754@94964
+#EXT-X-BYTERANGE:18754@95000
 bear-640x360-ec3-video.mp4
 #EXTINF:0.734,
-#EXT-X-BYTERANGE:20068@217304
+#EXT-X-BYTERANGE:20068@217340
 bear-640x360-ec3-video.mp4
 #EXT-X-ENDLIST

packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video.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
-#EXT-X-MAP:URI="bear-640x360-ec3-video.mp4",BYTERANGE="1091@0"
+#EXT-X-MAP:URI="bear-640x360-ec3-video.mp4",BYTERANGE="1127@0"
 #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity"
-#EXTINF:1.068,
+#EXTINF:1.001,
-#EXT-X-BYTERANGE:93805@1159
+#EXT-X-BYTERANGE:93805@1195
 bear-640x360-ec3-video.mp4
 #EXTINF:1.001,
 #EXT-X-BYTERANGE:122340

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=1174214,AVERAGE-BANDWIDTH=1040768,CODECS="avc1.64001e,ec-3",RESOLUTION=640x360,AUDIO="default-audio-group"
+#EXT-X-STREAM-INF:BANDWIDTH=1174214,AVERAGE-BANDWIDTH=1061802,CODECS="avc1.64001e,ec-3",RESOLUTION=640x360,AUDIO="default-audio-group"
 bear-640x360-ec3-video.m3u8
 
 #EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=218705,AVERAGE-BANDWIDTH=159315,CODECS="avc1.64001e",RESOLUTION=640x360,URI="bear-640x360-ec3-video-iframe.m3u8"

packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-audio.m3u8

@@ -3,20 +3,17 @@
 ## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
 #EXT-X-TARGETDURATION:2
 #EXT-X-PLAYLIST-TYPE:VOD
-#EXT-X-MAP:URI="bear-640x360-audio1.mp4",BYTERANGE="967@0"
+#EXT-X-MAP:URI="bear-640x360-audio1.mp4",BYTERANGE="1003@0"
 #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity"
 #EXTINF:1.022,
-#EXT-X-BYTERANGE:16655@1035
+#EXT-X-BYTERANGE:17028@1059
 bear-640x360-audio1.mp4
-#EXTINF:0.998,
+#EXTINF:0.975,
-#EXT-X-BYTERANGE:16650
+#EXT-X-BYTERANGE:16269
-bear-640x360-audio1.mp4
-#EXTINF:0.046,
-#EXT-X-BYTERANGE:1014
 bear-640x360-audio1.mp4
 #EXT-X-PLACEMENT-OPPORTUNITY
 #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity"
-#EXTINF:0.697,
+#EXTINF:0.743,
-#EXT-X-BYTERANGE:9415@1011
+#EXT-X-BYTERANGE:10272@1047
 bear-640x360-audio2.mp4
 #EXT-X-ENDLIST

packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video-iframe.m3u8

@@ -4,17 +4,17 @@
 #EXT-X-TARGETDURATION:2
 #EXT-X-PLAYLIST-TYPE:VOD
 #EXT-X-I-FRAMES-ONLY
-#EXT-X-MAP:URI="bear-640x360-video1.mp4",BYTERANGE="1091@0"
+#EXT-X-MAP:URI="bear-640x360-video1.mp4",BYTERANGE="1127@0"
 #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity"
 #EXTINF:1.001,
-#EXT-X-BYTERANGE:15581@1147
+#EXT-X-BYTERANGE:15581@1183
 bear-640x360-video1.mp4
 #EXTINF:1.001,
-#EXT-X-BYTERANGE:18754@100460
+#EXT-X-BYTERANGE:18754@100496
 bear-640x360-video1.mp4
 #EXT-X-PLACEMENT-OPPORTUNITY
 #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity"
 #EXTINF:0.734,
-#EXT-X-BYTERANGE:20068@1135
+#EXT-X-BYTERANGE:20068@1171
 bear-640x360-video2.mp4
 #EXT-X-ENDLIST

packager/app/test/testdata/encryption-and-ad-cues-split-content/bear-640x360-video.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
-#EXT-X-MAP:URI="bear-640x360-video1.mp4",BYTERANGE="1091@0"
+#EXT-X-MAP:URI="bear-640x360-video1.mp4",BYTERANGE="1127@0"
 #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity"
-#EXTINF:1.068,
+#EXTINF:1.001,
-#EXT-X-BYTERANGE:99313@1147
+#EXT-X-BYTERANGE:99313@1183
 bear-640x360-video1.mp4
 #EXTINF:1.001,
 #EXT-X-BYTERANGE:122340
@@ -14,6 +14,6 @@ bear-640x360-video1.mp4
 #EXT-X-PLACEMENT-OPPORTUNITY
 #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity"
 #EXTINF:0.734,
-#EXT-X-BYTERANGE:80067@1135
+#EXT-X-BYTERANGE:80067@1171
 bear-640x360-video2.mp4
 #EXT-X-ENDLIST

packager/app/test/testdata/encryption-and-ad-cues-split-content/output.m3u8

@@ -3,7 +3,7 @@
 
 #EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
 
-#EXT-X-STREAM-INF:BANDWIDTH=1152421,AVERAGE-BANDWIDTH=987816,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group"
+#EXT-X-STREAM-INF:BANDWIDTH=1111200,AVERAGE-BANDWIDTH=1009412,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group"
 bear-640x360-video.m3u8
 
 #EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=218705,AVERAGE-BANDWIDTH=159070,CODECS="avc1.64001e",RESOLUTION=640x360,URI="bear-640x360-video-iframe.m3u8"

packager/app/test/testdata/encryption-and-ad-cues-split-content/output.mpd

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--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.802799940109253S">
+<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.7360668182373047S">
-  <Period id="0" duration="PT2.0687333333333333S">
+  <Period id="0" duration="PT2.002S">
     <AdaptationSet id="0" 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">
@@ -9,8 +9,8 @@
       </ContentProtection>
       <Representation id="0" bandwidth="977743" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
         <BaseURL>bear-640x360-video1.mp4</BaseURL>
-        <SegmentBase indexRange="1091-1146" timescale="30000">
+        <SegmentBase indexRange="1127-1182" timescale="30000">
-          <Initialization range="0-1090"/>
+          <Initialization range="0-1126"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>
@@ -19,16 +19,16 @@
       <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
         <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
       </ContentProtection>
-      <Representation id="1" bandwidth="174678" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
+      <Representation id="1" bandwidth="133457" 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-audio1.mp4</BaseURL>
-        <SegmentBase indexRange="967-1034" timescale="44100">
+        <SegmentBase indexRange="1003-1058" timescale="44100">
-          <Initialization range="0-966"/>
+          <Initialization range="0-1002"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>
   </Period>
-  <Period id="1" duration="PT.7340666666666666S">
+  <Period id="1" duration="PT.7340666666666671S">
     <AdaptationSet id="0" 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">
@@ -36,8 +36,8 @@
       </ContentProtection>
       <Representation id="0" bandwidth="872586" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
         <BaseURL>bear-640x360-video2.mp4</BaseURL>
-        <SegmentBase indexRange="1091-1134" timescale="30000" presentationTimeOffset="62062">
+        <SegmentBase indexRange="1127-1170" timescale="30000" presentationTimeOffset="60059">
-          <Initialization range="0-1090"/>
+          <Initialization range="0-1126"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>
@@ -46,11 +46,11 @@
       <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
         <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
       </ContentProtection>
-      <Representation id="1" bandwidth="108126" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
+      <Representation id="1" bandwidth="110595" 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-audio2.mp4</BaseURL>
-        <SegmentBase indexRange="967-1010" timescale="44100" presentationTimeOffset="91231">
+        <SegmentBase indexRange="1003-1046" timescale="44100" presentationTimeOffset="88288">
-          <Initialization range="0-966"/>
+          <Initialization range="0-1002"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>

packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-audio.m3u8

@@ -3,19 +3,16 @@
 ## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
 #EXT-X-TARGETDURATION:2
 #EXT-X-PLAYLIST-TYPE:VOD
-#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="967@0"
+#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="1003@0"
 #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity"
 #EXTINF:1.022,
-#EXT-X-BYTERANGE:16655@1047
+#EXT-X-BYTERANGE:17028@1071
 bear-640x360-audio.mp4
-#EXTINF:0.998,
+#EXTINF:0.975,
-#EXT-X-BYTERANGE:16650
+#EXT-X-BYTERANGE:16269
-bear-640x360-audio.mp4
-#EXTINF:0.046,
-#EXT-X-BYTERANGE:1014
 bear-640x360-audio.mp4
 #EXT-X-PLACEMENT-OPPORTUNITY
-#EXTINF:0.697,
+#EXTINF:0.743,
-#EXT-X-BYTERANGE:9415
+#EXT-X-BYTERANGE:10272
 bear-640x360-audio.mp4
 #EXT-X-ENDLIST

packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video-iframe.m3u8

@@ -4,16 +4,16 @@
 #EXT-X-TARGETDURATION:2
 #EXT-X-PLAYLIST-TYPE:VOD
 #EXT-X-I-FRAMES-ONLY
-#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1091@0"
+#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1127@0"
 #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity"
 #EXTINF:1.001,
-#EXT-X-BYTERANGE:15581@1159
+#EXT-X-BYTERANGE:15581@1195
 bear-640x360-video.mp4
 #EXTINF:1.001,
-#EXT-X-BYTERANGE:18754@100472
+#EXT-X-BYTERANGE:18754@100508
 bear-640x360-video.mp4
 #EXT-X-PLACEMENT-OPPORTUNITY
 #EXTINF:0.734,
-#EXT-X-BYTERANGE:20068@222812
+#EXT-X-BYTERANGE:20068@222848
 bear-640x360-video.mp4
 #EXT-X-ENDLIST

packager/app/test/testdata/encryption-and-ad-cues/bear-640x360-video.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
-#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1091@0"
+#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1127@0"
 #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity"
-#EXTINF:1.068,
+#EXTINF:1.001,
-#EXT-X-BYTERANGE:99313@1159
+#EXT-X-BYTERANGE:99313@1195
 bear-640x360-video.mp4
 #EXTINF:1.001,
 #EXT-X-BYTERANGE:122340

packager/app/test/testdata/encryption-and-ad-cues/output.m3u8

@@ -3,7 +3,7 @@
 
 #EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
 
-#EXT-X-STREAM-INF:BANDWIDTH=1152421,AVERAGE-BANDWIDTH=987816,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group"
+#EXT-X-STREAM-INF:BANDWIDTH=1111200,AVERAGE-BANDWIDTH=1009412,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group"
 bear-640x360-video.m3u8
 
 #EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=218705,AVERAGE-BANDWIDTH=159070,CODECS="avc1.64001e",RESOLUTION=640x360,URI="bear-640x360-video-iframe.m3u8"

packager/app/test/testdata/encryption-and-ad-cues/output.mpd

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--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.802799940109253S">
+<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.7360668182373047S">
-  <Period id="0" duration="PT2.0687333333333333S">
+  <Period id="0" duration="PT2.002S">
     <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="174678" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
+      <Representation id="0" bandwidth="133457" 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">
+        <SegmentBase indexRange="1003-1070" timescale="44100">
-          <Initialization range="0-966"/>
+          <Initialization range="0-1002"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>
@@ -22,23 +22,23 @@
       </ContentProtection>
       <Representation id="1" bandwidth="977743" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
         <BaseURL>bear-640x360-video.mp4</BaseURL>
-        <SegmentBase indexRange="1091-1158" timescale="30000">
+        <SegmentBase indexRange="1127-1194" timescale="30000">
-          <Initialization range="0-1090"/>
+          <Initialization range="0-1126"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>
   </Period>
-  <Period id="1" duration="PT.7340666666666666S">
+  <Period id="1" duration="PT.7340666666666671S">
     <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="108126" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
+      <Representation id="0" bandwidth="110595" 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="91231">
+        <SegmentBase indexRange="1003-1070" timescale="44100" presentationTimeOffset="88288">
-          <Initialization range="0-966"/>
+          <Initialization range="0-1002"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>
@@ -49,8 +49,8 @@
       </ContentProtection>
       <Representation id="1" bandwidth="872586" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
         <BaseURL>bear-640x360-video.mp4</BaseURL>
-        <SegmentBase indexRange="1091-1158" timescale="30000" presentationTimeOffset="62062">
+        <SegmentBase indexRange="1127-1194" timescale="30000" presentationTimeOffset="60059">
-          <Initialization range="0-1090"/>
+          <Initialization range="0-1126"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>

packager/app/test/testdata/encryption-and-no-clear-lead/output.mpd

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--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.802799940109253S">
+<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.7360665798187256S">
   <Period id="0">
     <AdaptationSet id="0" 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"/>
@@ -9,8 +9,8 @@
       </ContentProtection>
       <Representation id="0" bandwidth="977743" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
         <BaseURL>bear-640x360-video.mp4</BaseURL>
-        <SegmentBase indexRange="955-1022" timescale="30000">
+        <SegmentBase indexRange="991-1058" timescale="30000">
-          <Initialization range="0-954"/>
+          <Initialization range="0-990"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>
@@ -19,11 +19,11 @@
       <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
         <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
       </ContentProtection>
-      <Representation id="1" bandwidth="133585" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
+      <Representation id="1" bandwidth="136568" 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="889-956" timescale="44100">
+        <SegmentBase indexRange="925-992" timescale="44100">
-          <Initialization range="0-888"/>
+          <Initialization range="0-924"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>

packager/app/test/testdata/encryption-and-no-pssh-in-stream/output.mpd

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--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.802799940109253S">
+<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.7360665798187256S">
   <Period id="0">
     <AdaptationSet id="0" 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"/>
@@ -9,8 +9,8 @@
       </ContentProtection>
       <Representation id="0" bandwidth="977743" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
         <BaseURL>bear-640x360-video.mp4</BaseURL>
-        <SegmentBase indexRange="1039-1106" timescale="30000">
+        <SegmentBase indexRange="1075-1142" timescale="30000">
-          <Initialization range="0-1038"/>
+          <Initialization range="0-1074"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>
@@ -19,11 +19,11 @@
       <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
         <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
       </ContentProtection>
-      <Representation id="1" bandwidth="133406" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
+      <Representation id="1" bandwidth="133663" 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">
+        <SegmentBase indexRange="951-1018" timescale="44100">
-          <Initialization range="0-914"/>
+          <Initialization range="0-950"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>

packager/app/test/testdata/encryption-and-non-dash-if-iop/output.mpd

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--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.802799940109253S">
+<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.7360665798187256S">
   <Period id="0">
     <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" subsegmentAlignment="true" par="16:9">
       <Representation id="0" bandwidth="977743" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
@@ -9,21 +9,21 @@
           <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
         </ContentProtection>
         <BaseURL>bear-640x360-video.mp4</BaseURL>
-        <SegmentBase indexRange="1091-1158" timescale="30000">
+        <SegmentBase indexRange="1127-1194" timescale="30000">
-          <Initialization range="0-1090"/>
+          <Initialization range="0-1126"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>
     <AdaptationSet id="1" contentType="audio" subsegmentAlignment="true">
-      <Representation id="1" bandwidth="133406" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
+      <Representation id="1" bandwidth="133663" 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">
           <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
         </ContentProtection>
         <BaseURL>bear-640x360-audio.mp4</BaseURL>
-        <SegmentBase indexRange="967-1034" timescale="44100">
+        <SegmentBase indexRange="1003-1070" timescale="44100">
-          <Initialization range="0-966"/>
+          <Initialization range="0-1002"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>

packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/bear-640x360-video.mp4.media_info

@@ -11,11 +11,11 @@ video_info {
 }
 init_range {
   begin: 0
-  end: 1090
+  end: 1126
 }
 index_range {
-  begin: 1091
+  begin: 1127
-  end: 1158
+  end: 1194
 }
 media_file_name: "bear-640x360-video.mp4"
 media_duration_seconds: 2.73606658

packager/app/test/testdata/encryption-and-output-media-info-and-mpd-from-media-info/output.mpd

@@ -9,8 +9,8 @@
       </ContentProtection>
       <Representation id="0" bandwidth="977743" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
         <BaseURL>bear-640x360-video.mp4</BaseURL>
-        <SegmentBase indexRange="1091-1158" timescale="30000">
+        <SegmentBase indexRange="1127-1194" timescale="30000">
-          <Initialization range="0-1090"/>
+          <Initialization range="0-1126"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>

packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-audio.mp4.media_info

@@ -1,4 +1,4 @@
-bandwidth: 133406
+bandwidth: 133663
 audio_info {
   codec: "mp4a.40.2"
   sampling_frequency: 44100
@@ -8,11 +8,11 @@ audio_info {
 }
 init_range {
   begin: 0
-  end: 966
+  end: 1002
 }
 index_range {
-  begin: 967
+  begin: 1003
-  end: 1034
+  end: 1070
 }
 media_file_name: "bear-640x360-audio.mp4"
 media_duration_seconds: 2.76317453

packager/app/test/testdata/encryption-and-output-media-info/bear-640x360-video.mp4.media_info

@@ -11,11 +11,11 @@ video_info {
 }
 init_range {
   begin: 0
-  end: 1090
+  end: 1126
 }
 index_range {
-  begin: 1091
+  begin: 1127
-  end: 1158
+  end: 1194
 }
 media_file_name: "bear-640x360-video.mp4"
 media_duration_seconds: 2.73606658