Do not force earliest_presentation_time to 0 for VOD

Instead, the actual earliest presentation time is used except for the first segment if there is an offset between presentation time (pts) and decoding time (dts). Chrome (as of v66) reports dts instead of pts in buffered ranges in MSE API. To avoid breaking Chrome, the earliest_presentation_time of the first segment is set to its dts as Chrome does not like negative values for adjusted dts = dts + Period@start (0 for the first period) - presentationTimeOffset (earliest_presentation_time). Fixes #303. Change-Id: I5ca80e05d5570961400499436f2bcc01f06e69e0
2018-03-27 09:27:17 -07:00 · 2018-03-27 09:27:17 -07:00 · 1223694249
parent 668335c647
commit 1223694249
76 changed files with 127 additions and 108 deletions
--- a/packager/app/test/testdata/bear-320x180-a-wvm-golden.mp4
+++ b/packager/app/test/testdata/bear-320x180-a-wvm-golden.mp4
--- a/packager/app/test/testdata/bear-320x180-avc3-wvm-golden.mp4
+++ b/packager/app/test/testdata/bear-320x180-avc3-wvm-golden.mp4
--- a/packager/app/test/testdata/bear-320x180-v-wvm-golden.mp4
+++ b/packager/app/test/testdata/bear-320x180-v-wvm-golden.mp4
--- a/packager/app/test/testdata/bear-320x240-opus-vp9-cenc-golden.mpd
+++ b/packager/app/test/testdata/bear-320x240-opus-vp9-cenc-golden.mpd
@ -10,7 +10,7 @@
      <Representation id="0" bandwidth="81568" codecs="opus" mimeType="audio/mp4" audioSamplingRate="48000">
        <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
        <BaseURL>output_audio.mp4</BaseURL>
-        <SegmentBase indexRange="975-1042" timescale="1000000">
+        <SegmentBase indexRange="975-1042" timescale="1000000" presentationTimeOffset="36999">
          <Initialization range="0-974"/>
        </SegmentBase>
      </Representation>
@ -22,7 +22,7 @@
      </ContentProtection>
      <Representation id="1" bandwidth="210205" codecs="vp09.00.10.08.01.02.02.02.00" mimeType="video/mp4" sar="427:320">
        <BaseURL>output_video.mp4</BaseURL>
-        <SegmentBase indexRange="1063-1130" timescale="1000000">
+        <SegmentBase indexRange="1063-1130" timescale="1000000" presentationTimeOffset="36999">
          <Initialization range="0-1062"/>
        </SegmentBase>
      </Representation>
--- a/packager/app/test/testdata/bear-320x240-vp9-cenc-golden.mp4
+++ b/packager/app/test/testdata/bear-320x240-vp9-cenc-golden.mp4
--- a/packager/app/test/testdata/bear-320x240-vp9-golden.mp4
+++ b/packager/app/test/testdata/bear-320x240-vp9-golden.mp4
--- a/packager/app/test/testdata/bear-320x240-vp9-opus-webm-golden.mpd
+++ b/packager/app/test/testdata/bear-320x240-vp9-opus-webm-golden.mpd
@ -6,7 +6,7 @@
      <Representation id="0" bandwidth="76531" codecs="opus" mimeType="audio/webm" audioSamplingRate="48000">
        <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
        <BaseURL>output_audio.webm</BaseURL>
-        <SegmentBase indexRange="323-371" timescale="1000000">
+        <SegmentBase indexRange="323-371" timescale="1000000" presentationTimeOffset="36999">
          <Initialization range="0-322"/>
        </SegmentBase>
      </Representation>
@ -14,7 +14,7 @@
    <AdaptationSet id="1" contentType="video" width="320" height="240" frameRate="1000000/34000" subsegmentAlignment="true" par="16:9">
      <Representation id="1" bandwidth="203360" codecs="vp9" mimeType="video/webm" sar="427:320">
        <BaseURL>output_video.webm</BaseURL>
-        <SegmentBase indexRange="302-350" timescale="1000000">
+        <SegmentBase indexRange="302-350" timescale="1000000" presentationTimeOffset="36999">
          <Initialization range="0-301"/>
        </SegmentBase>
      </Representation>
--- a/packager/app/test/testdata/bear-640x360-a-clear-v-cenc-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-a-clear-v-cenc-golden.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.7360665798187256S">
+<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">
  <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"/>
--- a/packager/app/test/testdata/bear-640x360-a-wvm-golden.mp4
+++ b/packager/app/test/testdata/bear-640x360-a-wvm-golden.mp4
--- a/packager/app/test/testdata/bear-640x360-ac3-from-ts-golden.mp4
+++ b/packager/app/test/testdata/bear-640x360-ac3-from-ts-golden.mp4
--- a/packager/app/test/testdata/bear-640x360-av-cbc1-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-av-cbc1-golden.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.7360665798187256S">
+<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">
  <Period id="0">
    <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" subsegmentAlignment="true" par="16:9">
      <ContentProtection value="cbc1" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="31323334-3536-3738-3930-313233343536"/>
