Merge remote-tracking branch 'upstream/main' into cmake

2023-07-05 19:51:52 -07:00 · 2023-07-05 19:51:52 -07:00 · 98490edc5f
parent ee0922edf0 53d91cd0f1
commit 98490edc5f
47 changed files with 105 additions and 70 deletions
--- a/2
+++ b/2
@ -22,6 +22,7 @@ Chun-da Chen <capitalm.c@gmail.com>
 Daniel Cantarín <canta@canta.com.ar>
 Dolby Laboratories <*@dolby.com>
 Evgeny Zajcev <zevlg@yandex.ru>
+Eyevinn Technology AB <*@eyevinn.se>
 Google LLC. <*@google.com>
 Ivi.ru LLC <*@ivi.ru>
 Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
@ -34,3 +35,4 @@ Richard Eklycke <richard@eklycke.se>
 Sanil Raut <sr1990003@gmail.com>
 Sergio Ammirata <sergio@ammirata.net>
 The Chromium Authors <*@chromium.org>
+Dennis E. Mungai (Brainiarc7) <dmngaie@gmail.com>
--- a/2
+++ b/2
@ -39,6 +39,7 @@ Joey Parrish <joeyparrish@google.com>
 Kongqun Yang <kqyang@google.com>
 Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
 Leo Law <leoltlaw.gh@gmail.com>
+Marcus Spangenberg <marcus.spangenberg@eyevinn.se>
 Ole Andre Birkedal <o.birkedal@sportradar.com>
 Piotr Srebrny <srebrny.piotr@gmail.com>
 Qingquan Wang <wangqq1103@gmail.com>
@ -51,3 +52,4 @@ Thomas Inskip <tinskip@google.com>
 Tim Lansen <tim.lansen@gmail.com>
 Vincent Nguyen <nvincen@amazon.com>
 Weiguo Shao <weiguo.shao@dolby.com>
+Dennis E. Mungai (Brainiarc7) <dmngaie@gmail.com>
--- a/docs/source/build_instructions.md
+++ b/docs/source/build_instructions.md
@ -117,7 +117,7 @@ dependencies.

 ```shell
 gclient config https://github.com/shaka-project/shaka-packager.git --name=src --unmanaged
-gclient sync
+gclient sync -r main
 ```

 To sync to a particular commit or version, add the '-r \<revision\>' flag to
--- a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/output.m3u8
+++ b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/output.m3u8
@ -3,7 +3,7 @@

 #EXT-X-INDEPENDENT-SEGMENTS

-#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-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",LANGUAGE="pt-BR",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES,CHANNELS="2"

 #EXT-X-STREAM-INF:BANDWIDTH=1106817,AVERAGE-BANDWIDTH=1004632,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",CLOSED-CAPTIONS=NONE
 bear-640x360-video.m3u8
--- a/packager/app/test/testdata/avc-aac-ts/output.m3u8
+++ b/packager/app/test/testdata/avc-aac-ts/output.m3u8
@ -3,7 +3,7 @@

 #EXT-X-INDEPENDENT-SEGMENTS

-#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES,CHANNELS="2"

 #EXT-X-STREAM-INF:BANDWIDTH=1217520,AVERAGE-BANDWIDTH=1117320,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",CLOSED-CAPTIONS=NONE
 bear-640x360-video.m3u8
--- a/packager/app/test/testdata/avc-ac3-ts-to-mp4/output.m3u8
+++ b/packager/app/test/testdata/avc-ac3-ts-to-mp4/output.m3u8
@ -3,7 +3,7 @@

 #EXT-X-INDEPENDENT-SEGMENTS

-#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-MEDIA:TYPE=AUDIO,URI="bear-640x360-ac3-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES,CHANNELS="2"

 #EXT-X-STREAM-INF:BANDWIDTH=1168321,AVERAGE-BANDWIDTH=1074156,CODECS="avc1.64001e,ac-3",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",CLOSED-CAPTIONS=NONE
 bear-640x360-ac3-video.m3u8
--- a/packager/app/test/testdata/avc-ac3-ts-with-encryption/output.m3u8
+++ b/packager/app/test/testdata/avc-ac3-ts-with-encryption/output.m3u8
@ -3,7 +3,7 @@

 #EXT-X-INDEPENDENT-SEGMENTS

-#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-MEDIA:TYPE=AUDIO,URI="bear-640x360-ac3-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES,CHANNELS="2"

 #EXT-X-STREAM-INF:BANDWIDTH=1242863,AVERAGE-BANDWIDTH=1148679,CODECS="avc1.64001e,ac-3",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",CLOSED-CAPTIONS=NONE
 bear-640x360-ac3-video.m3u8