--- a/packager/app/test/testdata/bear-640x360-av-cbcs-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-av-cbcs-golden.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.7360665798187256S">
+<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">
  <Period id="0">
    <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" subsegmentAlignment="true" par="16:9">
      <ContentProtection value="cbcs" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="31323334-3536-3738-3930-313233343536"/>
--- a/packager/app/test/testdata/bear-640x360-av-cenc-ad_cues-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-av-cenc-ad_cues-golden.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.7360668182373047S">
-  <Period id="0" duration="PT2.002S">
+<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">
+  <Period id="0" duration="PT2.0687333333333333S">
    <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">
--- a/packager/app/test/testdata/bear-640x360-av-cenc-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-av-cenc-golden.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.7360665798187256S">
+<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">
  <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"/>
--- a/packager/app/test/testdata/bear-640x360-av-cenc-no-clear-lead-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-av-cenc-no-clear-lead-golden.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.7360665798187256S">
+<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">
  <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"/>
--- a/packager/app/test/testdata/bear-640x360-av-cenc-no-pssh-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-av-cenc-no-pssh-golden.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.7360665798187256S">
+<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">
  <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"/>
--- 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
@ -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.7360665798187256S">
+<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">
  <Period id="0">
    <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" subsegmentAlignment="true" par="16:9">
      <Representation id="0" bandwidth="885590" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
--- a/packager/app/test/testdata/bear-640x360-av-cens-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-av-cens-golden.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.7360665798187256S">
+<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">
  <Period id="0">
    <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" subsegmentAlignment="true" par="16:9">
      <ContentProtection value="cens" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="31323334-3536-3738-3930-313233343536"/>
--- a/packager/app/test/testdata/bear-640x360-av-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-av-golden.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.7360665798187256S">
+<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">
  <Period id="0">
    <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" subsegmentAlignment="true" par="16:9">
      <Representation id="0" bandwidth="882064" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
--- a/packager/app/test/testdata/bear-640x360-av-live-cenc-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-av-live-cenc-golden.mpd
@ -7,10 +7,11 @@
      <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
        <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
      </ContentProtection>
-      <Representation id="0" bandwidth="875692" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
+      <Representation id="0" bandwidth="854753" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
        <SegmentTemplate timescale="30000" initialization="output_video-init.mp4" media="output_video-$Number$.m4s" startNumber="1">
          <SegmentTimeline>
-            <S t="2002" d="30030" r="1"/>
+            <S t="0" d="32032"/>
+            <S t="32032" d="30030"/>
            <S t="62062" d="22022"/>
          </SegmentTimeline>
        </SegmentTemplate>
--- a/packager/app/test/testdata/bear-640x360-av-live-cenc-non-iop-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-av-live-cenc-non-iop-golden.mpd
@ -3,14 +3,15 @@
 <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-live:2011" minBufferTime="PT2S" type="dynamic" publishTime="some_publish_time" availabilityStartTime="some_availability_start_time" minimumUpdatePeriod="PT5S" timeShiftBufferDepth="PT1800S">
  <Period id="0" start="PT0S">
    <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" segmentAlignment="true" par="16:9">
-      <Representation id="0" bandwidth="875692" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
+      <Representation id="0" bandwidth="854753" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
        <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>
        <SegmentTemplate timescale="30000" initialization="output_video-init.mp4" media="output_video-$Number$.m4s" startNumber="1">
          <SegmentTimeline>
-            <S t="2002" d="30030" r="1"/>
+            <S t="0" d="32032"/>
+            <S t="32032" d="30030"/>
            <S t="62062" d="22022"/>
          </SegmentTimeline>
        </SegmentTemplate>
--- a/packager/app/test/testdata/bear-640x360-av-live-cenc-rotation-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-av-live-cenc-rotation-golden.mpd
@ -5,10 +5,11 @@
    <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" segmentAlignment="true" par="16:9">
      <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011"/>
      <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b"/>
-      <Representation id="0" bandwidth="876578" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
+      <Representation id="0" bandwidth="855607" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
        <SegmentTemplate timescale="30000" initialization="output_video-init.mp4" media="output_video-$Number$.m4s" startNumber="1">
          <SegmentTimeline>
-            <S t="2002" d="30030" r="1"/>
+            <S t="0" d="32032"/>
+            <S t="32032" d="30030"/>
            <S t="62062" d="22022"/>
          </SegmentTimeline>
        </SegmentTemplate>
--- a/packager/app/test/testdata/bear-640x360-av-live-cenc-rotation-no-pssh-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-av-live-cenc-rotation-no-pssh-golden.mpd
@ -5,10 +5,11 @@
    <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" segmentAlignment="true" par="16:9">
      <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011"/>
      <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b"/>
-      <Representation id="0" bandwidth="876109" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
+      <Representation id="0" bandwidth="855149" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
        <SegmentTemplate timescale="30000" initialization="output_video-init.mp4" media="output_video-$Number$.m4s" startNumber="1">
          <SegmentTimeline>
-            <S t="2002" d="30030" r="1"/>
+            <S t="0" d="32032"/>
+            <S t="32032" d="30030"/>
            <S t="62062" d="22022"/>
          </SegmentTimeline>
        </SegmentTemplate>
--- a/packager/app/test/testdata/bear-640x360-av-live-cenc-rotation-non-iop-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-av-live-cenc-rotation-non-iop-golden.mpd
@ -3,12 +3,13 @@
 <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-live:2011" minBufferTime="PT2S" type="dynamic" publishTime="some_publish_time" availabilityStartTime="some_availability_start_time" minimumUpdatePeriod="PT5S" timeShiftBufferDepth="PT1800S">
  <Period id="0" start="PT0S">
    <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" segmentAlignment="true" par="16:9">
-      <Representation id="0" bandwidth="876578" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
+      <Representation id="0" bandwidth="855607" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
        <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011"/>
        <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b"/>
        <SegmentTemplate timescale="30000" initialization="output_video-init.mp4" media="output_video-$Number$.m4s" startNumber="1">
          <SegmentTimeline>
-            <S t="2002" d="30030" r="1"/>
+            <S t="0" d="32032"/>
+            <S t="32032" d="30030"/>
            <S t="62062" d="22022"/>
          </SegmentTimeline>
        </SegmentTemplate>
--- a/packager/app/test/testdata/bear-640x360-av-live-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-av-live-golden.mpd
@ -3,10 +3,11 @@
 <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-live:2011" minBufferTime="PT2S" type="dynamic" publishTime="some_publish_time" availabilityStartTime="some_availability_start_time" minimumUpdatePeriod="PT5S" timeShiftBufferDepth="PT1800S">
  <Period id="0" start="PT0S">
    <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" segmentAlignment="true" par="16:9">
-      <Representation id="0" bandwidth="873071" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
+      <Representation id="0" bandwidth="852255" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
        <SegmentTemplate timescale="30000" initialization="output_video-init.mp4" media="output_video-$Number$.m4s" startNumber="1">
          <SegmentTimeline>
-            <S t="2002" d="30030" r="1"/>
+            <S t="0" d="32032"/>
+            <S t="32032" d="30030"/>
            <S t="62062" d="22022"/>
          </SegmentTimeline>
        </SegmentTemplate>
--- a/packager/app/test/testdata/bear-640x360-av-live-static-ad_cues-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-av-live-static-ad_cues-golden.mpd
@ -1,12 +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-live:2011" minBufferTime="PT2S" type="static" mediaPresentationDuration="PT2.7360668182373047S">
-  <Period id="0" duration="PT2.002S">
+<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-live:2011" minBufferTime="PT2S" type="static" mediaPresentationDuration="PT2.802799940109253S">
+  <Period id="0" duration="PT2.0687333333333333S">
    <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" segmentAlignment="true" par="16:9">
-      <Representation id="0" bandwidth="875099" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
+      <Representation id="0" bandwidth="844102" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
        <SegmentTemplate timescale="30000" initialization="output_video-init.mp4" media="output_video-$Number$.m4s" startNumber="1">
          <SegmentTimeline>
-            <S t="2002" d="30030" r="1"/>
+            <S t="0" d="32032"/>
+            <S t="32032" d="30030"/>
          </SegmentTimeline>
        </SegmentTemplate>
      </Representation>
--- a/packager/app/test/testdata/bear-640x360-av-live-static-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-av-live-static-golden.mpd
@ -1,12 +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-live:2011" minBufferTime="PT2S" type="static" mediaPresentationDuration="PT2.7360665798187256S">
+<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-live:2011" minBufferTime="PT2S" type="static" mediaPresentationDuration="PT2.802799940109253S">
  <Period id="0">
    <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" segmentAlignment="true" par="16:9">
-      <Representation id="0" bandwidth="873071" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
+      <Representation id="0" bandwidth="852255" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
        <SegmentTemplate timescale="30000" initialization="output_video-init.mp4" media="output_video-$Number$.m4s" startNumber="1">
          <SegmentTimeline>
-            <S t="2002" d="30030" r="1"/>
+            <S t="0" d="32032"/>
+            <S t="32032" d="30030"/>
            <S t="62062" d="22022"/>
          </SegmentTimeline>
        </SegmentTemplate>
--- a/packager/app/test/testdata/bear-640x360-av-por-BR-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-av-por-BR-golden.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.7360665798187256S">
+<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">
  <Period id="0">
    <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" subsegmentAlignment="true" par="16:9">
      <Representation id="0" bandwidth="882064" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
--- a/packager/app/test/testdata/bear-640x360-av-por-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-av-por-golden.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.7360665798187256S">
+<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">
  <Period id="0">
    <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" subsegmentAlignment="true" par="16:9">
      <Representation id="0" bandwidth="882064" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
--- a/packager/app/test/testdata/bear-640x360-av-trick-1-cenc-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-av-trick-1-cenc-golden.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.7360665798187256S">
+<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">
  <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"/>