--- a/packager/app/test/testdata/avc-ac3-ts/output.m3u8
+++ b/packager/app/test/testdata/avc-ac3-ts/output.m3u8
@ -3,7 +3,7 @@

 #EXT-X-INDEPENDENT-SEGMENTS

-#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-MEDIA:TYPE=AUDIO,URI="bear-640x360-ac3-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES,CHANNELS="2"

 #EXT-X-STREAM-INF:BANDWIDTH=1242863,AVERAGE-BANDWIDTH=1148679,CODECS="avc1.64001e,ac-3",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",CLOSED-CAPTIONS=NONE
 bear-640x360-ac3-video.m3u8
--- a/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/output.m3u8
+++ b/packager/app/test/testdata/avc-ts-aac-packed-audio-with-encryption/output.m3u8
@ -3,7 +3,7 @@

 #EXT-X-INDEPENDENT-SEGMENTS

-#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES,CHANNELS="2"

 #EXT-X-STREAM-INF:BANDWIDTH=1154999,AVERAGE-BANDWIDTH=1054750,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",CLOSED-CAPTIONS=NONE
 bear-640x360-video.m3u8
--- a/packager/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/output.m3u8
+++ b/packager/app/test/testdata/avc-ts-ac3-packed-audio-with-encryption/output.m3u8
@ -3,7 +3,7 @@

 #EXT-X-INDEPENDENT-SEGMENTS

-#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-MEDIA:TYPE=AUDIO,URI="bear-640x360-ac3-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES,CHANNELS="2"

 #EXT-X-STREAM-INF:BANDWIDTH=1216578,AVERAGE-BANDWIDTH=1122532,CODECS="avc1.64001e,ac-3",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",CLOSED-CAPTIONS=NONE
 bear-640x360-ac3-video.m3u8
--- a/packager/app/test/testdata/avc-ts-event-playlist/output.m3u8
+++ b/packager/app/test/testdata/avc-ts-event-playlist/output.m3u8
@ -3,7 +3,7 @@

 #EXT-X-INDEPENDENT-SEGMENTS

-#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES,CHANNELS="2"

 #EXT-X-STREAM-INF:BANDWIDTH=1217520,AVERAGE-BANDWIDTH=1117320,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",CLOSED-CAPTIONS=NONE
 bear-640x360-video.m3u8
--- a/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/output.m3u8
+++ b/packager/app/test/testdata/avc-ts-live-playlist-dash-dynamic-with-segment-deletion/output.m3u8
@ -3,7 +3,7 @@

 #EXT-X-INDEPENDENT-SEGMENTS

-#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES,CHANNELS="2"

 #EXT-X-STREAM-INF:BANDWIDTH=133919,AVERAGE-BANDWIDTH=126463,CODECS="mp4a.40.2",AUDIO="default-audio-group",CLOSED-CAPTIONS=NONE
 bear-640x360-audio.m3u8
--- a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/output.m3u8
+++ b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/output.m3u8
@ -3,7 +3,7 @@

 #EXT-X-INDEPENDENT-SEGMENTS

-#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES,CHANNELS="2"

 #EXT-X-STREAM-INF:BANDWIDTH=1217520,AVERAGE-BANDWIDTH=1117320,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",CLOSED-CAPTIONS=NONE
 bear-640x360-video.m3u8
--- a/packager/app/test/testdata/avc-ts-live-playlist-with-segment-deletion/output.m3u8
+++ b/packager/app/test/testdata/avc-ts-live-playlist-with-segment-deletion/output.m3u8
@ -1,4 +1,4 @@
 #EXTM3U
 ## Generated with https://github.com/shaka-project/shaka-packager version <tag>-<hash>-<test>

-#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES,CHANNELS="2"
--- a/packager/app/test/testdata/avc-ts-live-playlist/output.m3u8
+++ b/packager/app/test/testdata/avc-ts-live-playlist/output.m3u8
@ -3,7 +3,7 @@

 #EXT-X-INDEPENDENT-SEGMENTS

-#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES,CHANNELS="2"

 #EXT-X-STREAM-INF:BANDWIDTH=1217520,AVERAGE-BANDWIDTH=1117320,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",CLOSED-CAPTIONS=NONE
 bear-640x360-video.m3u8
--- a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/output.m3u8
+++ b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/output.m3u8
@ -3,7 +3,7 @@

 #EXT-X-INDEPENDENT-SEGMENTS

-#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES,CHANNELS="2"

 #EXT-X-STREAM-INF:BANDWIDTH=1217520,AVERAGE-BANDWIDTH=1117320,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",CLOSED-CAPTIONS=NONE
 bear-640x360-video.m3u8
--- a/packager/app/test/testdata/avc-ts-with-encryption/output.m3u8
+++ b/packager/app/test/testdata/avc-ts-with-encryption/output.m3u8
@ -3,7 +3,7 @@

 #EXT-X-INDEPENDENT-SEGMENTS