--- a/packager/app/test/testdata/bear-640x360-av-trick-1-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-av-trick-1-golden.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.7360665798187256S">
+<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">
  <Period id="0">
    <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" subsegmentAlignment="true" par="16:9">
      <Representation id="0" bandwidth="882064" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
--- a/packager/app/test/testdata/bear-640x360-av-trick-1-trick-2-cenc-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-av-trick-1-trick-2-cenc-golden.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.7360665798187256S">
+<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">
  <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"/>
--- a/packager/app/test/testdata/bear-640x360-av-trick-1-trick-2-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-av-trick-1-trick-2-golden.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.7360665798187256S">
+<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">
  <Period id="0">
    <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" subsegmentAlignment="true" par="16:9">
      <Representation id="0" bandwidth="882064" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
--- a/packager/app/test/testdata/bear-640x360-avc3-wvm-golden.mp4
+++ b/packager/app/test/testdata/bear-640x360-avc3-wvm-golden.mp4
--- a/packager/app/test/testdata/bear-640x360-avt-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-avt-golden.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.7360665798187256S">
+<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">
  <Period id="0">
    <AdaptationSet id="0" contentType="text" subsegmentAlignment="true">
      <Representation id="0" bandwidth="256" mimeType="text/vtt">
--- a/packager/app/test/testdata/bear-640x360-ec3-v-cenc-golden.mp4
+++ b/packager/app/test/testdata/bear-640x360-ec3-v-cenc-golden.mp4
--- a/packager/app/test/testdata/bear-640x360-ec3-v-mp4-cenc-golden.m3u8
+++ b/packager/app/test/testdata/bear-640x360-ec3-v-mp4-cenc-golden.m3u8
@ -5,7 +5,7 @@
 #EXT-X-PLAYLIST-TYPE:VOD
 #EXT-X-MAP:URI="output_video.mp4",BYTERANGE="1091@0"
 #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity"
-#EXTINF:1.001,
+#EXTINF:1.068,
 #EXT-X-BYTERANGE:93805@1159
 output_video.mp4
 #EXTINF:1.001,
--- a/packager/app/test/testdata/bear-640x360-hevc-cenc-golden.mp4
+++ b/packager/app/test/testdata/bear-640x360-hevc-cenc-golden.mp4
--- a/packager/app/test/testdata/bear-640x360-hevc-cenc-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-hevc-cenc-golden.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.8695333003997803S">
  <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"/>
--- a/packager/app/test/testdata/bear-640x360-hevc-golden.mp4
+++ b/packager/app/test/testdata/bear-640x360-hevc-golden.mp4
--- a/packager/app/test/testdata/bear-640x360-v-cbc1-golden.mp4
+++ b/packager/app/test/testdata/bear-640x360-v-cbc1-golden.mp4
--- a/packager/app/test/testdata/bear-640x360-v-cbcs-golden.mp4
+++ b/packager/app/test/testdata/bear-640x360-v-cbcs-golden.mp4
--- a/packager/app/test/testdata/bear-640x360-v-cenc-ad_cues-golden.mp4
+++ b/packager/app/test/testdata/bear-640x360-v-cenc-ad_cues-golden.mp4
--- a/packager/app/test/testdata/bear-640x360-v-cenc-golden.mp4
+++ b/packager/app/test/testdata/bear-640x360-v-cenc-golden.mp4
--- a/packager/app/test/testdata/bear-640x360-v-cenc-no-clear-lead-golden.mp4
+++ b/packager/app/test/testdata/bear-640x360-v-cenc-no-clear-lead-golden.mp4
--- a/packager/app/test/testdata/bear-640x360-v-cenc-no-pssh-golden.mp4
+++ b/packager/app/test/testdata/bear-640x360-v-cenc-no-pssh-golden.mp4
--- a/packager/app/test/testdata/bear-640x360-v-cens-golden.mp4
+++ b/packager/app/test/testdata/bear-640x360-v-cens-golden.mp4
--- a/packager/app/test/testdata/bear-640x360-v-from-ts-golden.mp4
+++ b/packager/app/test/testdata/bear-640x360-v-from-ts-golden.mp4
--- a/packager/app/test/testdata/bear-640x360-v-golden.mp4
+++ b/packager/app/test/testdata/bear-640x360-v-golden.mp4
--- a/packager/app/test/testdata/bear-640x360-v-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-v-golden.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.7360665798187256S">
+<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">
  <Period id="0">
    <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" subsegmentAlignment="true" par="16:9">
      <Representation id="0" bandwidth="882064" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
--- a/packager/app/test/testdata/bear-640x360-v-live-ad_cues-golden-1.m4s
+++ b/packager/app/test/testdata/bear-640x360-v-live-ad_cues-golden-1.m4s
--- a/packager/app/test/testdata/bear-640x360-v-live-cenc-golden-1.m4s
+++ b/packager/app/test/testdata/bear-640x360-v-live-cenc-golden-1.m4s
--- a/packager/app/test/testdata/bear-640x360-v-live-cenc-rotation-golden-1.m4s
+++ b/packager/app/test/testdata/bear-640x360-v-live-cenc-rotation-golden-1.m4s
--- a/packager/app/test/testdata/bear-640x360-v-live-cenc-rotation-no-pssh-golden-1.m4s
+++ b/packager/app/test/testdata/bear-640x360-v-live-cenc-rotation-no-pssh-golden-1.m4s
--- a/packager/app/test/testdata/bear-640x360-v-live-golden-1.m4s
+++ b/packager/app/test/testdata/bear-640x360-v-live-golden-1.m4s
--- a/packager/app/test/testdata/bear-640x360-v-mp4-cenc-ad_cues-golden.m3u8
+++ b/packager/app/test/testdata/bear-640x360-v-mp4-cenc-ad_cues-golden.m3u8
@ -5,7 +5,7 @@
 #EXT-X-PLAYLIST-TYPE:VOD
 #EXT-X-MAP:URI="output_video.mp4",BYTERANGE="1091@0"
 #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity"
-#EXTINF:1.001,
+#EXTINF:1.068,
 #EXT-X-BYTERANGE:99313@1159
 output_video.mp4
 #EXTINF:1.001,
--- a/packager/app/test/testdata/bear-640x360-v-mp4-cenc-golden.m3u8
+++ b/packager/app/test/testdata/bear-640x360-v-mp4-cenc-golden.m3u8
@ -5,7 +5,7 @@
 #EXT-X-PLAYLIST-TYPE:VOD
 #EXT-X-MAP:URI="output_video.mp4",BYTERANGE="1091@0"
 #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity"
-#EXTINF:1.001,
+#EXTINF:1.068,
 #EXT-X-BYTERANGE:99313@1159
 output_video.mp4
 #EXTINF:1.001,
--- a/packager/app/test/testdata/bear-640x360-v-mp4-golden.m3u8
+++ b/packager/app/test/testdata/bear-640x360-v-mp4-golden.m3u8
@ -4,7 +4,7 @@
 #EXT-X-TARGETDURATION:2
 #EXT-X-PLAYLIST-TYPE:VOD
 #EXT-X-MAP:URI="video-init.mp4"
-#EXTINF:1.001,
+#EXTINF:1.068,
 video-1.m4s
 #EXTINF:1.001,
 video-2.m4s
--- a/packager/app/test/testdata/bear-640x360-v-trick-1-cenc-golden.mp4
+++ b/packager/app/test/testdata/bear-640x360-v-trick-1-cenc-golden.mp4
--- a/packager/app/test/testdata/bear-640x360-v-trick-1-golden.mp4
+++ b/packager/app/test/testdata/bear-640x360-v-trick-1-golden.mp4
--- a/packager/app/test/testdata/bear-640x360-v-trick-2-cenc-golden.mp4
+++ b/packager/app/test/testdata/bear-640x360-v-trick-2-cenc-golden.mp4
--- a/packager/app/test/testdata/bear-640x360-v-trick-2-golden.mp4
+++ b/packager/app/test/testdata/bear-640x360-v-trick-2-golden.mp4
--- a/packager/app/test/testdata/bear-640x360-v-ts-to-mp4-golden.m3u8
+++ b/packager/app/test/testdata/bear-640x360-v-ts-to-mp4-golden.m3u8
@ -4,7 +4,7 @@
 #EXT-X-TARGETDURATION:2
 #EXT-X-PLAYLIST-TYPE:VOD
 #EXT-X-MAP:URI="output_video.mp4",BYTERANGE="823@0"
-#EXTINF:1.001,
+#EXTINF:1.068,
 #EXT-X-BYTERANGE:99313@891
 output_video.mp4
 #EXTINF:1.001,
--- a/packager/app/test/testdata/bear-640x360-v-wvm-golden.mp4
+++ b/packager/app/test/testdata/bear-640x360-v-wvm-golden.mp4
--- a/packager/app/test/testdata/bear-640x360-vp8-cenc-golden.mp4
+++ b/packager/app/test/testdata/bear-640x360-vp8-cenc-golden.mp4
--- a/packager/app/test/testdata/bear-640x360-vp8-cenc-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-vp8-cenc-golden.mpd
@ -9,7 +9,7 @@
      </ContentProtection>
      <Representation id="0" bandwidth="341018" codecs="vp08.00.10.08.01.02.02.02.00" mimeType="video/mp4" sar="1:1">
        <BaseURL>output_video.mp4</BaseURL>
-        <SegmentBase indexRange="1031-1098" timescale="1000000">
+        <SegmentBase indexRange="1031-1098" timescale="1000000" presentationTimeOffset="25999">
          <Initialization range="0-1030"/>
        </SegmentBase>
      </Representation>
--- a/packager/app/test/testdata/bear-640x360-vp8-cenc-webm-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-vp8-cenc-webm-golden.mpd
@ -8,7 +8,7 @@
      </ContentProtection>
      <Representation id="0" bandwidth="337062" codecs="vp8" mimeType="video/webm" sar="1:1">
        <BaseURL>output_video.webm</BaseURL>