-#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES,CHANNELS="2"

 #EXT-X-STREAM-INF:BANDWIDTH=1217520,AVERAGE-BANDWIDTH=1117320,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",CLOSED-CAPTIONS=NONE
 bear-640x360-video.m3u8
--- a/packager/app/test/testdata/bandwidth-override/output.m3u8
+++ b/packager/app/test/testdata/bandwidth-override/output.m3u8
@ -3,7 +3,7 @@

 #EXT-X-INDEPENDENT-SEGMENTS

-#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES,CHANNELS="2"

 #EXT-X-STREAM-INF:BANDWIDTH=55555,AVERAGE-BANDWIDTH=1004632,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",CLOSED-CAPTIONS=NONE
 bear-640x360-video.m3u8
--- a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/output.m3u8
+++ b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/output.m3u8
@ -3,7 +3,7 @@

 #EXT-X-INDEPENDENT-SEGMENTS

-#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-MEDIA:TYPE=AUDIO,URI="bear-640x360-ec3-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES,CHANNELS="2"

 #EXT-X-STREAM-INF:BANDWIDTH=1174214,AVERAGE-BANDWIDTH=1061802,CODECS="avc1.64001e,ec-3",RESOLUTION=640x360,FRAME-RATE=9.990,AUDIO="default-audio-group",CLOSED-CAPTIONS=NONE
 bear-640x360-ec3-video.m3u8
--- a/packager/app/test/testdata/ec3-packed-audio-encrypted/output.m3u8
+++ b/packager/app/test/testdata/ec3-packed-audio-encrypted/output.m3u8
@ -3,7 +3,7 @@

 #EXT-X-INDEPENDENT-SEGMENTS

-#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-MEDIA:TYPE=AUDIO,URI="bear-640x360-ec3-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES,CHANNELS="2"

 #EXT-X-STREAM-INF:BANDWIDTH=1216655,AVERAGE-BANDWIDTH=1104925,CODECS="avc1.64001e,ec-3",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",CLOSED-CAPTIONS=NONE
 bear-640x360-ec3-video.m3u8
--- a/packager/app/test/testdata/encryption-and-ad-cues-split-content/output.m3u8
+++ b/packager/app/test/testdata/encryption-and-ad-cues-split-content/output.m3u8
@ -3,7 +3,7 @@

 #EXT-X-INDEPENDENT-SEGMENTS

-#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES,CHANNELS="2"

 #EXT-X-STREAM-INF:BANDWIDTH=1111200,AVERAGE-BANDWIDTH=1009412,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",CLOSED-CAPTIONS=NONE
 bear-640x360-video.m3u8
--- a/packager/app/test/testdata/encryption-and-ad-cues/output.m3u8
+++ b/packager/app/test/testdata/encryption-and-ad-cues/output.m3u8
@ -3,7 +3,7 @@

 #EXT-X-INDEPENDENT-SEGMENTS

-#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES,CHANNELS="2"

 #EXT-X-STREAM-INF:BANDWIDTH=1111200,AVERAGE-BANDWIDTH=1009412,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",CLOSED-CAPTIONS=NONE
 bear-640x360-video.m3u8
--- a/packager/app/test/testdata/encryption-with-multi-drms/output.m3u8
+++ b/packager/app/test/testdata/encryption-with-multi-drms/output.m3u8
@ -3,7 +3,7 @@

 #EXT-X-INDEPENDENT-SEGMENTS

-#EXT-X-MEDIA:TYPE=AUDIO,URI="stream_0.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="stream_0.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES,CHANNELS="2"

 #EXT-X-STREAM-INF:BANDWIDTH=1111406,AVERAGE-BANDWIDTH=1009412,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",CLOSED-CAPTIONS=NONE
 stream_1.m3u8
--- a/packager/app/test/testdata/flac-with-encryption/output.m3u8
+++ b/packager/app/test/testdata/flac-with-encryption/output.m3u8
@ -3,7 +3,7 @@

 #EXT-X-INDEPENDENT-SEGMENTS

-#EXT-X-MEDIA:TYPE=AUDIO,URI="stream_0.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="stream_0.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES,CHANNELS="2"

 #EXT-X-STREAM-INF:BANDWIDTH=672924,AVERAGE-BANDWIDTH=631380,CODECS="flac",AUDIO="default-audio-group",CLOSED-CAPTIONS=NONE
 stream_0.m3u8
--- a/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/output.m3u8
+++ b/packager/app/test/testdata/hls-audio-video-text-with-ad-cues/output.m3u8
@ -3,9 +3,9 @@

 #EXT-X-INDEPENDENT-SEGMENTS