-        <SegmentBase indexRange="340-389" timescale="1000000">
+        <SegmentBase indexRange="340-389" timescale="1000000" presentationTimeOffset="25999">
          <Initialization range="0-339"/>
        </SegmentBase>
      </Representation>
--- a/packager/app/test/testdata/bear-640x360-vp8-golden.mp4
+++ b/packager/app/test/testdata/bear-640x360-vp8-golden.mp4
--- a/packager/app/test/testdata/bear-640x360-vp8-webm-golden.mpd
+++ b/packager/app/test/testdata/bear-640x360-vp8-webm-golden.mpd
@ -5,7 +5,7 @@
    <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="1000000/33000" subsegmentAlignment="true" par="16:9">
      <Representation id="0" bandwidth="335457" codecs="vp8" mimeType="video/webm" sar="1:1">
        <BaseURL>output_video.webm</BaseURL>
-        <SegmentBase indexRange="289-338" timescale="1000000">
+        <SegmentBase indexRange="289-338" timescale="1000000" presentationTimeOffset="25999">
          <Initialization range="0-288"/>
        </SegmentBase>
      </Representation>
--- a/packager/app/test/testdata/bear-avc3-wvm-golden.mpd
+++ b/packager/app/test/testdata/bear-avc3-wvm-golden.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.7360665798187256S">
+<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">
  <Period id="0">
    <AdaptationSet id="0" contentType="video" maxWidth="640" maxHeight="360" frameRate="90000/3003" subsegmentAlignment="true" par="16:9">
      <Representation id="0" bandwidth="354240" codecs="avc3.64000d" mimeType="video/mp4" sar="1:1" width="320" height="180">
        <BaseURL>output_0.mp4</BaseURL>
-        <SegmentBase indexRange="818-885" timescale="90000">
+        <SegmentBase indexRange="818-885" timescale="90000" presentationTimeOffset="17999">
          <Initialization range="0-817"/>
        </SegmentBase>
      </Representation>
      <Representation id="2" bandwidth="888442" codecs="avc3.64001e" mimeType="video/mp4" sar="1:1" width="640" height="360">
        <BaseURL>output_2.mp4</BaseURL>
-        <SegmentBase indexRange="819-886" timescale="90000">
+        <SegmentBase indexRange="819-886" timescale="90000" presentationTimeOffset="17999">
          <Initialization range="0-818"/>
        </SegmentBase>
      </Representation>
@ -20,14 +20,14 @@
      <Representation id="1" bandwidth="132362" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
        <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
        <BaseURL>output_1.mp4</BaseURL>
-        <SegmentBase indexRange="757-824" timescale="90000">
+        <SegmentBase indexRange="757-824" timescale="90000" presentationTimeOffset="17999">
          <Initialization range="0-756"/>
        </SegmentBase>
      </Representation>
      <Representation id="3" bandwidth="136806" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
        <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
        <BaseURL>output_3.mp4</BaseURL>
-        <SegmentBase indexRange="757-824" timescale="90000">
+        <SegmentBase indexRange="757-824" timescale="90000" presentationTimeOffset="17999">
          <Initialization range="0-756"/>
        </SegmentBase>
      </Representation>
--- a/packager/app/test/testdata/bear-wvm-golden.mpd
+++ b/packager/app/test/testdata/bear-wvm-golden.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.7360665798187256S">
+<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">
  <Period id="0">
    <AdaptationSet id="0" contentType="video" maxWidth="640" maxHeight="360" frameRate="90000/3003" subsegmentAlignment="true" par="16:9">
      <Representation id="0" bandwidth="353919" codecs="avc1.64000d" mimeType="video/mp4" sar="1:1" width="320" height="180">
        <BaseURL>output_0.mp4</BaseURL>
-        <SegmentBase indexRange="822-889" timescale="90000">
+        <SegmentBase indexRange="822-889" timescale="90000" presentationTimeOffset="17999">
          <Initialization range="0-821"/>
        </SegmentBase>
      </Representation>
      <Representation id="2" bandwidth="888108" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1" width="640" height="360">
        <BaseURL>output_2.mp4</BaseURL>
-        <SegmentBase indexRange="823-890" timescale="90000">
+        <SegmentBase indexRange="823-890" timescale="90000" presentationTimeOffset="17999">
          <Initialization range="0-822"/>
        </SegmentBase>
      </Representation>
@ -20,14 +20,14 @@
      <Representation id="1" bandwidth="132362" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
        <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
        <BaseURL>output_1.mp4</BaseURL>
-        <SegmentBase indexRange="757-824" timescale="90000">
+        <SegmentBase indexRange="757-824" timescale="90000" presentationTimeOffset="17999">
          <Initialization range="0-756"/>
        </SegmentBase>
      </Representation>
      <Representation id="3" bandwidth="136806" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
        <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
        <BaseURL>output_3.mp4</BaseURL>
-        <SegmentBase indexRange="757-824" timescale="90000">
+        <SegmentBase indexRange="757-824" timescale="90000" presentationTimeOffset="17999">
          <Initialization range="0-756"/>
        </SegmentBase>
      </Representation>
--- a/packager/media/formats/mp4/fragmenter.cc
+++ b/packager/media/formats/mp4/fragmenter.cc
@ -6,6 +6,7 @@

 #include "packager/media/formats/mp4/fragmenter.h"

+#include <algorithm>
 #include <limits>

 #include "packager/media/base/audio_stream_info.h"
@ -150,6 +151,24 @@ Status Fragmenter::FinalizeFragment() {
      return status;
  }

+  if (first_fragment_) {
+    // Chrome (as of v66 https://crbug.com/398141) does not like negative values
+    // for adjusted dts = dts + Period@start (0 for first Period)
+    //                    - presentationTimeOffset
+    // Since |earliest_presentation_time| of the first fragment will be used to
+    // set presentationTimeOffset, the adjusted dts can become negative for the
+    // frames in the first segment in the first Period. To avoid seeing that,
+    // |earliest_presentation_time| is adjusted so it is not larger than the
+    // dts.
+    const int64_t dts = traf_->decode_time.decode_time;
+    if (earliest_presentation_time_ > dts) {
+      const uint64_t delta = earliest_presentation_time_ - dts;
+      earliest_presentation_time_ = dts;
+      fragment_duration_ += delta;
+    }
+    first_fragment_ = false;
+  }
+
  // Optimize trun box.
  traf_->runs[0].sample_count =
      static_cast<uint32_t>(traf_->runs[0].sample_sizes.size());
@ -208,7 +227,7 @@ Status Fragmenter::FinalizeFragment() {
  return Status::OK;
 }