-#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES,CHANNELS="2"

-#EXT-X-MEDIA:TYPE=SUBTITLES,URI="bear-english-text.m3u8",GROUP-ID="default-text-group",NAME="stream_2",AUTOSELECT=YES
+#EXT-X-MEDIA:TYPE=SUBTITLES,URI="bear-english-text.m3u8",GROUP-ID="default-text-group",NAME="stream_2",DEFAULT=NO,AUTOSELECT=YES

 #EXT-X-STREAM-INF:BANDWIDTH=1108115,AVERAGE-BANDWIDTH=1006069,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",SUBTITLES="default-text-group",CLOSED-CAPTIONS=NONE
 bear-640x360-video.m3u8
--- a/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/output.m3u8
+++ b/packager/app/test/testdata/hls-multi-segment-mp4-with-custom-path/output.m3u8
@ -3,7 +3,7 @@

 #EXT-X-INDEPENDENT-SEGMENTS

-#EXT-X-MEDIA:TYPE=AUDIO,URI="audio/audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="audio/audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES,CHANNELS="2"

 #EXT-X-STREAM-INF:BANDWIDTH=1108115,AVERAGE-BANDWIDTH=1006069,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",CLOSED-CAPTIONS=NONE
 video/video.m3u8
--- a/packager/app/test/testdata/hls-only-dash-only-captions/output.m3u8
+++ b/packager/app/test/testdata/hls-only-dash-only-captions/output.m3u8
@ -3,9 +3,9 @@

 #EXT-X-INDEPENDENT-SEGMENTS

-#EXT-X-MEDIA:TYPE=AUDIO,URI="stream_0.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="stream_0.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES,CHANNELS="2"

-#EXT-X-MEDIA:TYPE=SUBTITLES,URI="stream_3.m3u8",GROUP-ID="default-text-group",NAME="stream_3",AUTOSELECT=YES
+#EXT-X-MEDIA:TYPE=SUBTITLES,URI="stream_3.m3u8",GROUP-ID="default-text-group",NAME="stream_3",DEFAULT=NO,AUTOSELECT=YES

 #EXT-X-STREAM-INF:BANDWIDTH=1108115,AVERAGE-BANDWIDTH=1006069,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",SUBTITLES="default-text-group",CLOSED-CAPTIONS=NONE
 stream_1.m3u8
--- a/packager/app/test/testdata/hls-segmented-webvtt/output.m3u8
+++ b/packager/app/test/testdata/hls-segmented-webvtt/output.m3u8
@ -3,9 +3,9 @@

 #EXT-X-INDEPENDENT-SEGMENTS

-#EXT-X-MEDIA:TYPE=AUDIO,URI="stream_0.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="stream_0.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES,CHANNELS="2"

-#EXT-X-MEDIA:TYPE=SUBTITLES,URI="stream_2.m3u8",GROUP-ID="default-text-group",NAME="stream_2",AUTOSELECT=YES,CHARACTERISTICS="public.accessibility.transcribes-spoken-dialog,private.accessibility.widevine-special"
+#EXT-X-MEDIA:TYPE=SUBTITLES,URI="stream_2.m3u8",GROUP-ID="default-text-group",NAME="stream_2",DEFAULT=NO,AUTOSELECT=YES,CHARACTERISTICS="public.accessibility.transcribes-spoken-dialog,private.accessibility.widevine-special"

 #EXT-X-STREAM-INF:BANDWIDTH=1217518,AVERAGE-BANDWIDTH=1117319,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",SUBTITLES="default-text-group",CLOSED-CAPTIONS=NONE
 stream_1.m3u8
--- a/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/output.m3u8
+++ b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/output.m3u8
@ -1,7 +1,7 @@
 #EXTM3U
 ## Generated with https://github.com/shaka-project/shaka-packager version <tag>-<hash>-<test>

-#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES,CHANNELS="2"

 #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
--- a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/output.m3u8
+++ b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/output.m3u8
@ -3,7 +3,7 @@

 #EXT-X-INDEPENDENT-SEGMENTS

-#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES,CHANNELS="2"

 #EXT-X-STREAM-INF:BANDWIDTH=1111406,AVERAGE-BANDWIDTH=1009412,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",CLOSED-CAPTIONS=NONE
 bear-640x360-video.m3u8
--- a/packager/app/test/testdata/hls-with-bandwidth-override/output.m3u8
+++ b/packager/app/test/testdata/hls-with-bandwidth-override/output.m3u8
@ -1,7 +1,7 @@
 #EXTM3U
 ## Generated with https://github.com/shaka-project/shaka-packager version <tag>-<hash>-<test>