-void Fragmenter::GenerateSegmentReference(SegmentReference* reference) {
+void Fragmenter::GenerateSegmentReference(SegmentReference* reference) const {
  // NOTE: Daisy chain is not supported currently.
  reference->reference_type = false;
  reference->subsegment_duration = fragment_duration_;
@ -275,7 +294,7 @@ Status Fragmenter::FinalizeFragmentForEncryption() {
  return Status::OK;
 }

-bool Fragmenter::StartsWithSAP() {
+bool Fragmenter::StartsWithSAP() const {
  DCHECK(!traf_->runs.empty());
  uint32_t start_sample_flag;
  if (traf_->runs[0].flags & TrackFragmentRun::kSampleFlagsPresentMask) {
--- a/packager/media/formats/mp4/fragmenter.h
+++ b/packager/media/formats/mp4/fragmenter.h
@ -51,7 +51,7 @@ class Fragmenter {
  Status FinalizeFragment();

  /// Fill @a reference with current fragment information.
-  void GenerateSegmentReference(SegmentReference* reference);
+  void GenerateSegmentReference(SegmentReference* reference) const;

  void ClearFragmentFinalized() { fragment_finalized_ = false; }

@ -88,7 +88,7 @@ class Fragmenter {
 private:
  Status FinalizeFragmentForEncryption();
  // Check if the current fragment starts with SAP.
-  bool StartsWithSAP();
+  bool StartsWithSAP() const;

  std::shared_ptr<const StreamInfo> stream_info_;
  bool use_decoding_timestamp_in_timeline_;
@ -98,6 +98,7 @@ class Fragmenter {
  bool fragment_finalized_;
  uint64_t fragment_duration_;
  int64_t earliest_presentation_time_;
+  bool first_fragment_ = true;
  int64_t first_sap_time_;
  std::unique_ptr<BufferWriter> data_;
  // Saves key frames information, for Video.
--- a/packager/media/formats/mp4/single_segment_segmenter.cc
+++ b/packager/media/formats/mp4/single_segment_segmenter.cc
@ -196,25 +196,7 @@ Status SingleSegmentSegmenter::DoFinalizeSegment() {
    vod_sidx_.reset(new SegmentIndex());
    vod_sidx_->reference_id = sidx()->reference_id;
    vod_sidx_->timescale = sidx()->timescale;
-
-    if (vod_ref.earliest_presentation_time > 0) {
-      const double starting_time_in_seconds =
-          static_cast<double>(vod_ref.earliest_presentation_time) /
-          GetReferenceTimeScale();
-      // Give a warning if it is significant.
-      if (starting_time_in_seconds > 0.5) {
-        // Note that DASH IF player requires presentationTimeOffset to be set in
-        // Segment{Base,List,Template} if there is non-zero starting time. Since
-        // current Chromium's MSE implementation uses DTS, the player expects
-        // DTS to be used.
-        LOG(WARNING) << "Warning! Non-zero starting time (in seconds): "
-                     << starting_time_in_seconds
-                     << ". Manual adjustment of presentationTimeOffset in "
-                        "mpd might be necessary.";
-      }
-    }
-    // Force earliest_presentation_time to start from 0 for VOD.
-    vod_sidx_->earliest_presentation_time = 0;
+    vod_sidx_->earliest_presentation_time = vod_ref.earliest_presentation_time;
  }
  vod_sidx_->references.push_back(vod_ref);

--- a/packager/mpd/base/mpd_builder.cc
+++ b/packager/mpd/base/mpd_builder.cc
@ -338,7 +338,6 @@ bool MpdBuilder::GetEarliestTimestamp(double* timestamp_seconds) {
 void MpdBuilder::UpdatePeriodDurationAndPresentationTimestamp() {
  DCHECK_EQ(MpdType::kStatic, mpd_options_.mpd_type);

-  bool first_period = true;
  for (const auto& period : periods_) {
    std::list<Representation*> video_representations;
    std::list<Representation*> non_video_representations;
@ -378,21 +377,6 @@ void MpdBuilder::UpdatePeriodDurationAndPresentationTimestamp() {
    period->set_duration_seconds(*latest_end_time - *earliest_start_time);

    double presentation_time_offset = *earliest_start_time;
-    if (first_period) {
-      first_period = false;
-      // Chrome does not like negative dts (https://crbug.com/398141).
-      // Always set presentationTimeOffset (pto) to 0 for the first period as it
-      // may result in an error on Chrome v63.0.3239.132 if it sets to a non
-      // zero value.
-      // It is fine with subsequent periods as the actual offset applied takes
-      // Period@start into consideration:
-      //     offset = Period@start - presentationTimeOffset
-      // The result timestamp with offset applied is close to Period@start, so
-      // it is unlikely to result in a negative dts value.
-      // TODO(kqyang): Set the pto to |dts| instead of always setting it to 0 to
-      // workaround Chrome negative DTS bug.
-      presentation_time_offset = 0;
-    }
    for (const auto& adaptation_set : period->GetAdaptationSets()) {
      for (const auto& representation : adaptation_set->GetRepresentations()) {
        representation->SetPresentationTimeOffset(presentation_time_offset);
--- a/packager/mpd/base/mpd_builder_unittest.cc
+++ b/packager/mpd/base/mpd_builder_unittest.cc
@ -174,6 +174,29 @@ TEST_F(OnDemandMpdBuilderTest, MediaInfoMissingBandwidth) {
  ASSERT_FALSE(mpd_.ToString(&mpd_doc));
 }

+TEST_F(OnDemandMpdBuilderTest, CheckXmlTest) {
+  // Disable pto adjustment.
+  FLAGS_pto_adjustment = 0;
+
+  const double kPeriod1StartTimeSeconds = 0.0;
+
+  // Actual period duration is determined by the segments not by the period
+  // start time above, which only provides an anchor point.
+  const double kPeriod1SegmentStartSeconds = 0.2;
+  const double kPeriod1SegmentDurationSeconds = 3.0;
+
+  Period* period = mpd_.GetOrCreatePeriod(kPeriod1StartTimeSeconds);
+  AddSegmentToPeriod(kPeriod1SegmentStartSeconds,
+                     kPeriod1SegmentDurationSeconds, period);
+
+  std::string mpd_doc;
+  ASSERT_TRUE(mpd_.ToString(&mpd_doc));
+  EXPECT_THAT(mpd_doc, HasSubstr("<Period id=\"0\">\n"));
+  EXPECT_THAT(mpd_doc,
+              HasSubstr("<SegmentBase indexRange=\"121-221\""
+                        " timescale=\"1000\" presentationTimeOffset=\"200\">"));
+}
+
 TEST_F(OnDemandMpdBuilderTest, MultiplePeriodTest) {
  const double kPeriodStartTimeSeconds = 1.0;
  Period* period = mpd_.GetOrCreatePeriod(kPeriodStartTimeSeconds);
@ -226,15 +249,17 @@ TEST_F(OnDemandMpdBuilderTest, MultiplePeriodCheckXmlTest) {
  std::string mpd_doc;
  ASSERT_TRUE(mpd_.ToString(&mpd_doc));
  EXPECT_THAT(mpd_doc, HasSubstr("<Period id=\"0\" duration=\"PT3S\">\n"));
+  EXPECT_THAT(mpd_doc,
+              HasSubstr("<SegmentBase indexRange=\"121-221\""
+                        " timescale=\"1000\" presentationTimeOffset=\"200\">"));
+  EXPECT_THAT(mpd_doc, HasSubstr("<Period id=\"1\" duration=\"PT10.5S\">\n"));
  EXPECT_THAT(
      mpd_doc,
-      HasSubstr("<SegmentBase indexRange=\"121-221\" timescale=\"1000\">"));
-  EXPECT_THAT(mpd_doc, HasSubstr("<Period id=\"1\" duration=\"PT10.5S\">\n"));
-  EXPECT_THAT(mpd_doc,
      HasSubstr("<SegmentBase indexRange=\"121-221\""
                " timescale=\"1000\" presentationTimeOffset=\"5500\">"));
  EXPECT_THAT(mpd_doc, HasSubstr("<Period id=\"2\" duration=\"PT10S\">\n"));
-  EXPECT_THAT(mpd_doc,
+  EXPECT_THAT(
+      mpd_doc,
      HasSubstr("<SegmentBase indexRange=\"121-221\""
                " timescale=\"1000\" presentationTimeOffset=\"1500\">"));
 }