-#EXT-X-MEDIA:TYPE=AUDIO,URI="stream_0.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="stream_0.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES,CHANNELS="2"

 #EXT-X-STREAM-INF:BANDWIDTH=55555,AVERAGE-BANDWIDTH=983986,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group"
 stream_1.m3u8
--- a/packager/app/test/testdata/live-profile-with-webm/output.m3u8
+++ b/packager/app/test/testdata/live-profile-with-webm/output.m3u8
@ -3,7 +3,7 @@

 #EXT-X-INDEPENDENT-SEGMENTS

-#EXT-X-MEDIA:TYPE=AUDIO,URI="stream_0.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="stream_0.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES,CHANNELS="2"

 #EXT-X-STREAM-INF:BANDWIDTH=556353,AVERAGE-BANDWIDTH=412719,CODECS="vp08.00.10.08.01.02.02.02.00,vorbis",RESOLUTION=640x360,FRAME-RATE=30.303,AUDIO="default-audio-group",CLOSED-CAPTIONS=NONE
 stream_1.m3u8
--- a/packager/app/test/testdata/mp4-trailing-moov/output.m3u8
+++ b/packager/app/test/testdata/mp4-trailing-moov/output.m3u8
@ -3,7 +3,7 @@

 #EXT-X-INDEPENDENT-SEGMENTS

-#EXT-X-MEDIA:TYPE=AUDIO,URI="stream_0.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="stream_0.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES,CHANNELS="2"

 #EXT-X-STREAM-INF:BANDWIDTH=1106817,AVERAGE-BANDWIDTH=1004632,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",CLOSED-CAPTIONS=NONE
 stream_1.m3u8
--- a/packager/app/test/testdata/segmented-ttml-mp4/output.m3u8
+++ b/packager/app/test/testdata/segmented-ttml-mp4/output.m3u8
@ -3,4 +3,4 @@

 #EXT-X-INDEPENDENT-SEGMENTS

-#EXT-X-MEDIA:TYPE=SUBTITLES,URI="stream_0.m3u8",GROUP-ID="default-text-group",NAME="stream_0",AUTOSELECT=YES
+#EXT-X-MEDIA:TYPE=SUBTITLES,URI="stream_0.m3u8",GROUP-ID="default-text-group",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES
--- a/packager/app/test/testdata/segmented-ttml-text/output.m3u8
+++ b/packager/app/test/testdata/segmented-ttml-text/output.m3u8
@ -3,4 +3,4 @@

 #EXT-X-INDEPENDENT-SEGMENTS

-#EXT-X-MEDIA:TYPE=SUBTITLES,URI="stream_0.m3u8",GROUP-ID="default-text-group",NAME="stream_0",AUTOSELECT=YES
+#EXT-X-MEDIA:TYPE=SUBTITLES,URI="stream_0.m3u8",GROUP-ID="default-text-group",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES
--- a/packager/app/test/testdata/segmented-webvtt-mp4/output.m3u8
+++ b/packager/app/test/testdata/segmented-webvtt-mp4/output.m3u8
@ -3,4 +3,4 @@

 #EXT-X-INDEPENDENT-SEGMENTS

-#EXT-X-MEDIA:TYPE=SUBTITLES,URI="stream_0.m3u8",GROUP-ID="default-text-group",NAME="stream_0",AUTOSELECT=YES
+#EXT-X-MEDIA:TYPE=SUBTITLES,URI="stream_0.m3u8",GROUP-ID="default-text-group",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES
--- a/packager/app/test/testdata/segmented-webvtt-text/output.m3u8
+++ b/packager/app/test/testdata/segmented-webvtt-text/output.m3u8
@ -3,4 +3,4 @@

 #EXT-X-INDEPENDENT-SEGMENTS

-#EXT-X-MEDIA:TYPE=SUBTITLES,URI="stream_0.m3u8",GROUP-ID="default-text-group",NAME="stream_0",AUTOSELECT=YES
+#EXT-X-MEDIA:TYPE=SUBTITLES,URI="stream_0.m3u8",GROUP-ID="default-text-group",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES
--- a/packager/app/test/testdata/segmented-webvtt-with-language-override/output.m3u8
+++ b/packager/app/test/testdata/segmented-webvtt-with-language-override/output.m3u8
@ -3,4 +3,4 @@

 #EXT-X-INDEPENDENT-SEGMENTS

-#EXT-X-MEDIA:TYPE=SUBTITLES,URI="stream_1.m3u8",GROUP-ID="default-text-group",LANGUAGE="pt",NAME="stream_1",AUTOSELECT=YES
+#EXT-X-MEDIA:TYPE=SUBTITLES,URI="stream_1.m3u8",GROUP-ID="default-text-group",LANGUAGE="pt",NAME="stream_1",DEFAULT=NO,AUTOSELECT=YES
--- a/packager/app/test/testdata/single-file-webvtt-text/output.m3u8
+++ b/packager/app/test/testdata/single-file-webvtt-text/output.m3u8
@ -3,4 +3,4 @@

 #EXT-X-INDEPENDENT-SEGMENTS

-#EXT-X-MEDIA:TYPE=SUBTITLES,URI="stream_0.m3u8",GROUP-ID="default-text-group",NAME="stream_0",AUTOSELECT=YES
+#EXT-X-MEDIA:TYPE=SUBTITLES,URI="stream_0.m3u8",GROUP-ID="default-text-group",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES
--- a/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/output.m3u8
+++ b/packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/output.m3u8
@ -3,9 +3,9 @@

 #EXT-X-INDEPENDENT-SEGMENTS

-#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",DEFAULT=NO,AUTOSELECT=YES,CHANNELS="2"

-#EXT-X-MEDIA:TYPE=SUBTITLES,URI="bear-english-text.m3u8",GROUP-ID="default-text-group",NAME="stream_2",AUTOSELECT=YES
+#EXT-X-MEDIA:TYPE=SUBTITLES,URI="bear-english-text.m3u8",GROUP-ID="default-text-group",NAME="stream_2",DEFAULT=NO,AUTOSELECT=YES

 #EXT-X-STREAM-INF:BANDWIDTH=1108115,AVERAGE-BANDWIDTH=1006069,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,FRAME-RATE=29.970,AUDIO="default-audio-group",SUBTITLES="default-text-group",CLOSED-CAPTIONS=NONE
 bear-640x360-video.m3u8
--- a/packager/file/http_file.cc
+++ b/packager/file/http_file.cc
@ -260,6 +260,7 @@ int64_t HttpFile::Read(void* buffer, uint64_t length) {
 }

 int64_t HttpFile::Write(const void* buffer, uint64_t length) {
+  DCHECK(!upload_cache_.closed());
  VLOG(2) << "Writing to " << url_ << ", length=" << length;
  return upload_cache_.Write(buffer, length);
 }
@ -270,7 +271,8 @@ int64_t HttpFile::Size() {
 }

 bool HttpFile::Flush() {
-  upload_cache_.Close();
+  // Wait for curl to read any data we may have buffered.
+  upload_cache_.WaitUntilEmptyOrClosed();
  return true;
 }

--- a/packager/hls/base/master_playlist.cc
+++ b/packager/hls/base/master_playlist.cc
@ -312,6 +312,8 @@ void BuildMediaTag(const MediaPlaylist& playlist,

  if (is_default) {
    tag.AddString("DEFAULT", "YES");
+  } else {
+     tag.AddString("DEFAULT", "NO");
  }

  if (is_autoselect) {
--- a/packager/media/formats/ttml/ttml_generator.cc
+++ b/packager/media/formats/ttml/ttml_generator.cc
@ -29,7 +29,7 @@ std::string ToTtmlTime(int64_t time, int32_t timescale) {
  remaining /= 60;
  const int hr = remaining;

-  return base::StringPrintf("%02d:%02d:%02d.%02d", hr, min, sec, ms);
+  return base::StringPrintf("%02d:%02d:%02d.%03d", hr, min, sec, ms);
 }

 std::string ToTtmlSize(const TextNumber& x, const TextNumber& y) {
--- a/packager/media/formats/ttml/ttml_generator_unittest.cc
+++ b/packager/media/formats/ttml/ttml_generator_unittest.cc
@ -67,8 +67,8 @@ TEST_F(TtmlMuxerTest, WithOneSegmentAndWithOneSample) {
      "  <head/>\n"
      "  <body>\n"
      "    <div>\n"
-      "      <p xml:space=\"preserve\" begin=\"00:00:05.00\" "
-      "end=\"00:00:06.00\">payload</p>\n"
+      "      <p xml:space=\"preserve\" begin=\"00:00:05.000\" "
+      "end=\"00:00:06.000\">payload</p>\n"
      "    </div>\n"
      "  </body>\n"
      "</tt>\n";
@ -86,8 +86,8 @@ TEST_F(TtmlMuxerTest, MultipleFragmentsWithNewlines) {
      "  <head/>\n"
      "  <body>\n"
      "    <div>\n"
-      "      <p xml:space=\"preserve\" begin=\"00:00:05.00\" "
-      "end=\"00:00:06.00\">foo bar<br/>baz</p>\n"
+      "      <p xml:space=\"preserve\" begin=\"00:00:05.000\" "
+      "end=\"00:00:06.000\">foo bar<br/>baz</p>\n"
      "    </div>\n"
      "  </body>\n"
      "</tt>\n";
@ -109,8 +109,8 @@ TEST_F(TtmlMuxerTest, HandlesStyles) {
      "  <head/>\n"
      "  <body>\n"
      "    <div>\n"
-      "      <p xml:space=\"preserve\" begin=\"00:00:05.00\" "
-      "end=\"00:00:06.00\">\n"
+      "      <p xml:space=\"preserve\" begin=\"00:00:05.000\" "
+      "end=\"00:00:06.000\">\n"
      "        <span tts:fontWeight=\"bold\">foo</span>\n"
      "        <span tts:fontStyle=\"italic\">bar</span>\n"
      "        <span tts:textDecoration=\"underline\">baz</span>\n"
@ -141,8 +141,8 @@ TEST_F(TtmlMuxerTest, HandlesRegions) {
      "  </head>\n"
      "  <body>\n"
      "    <div>\n"
-      "      <p xml:space=\"preserve\" begin=\"00:00:05.00\" "
-      "end=\"00:00:06.00\" region=\"foo\">bar</p>\n"
+      "      <p xml:space=\"preserve\" begin=\"00:00:05.000\" "
+      "end=\"00:00:06.000\" region=\"foo\">bar</p>\n"
      "    </div>\n"
      "  </body>\n"
      "</tt>\n";
@ -169,8 +169,8 @@ TEST_F(TtmlMuxerTest, HandlesLanguage) {
      "  <head/>\n"
      "  <body>\n"
      "    <div>\n"
-      "      <p xml:space=\"preserve\" begin=\"00:00:05.00\" "
-      "end=\"00:00:06.00\">bar</p>\n"
+      "      <p xml:space=\"preserve\" begin=\"00:00:05.000\" "
+      "end=\"00:00:06.000\">bar</p>\n"
      "    </div>\n"
      "  </body>\n"
      "</tt>\n";
@ -192,8 +192,8 @@ TEST_F(TtmlMuxerTest, HandlesPosition) {
      "    <div>\n"
      "      <region xml:id=\"_shaka_region_0\" tts:origin=\"30% 4em\" "
      "tts:extent=\"100px 1em\"/>\n"
-      "      <p xml:space=\"preserve\" begin=\"00:00:05.00\" "
-      "end=\"00:00:06.00\" region=\"_shaka_region_0\">bar</p>\n"
+      "      <p xml:space=\"preserve\" begin=\"00:00:05.000\" "
+      "end=\"00:00:06.000\" region=\"_shaka_region_0\">bar</p>\n"
      "    </div>\n"
      "  </body>\n"
      "</tt>\n";
@ -216,8 +216,8 @@ TEST_F(TtmlMuxerTest, HandlesOtherSettings) {
      "  <head/>\n"
      "  <body>\n"
      "    <div>\n"
-      "      <p xml:space=\"preserve\" begin=\"00:00:05.00\" "
-      "end=\"00:00:06.00\" tts:writingMode=\"tblr\" "
+      "      <p xml:space=\"preserve\" begin=\"00:00:05.000\" "
+      "end=\"00:00:06.000\" tts:writingMode=\"tblr\" "
      "tts:textAlign=\"end\">bar</p>\n"
      "    </div>\n"
      "  </body>\n"
@ -240,8 +240,8 @@ TEST_F(TtmlMuxerTest, HandlesCueId) {
      "  <head/>\n"
      "  <body>\n"
      "    <div>\n"
-      "      <p xml:space=\"preserve\" begin=\"00:00:05.00\" "
-      "end=\"00:00:06.00\" xml:id=\"foo\">bar</p>\n"
+      "      <p xml:space=\"preserve\" begin=\"00:00:05.000\" "
+      "end=\"00:00:06.000\" xml:id=\"foo\">bar</p>\n"
      "    </div>\n"
      "  </body>\n"
      "</tt>\n";
@ -265,8 +265,8 @@ TEST_F(TtmlMuxerTest, EscapesSpecialChars) {
      "  </head>\n"
      "  <body>\n"
      "    <div>\n"
-      "      <p xml:space=\"preserve\" begin=\"00:00:05.00\" "
-      "end=\"00:00:06.00\" xml:id=\"foo&lt;a&amp;&quot;\" "
+      "      <p xml:space=\"preserve\" begin=\"00:00:05.000\" "
+      "end=\"00:00:06.000\" xml:id=\"foo&lt;a&amp;&quot;\" "
      "region=\"&lt;a&amp;&quot;\">&lt;tag&gt;\"foo&amp;bar\"</p>\n"
      "    </div>\n"
      "  </body>\n"
@ -290,8 +290,8 @@ TEST_F(TtmlMuxerTest, HandlesReset) {
      "  <head/>\n"
      "  <body>\n"
      "    <div>\n"
-      "      <p xml:space=\"preserve\" begin=\"00:00:05.00\" "
-      "end=\"00:00:06.00\">foo</p>\n"
+      "      <p xml:space=\"preserve\" begin=\"00:00:05.000\" "
+      "end=\"00:00:06.000\">foo</p>\n"
      "    </div>\n"
      "  </body>\n"
      "</tt>\n";
@ -302,8 +302,8 @@ TEST_F(TtmlMuxerTest, HandlesReset) {
      "  <head/>\n"
      "  <body>\n"
      "    <div>\n"
-      "      <p xml:space=\"preserve\" begin=\"00:00:08.00\" "
-      "end=\"00:00:09.00\">bar</p>\n"
+      "      <p xml:space=\"preserve\" begin=\"00:00:08.000\" "
+      "end=\"00:00:09.000\">bar</p>\n"
      "    </div>\n"
      "  </body>\n"
      "</tt>\n";
@ -339,8 +339,8 @@ TEST_F(TtmlMuxerTest, HandlesImage) {
      "  </metadata>\n"
      "  <body>\n"
      "    <div>\n"
-      "      <p xml:space=\"preserve\" begin=\"00:00:05.00\" "
-      "end=\"00:00:06.00\" smpte:backgroundImage=\"#img_1\" xml:id=\"foo\"/>\n"
+      "      <p xml:space=\"preserve\" begin=\"00:00:05.000\" "
+      "end=\"00:00:06.000\" smpte:backgroundImage=\"#img_1\" xml:id=\"foo\"/>\n"
      "    </div>\n"
      "  </body>\n"
      "</tt>\n";
@ -352,6 +352,27 @@ TEST_F(TtmlMuxerTest, HandlesImage) {
  ParseSingleCue(kExpectedOutput, properties);
 }

+TEST_F(TtmlMuxerTest, FormatsTimeWithFixedNumberOfDigits) {
+  const char* kExpectedOutput =
+      "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+      "<tt xmlns=\"http://www.w3.org/ns/ttml\" "
+      "xmlns:tts=\"http://www.w3.org/ns/ttml#styling\" xml:lang=\"\">\n"
+      "  <head/>\n"
+      "  <body>\n"
+      "    <div>\n"
+      "      <p xml:space=\"preserve\" begin=\"00:00:00.000\" "
+      "end=\"00:00:00.001\">payload</p>\n"
+      "    </div>\n"
+      "  </body>\n"
+      "</tt>\n";
+
+  TestProperties properties;
+  properties.body.body = "payload";
+  properties.start = 0;
+  properties.end = 1;
+  ParseSingleCue(kExpectedOutput, properties);
+}
+
 }  // namespace ttml
 }  // namespace media
 }  // namespace shaka
--- a/packager/mpd/base/representation_unittest.cc
+++ b/packager/mpd/base/representation_unittest.cc
@ -559,8 +559,8 @@ TEST_F(SegmentTemplateTest, OneSegmentLowLatency) {
      " width=\"720\" height=\"480\" frameRate=\"10/5\">\n"
      "  <SegmentTemplate timescale=\"1000\" "
      "   duration=\"5000\" availabilityTimeOffset=\"4.995\" "
-      "   initialization=\"init.mp4\" media=\"$Time$.mp4\" "
-      "   startNumber=\"1\"/>\n"
+      "   availabilityTimeComplete=\"false\" initialization=\"init.mp4\" "
+      "   media=\"$Time$.mp4\" startNumber=\"1\"/>\n"
      "</Representation>\n";
  EXPECT_THAT(representation_->GetXml(), XmlNodeEqual(kOutputTemplate));
 }
--- a/packager/mpd/base/xml/xml_node.cc
+++ b/packager/mpd/base/xml/xml_node.cc
@ -483,6 +483,11 @@ bool RepresentationXmlNode::AddLiveOnlyInfo(
        "availabilityTimeOffset", media_info.availability_time_offset()));
  }

+  if (low_latency_dash_mode) {
+    RCHECK(segment_template.SetStringAttribute("availabilityTimeComplete",
+                                               "false"));
+  }
+
  if (media_info.has_init_segment_url()) {
    RCHECK(segment_template.SetStringAttribute("initialization",
                                               media_info.init_segment_url()));
--- a/packager/mpd/base/xml/xml_node_unittest.cc
+++ b/packager/mpd/base/xml/xml_node_unittest.cc
@ -752,6 +752,7 @@ TEST_F(LowLatencySegmentTest, LowLatencySegmentTemplate) {
      XmlNodeEqual("<Representation>"
                   "  <SegmentTemplate timescale=\"90000\" duration=\"450000\" "
                   "                   availabilityTimeOffset=\"4.9750987314\" "
+                   "                   availabilityTimeComplete=\"false\" "
                   "                   initialization=\"init.m4s\" "
                   "                   media=\"$Number$.m4s\" "
                   "                   startNumber=\"1\"/>"