From ac47e529ad7b69cc232f7f96e2a042990505776f Mon Sep 17 00:00:00 2001
From: sr90 <sr1990003@gmail.com>
Date: Wed, 12 Jul 2023 09:01:55 -0700
Subject: [PATCH] fix: Update golden files for ttml tests and failing hls unit
 tests. (#1226)

Updating golden files for failing ttml tests in packager_test.py related
to https://github.com/shaka-project/shaka-packager/pull/1179 and
failing HLS unit tests related to
https://github.com/shaka-project/shaka-packager/pull/1170.
---
 .../bear-english-text-1.m4s                   | Bin 500 -> 501 bytes
 .../bear-english-text-2.m4s                   | Bin 514 -> 515 bytes
 .../bear-english-text-3.m4s                   | Bin 514 -> 515 bytes
 .../bear-english-text-4.m4s                   | Bin 514 -> 515 bytes
 .../bear-english-text-5.m4s                   | Bin 514 -> 515 bytes
 .../testdata/segmented-ttml-mp4/output.mpd    |   2 +-
 .../bear-english-text-1.ttml                  |   2 +-
 .../bear-english-text-2.ttml                  |   2 +-
 .../bear-english-text-3.ttml                  |   2 +-
 .../bear-english-text-4.ttml                  |   2 +-
 .../bear-english-text-5.ttml                  |   2 +-
 .../testdata/segmented-ttml-text/output.mpd   |   2 +-
 packager/hls/base/master_playlist_unittest.cc |  23 +++++++++---------
 13 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/packager/app/test/testdata/segmented-ttml-mp4/bear-english-text-1.m4s b/packager/app/test/testdata/segmented-ttml-mp4/bear-english-text-1.m4s
index 9cba9773d22091518761c02a7089f6074d08dd94..1de1cd08d379e025f12b28fb626004637aeb1013 100644
GIT binary patch
delta 25
hcmeyu{FQlvJLA%c9?p!G6MM879VhO%Ie7wO3IKum3HJa1

delta 25
hcmey${DpafJL8gx9?pyw6MM879VYI$Ie8LeG5~?u3H1N~

diff --git a/packager/app/test/testdata/segmented-ttml-mp4/bear-english-text-2.m4s b/packager/app/test/testdata/segmented-ttml-mp4/bear-english-text-2.m4s
index 473e7de4bada9c88fbf6d6d50539590200dbc75f..29351536a0b23a737f7580f67602a936eab3e22f 100644
GIT binary patch
delta 25
hcmZo-X=a(=&bWD^hcl!5#2#%%|A{+pPM*M61ORUL2~7Y1

delta 25
hcmZo>X=0h+&bVo!hclzw#2#%%zll3;PM*YA2mo%^2}=L~

diff --git a/packager/app/test/testdata/segmented-ttml-mp4/bear-english-text-3.m4s b/packager/app/test/testdata/segmented-ttml-mp4/bear-english-text-3.m4s
index f015e810cf64a30cefc9a611533087aec58b4852..8b81e6d983dbd6b6e508150c5298ab300b05cb77 100644
GIT binary patch
delta 25
hcmZo-X=a(=&bWD^hcl!5#2#%%|A{+pPM*M61ORUL2~7Y1

delta 25
hcmZo>X=0h+&bVo!hclzw#2#%%zll3;PM*YA2mo%^2}=L~

diff --git a/packager/app/test/testdata/segmented-ttml-mp4/bear-english-text-4.m4s b/packager/app/test/testdata/segmented-ttml-mp4/bear-english-text-4.m4s
index 4253cd74b70017e5407f541b68de4b1b81a3e556..9c86b0e5e2e6a43d1c06dc5679918d672a0762d4 100644
GIT binary patch
delta 25
hcmZo-X=a(=&bWD^hcl!5#2#%%|A{+pPM*M61ORUL2~7Y1

delta 25
hcmZo>X=0h+&bVo!hclzw#2#%%zll3;PM*YA2mo%^2}=L~

diff --git a/packager/app/test/testdata/segmented-ttml-mp4/bear-english-text-5.m4s b/packager/app/test/testdata/segmented-ttml-mp4/bear-english-text-5.m4s
index 8232dc03b592b701225fb394fec1b8b6ae108998..e0dc6e3b8d4604c09d49a4e1c2f1615c4d116d59 100644
GIT binary patch
delta 25
hcmZo-X=a(=&bWD^hcl!5#2#%%|A{+pPM*M61ORUL2~7Y1

delta 25
hcmZo>X=0h+&bVo!hclzw#2#%%zll3;PM*YA2mo%^2}=L~

diff --git a/packager/app/test/testdata/segmented-ttml-mp4/output.mpd b/packager/app/test/testdata/segmented-ttml-mp4/output.mpd
index 10019a55be..35ddebf4a1 100644
--- a/packager/app/test/testdata/segmented-ttml-mp4/output.mpd
+++ b/packager/app/test/testdata/segmented-ttml-mp4/output.mpd
@@ -4,7 +4,7 @@
   <Period id="0" start="PT0S">
     <AdaptationSet id="0" contentType="text" segmentAlignment="true">
       <Role schemeIdUri="urn:mpeg:dash:role:2011" value="subtitle"/>
-      <Representation id="0" bandwidth="4112" codecs="stpp" mimeType="application/mp4">
+      <Representation id="0" bandwidth="4120" codecs="stpp" mimeType="application/mp4">
         <SegmentTemplate timescale="1000" initialization="bear-english-text-init.mp4" media="bear-english-text-$Number$.m4s" startNumber="1">
           <SegmentTimeline>
             <S t="0" d="1000" r="4"/>
diff --git a/packager/app/test/testdata/segmented-ttml-text/bear-english-text-1.ttml b/packager/app/test/testdata/segmented-ttml-text/bear-english-text-1.ttml
index 70c1bdb8a8..94a5092c9d 100644
--- a/packager/app/test/testdata/segmented-ttml-text/bear-english-text-1.ttml
+++ b/packager/app/test/testdata/segmented-ttml-text/bear-english-text-1.ttml
@@ -3,7 +3,7 @@
   <head/>
   <body>
     <div>
-      <p xml:space="preserve" begin="00:00:00.00" end="00:00:00.800" tts:textAlign="center">Yup, that's a bear, eh.</p>
+      <p xml:space="preserve" begin="00:00:00.000" end="00:00:00.800" tts:textAlign="center">Yup, that's a bear, eh.</p>
     </div>
   </body>
 </tt>
diff --git a/packager/app/test/testdata/segmented-ttml-text/bear-english-text-2.ttml b/packager/app/test/testdata/segmented-ttml-text/bear-english-text-2.ttml
index 07dfd93d87..8048787ec7 100644
--- a/packager/app/test/testdata/segmented-ttml-text/bear-english-text-2.ttml
+++ b/packager/app/test/testdata/segmented-ttml-text/bear-english-text-2.ttml
@@ -3,7 +3,7 @@
   <head/>
   <body>
     <div>
-      <p xml:space="preserve" begin="00:00:01.00" end="00:00:04.700" tts:textAlign="center">He 's... um... doing bear-like stuff.</p>
+      <p xml:space="preserve" begin="00:00:01.000" end="00:00:04.700" tts:textAlign="center">He 's... um... doing bear-like stuff.</p>
     </div>
   </body>
 </tt>
diff --git a/packager/app/test/testdata/segmented-ttml-text/bear-english-text-3.ttml b/packager/app/test/testdata/segmented-ttml-text/bear-english-text-3.ttml
index 07dfd93d87..8048787ec7 100644
--- a/packager/app/test/testdata/segmented-ttml-text/bear-english-text-3.ttml
+++ b/packager/app/test/testdata/segmented-ttml-text/bear-english-text-3.ttml
@@ -3,7 +3,7 @@
   <head/>
   <body>
     <div>
-      <p xml:space="preserve" begin="00:00:01.00" end="00:00:04.700" tts:textAlign="center">He 's... um... doing bear-like stuff.</p>
+      <p xml:space="preserve" begin="00:00:01.000" end="00:00:04.700" tts:textAlign="center">He 's... um... doing bear-like stuff.</p>
     </div>
   </body>
 </tt>
diff --git a/packager/app/test/testdata/segmented-ttml-text/bear-english-text-4.ttml b/packager/app/test/testdata/segmented-ttml-text/bear-english-text-4.ttml
index 07dfd93d87..8048787ec7 100644
--- a/packager/app/test/testdata/segmented-ttml-text/bear-english-text-4.ttml
+++ b/packager/app/test/testdata/segmented-ttml-text/bear-english-text-4.ttml
@@ -3,7 +3,7 @@
   <head/>
   <body>
     <div>
-      <p xml:space="preserve" begin="00:00:01.00" end="00:00:04.700" tts:textAlign="center">He 's... um... doing bear-like stuff.</p>
+      <p xml:space="preserve" begin="00:00:01.000" end="00:00:04.700" tts:textAlign="center">He 's... um... doing bear-like stuff.</p>
     </div>
   </body>
 </tt>
diff --git a/packager/app/test/testdata/segmented-ttml-text/bear-english-text-5.ttml b/packager/app/test/testdata/segmented-ttml-text/bear-english-text-5.ttml
index 07dfd93d87..8048787ec7 100644
--- a/packager/app/test/testdata/segmented-ttml-text/bear-english-text-5.ttml
+++ b/packager/app/test/testdata/segmented-ttml-text/bear-english-text-5.ttml
@@ -3,7 +3,7 @@
   <head/>
   <body>
     <div>
-      <p xml:space="preserve" begin="00:00:01.00" end="00:00:04.700" tts:textAlign="center">He 's... um... doing bear-like stuff.</p>
+      <p xml:space="preserve" begin="00:00:01.000" end="00:00:04.700" tts:textAlign="center">He 's... um... doing bear-like stuff.</p>
     </div>
   </body>
 </tt>
diff --git a/packager/app/test/testdata/segmented-ttml-text/output.mpd b/packager/app/test/testdata/segmented-ttml-text/output.mpd
index 8b506062bf..9b9e87e2ed 100644
--- a/packager/app/test/testdata/segmented-ttml-text/output.mpd
+++ b/packager/app/test/testdata/segmented-ttml-text/output.mpd
@@ -4,7 +4,7 @@
   <Period id="0" start="PT0S">
     <AdaptationSet id="0" contentType="text" segmentAlignment="true">
       <Role schemeIdUri="urn:mpeg:dash:role:2011" value="subtitle"/>
-      <Representation id="0" bandwidth="2608" mimeType="application/ttml+xml">
+      <Representation id="0" bandwidth="2616" mimeType="application/ttml+xml">
         <SegmentTemplate timescale="1000" media="bear-english-text-$Number$.ttml" startNumber="1">
           <SegmentTimeline>
             <S t="0" d="1000" r="4"/>
diff --git a/packager/hls/base/master_playlist_unittest.cc b/packager/hls/base/master_playlist_unittest.cc
index 450583341c..f72cdede53 100644
--- a/packager/hls/base/master_playlist_unittest.cc
+++ b/packager/hls/base/master_playlist_unittest.cc
@@ -324,7 +324,7 @@ TEST_F(MasterPlaylistTest, WriteMasterPlaylistVideoAndAudio) {
       "DEFAULT=YES,AUTOSELECT=YES,CHANNELS=\"2\"\n"
       "#EXT-X-MEDIA:TYPE=AUDIO,URI=\"http://playlists.org/spa.m3u8\","
       "GROUP-ID=\"audiogroup\",LANGUAGE=\"es\",NAME=\"espanol\","
-      "AUTOSELECT=YES,CHANNELS=\"5\"\n"
+      "DEFAULT=NO,AUTOSELECT=YES,CHANNELS=\"5\"\n"
       "\n"
       "#EXT-X-STREAM-INF:BANDWIDTH=360000,AVERAGE-BANDWIDTH=240000,"
       "CODECS=\"sdvideocodec,audiocodec\","
@@ -430,7 +430,8 @@ TEST_F(MasterPlaylistTest, WriteMasterPlaylistSameAudioGroupSameLanguage) {
       "GROUP-ID=\"audio\",LANGUAGE=\"en\",NAME=\"english\","
       "DEFAULT=YES,AUTOSELECT=YES,CHANNELS=\"1\"\n"
       "#EXT-X-MEDIA:TYPE=AUDIO,URI=\"http://anydomain.com/eng_hi.m3u8\","
-      "GROUP-ID=\"audio\",LANGUAGE=\"en\",NAME=\"english\",CHANNELS=\"8\"\n"
+      "GROUP-ID=\"audio\",LANGUAGE=\"en\",NAME=\"english\",DEFAULT=NO,"
+      "CHANNELS=\"8\"\n"
       "\n"
       "#EXT-X-STREAM-INF:BANDWIDTH=400000,AVERAGE-BANDWIDTH=280000,"
       "CODECS=\"videocodec,audiocodec\",RESOLUTION=800x600,AUDIO=\"audio\","
@@ -472,7 +473,7 @@ TEST_F(MasterPlaylistTest, WriteMasterPlaylistVideosAndTexts) {
       "\n"
       "#EXT-X-MEDIA:TYPE=SUBTITLES,URI=\"http://playlists.org/eng.m3u8\","
       "GROUP-ID=\"textgroup\",LANGUAGE=\"en\",NAME=\"english\","
-      "AUTOSELECT=YES\n"
+      "DEFAULT=NO,AUTOSELECT=YES\n"
       "#EXT-X-MEDIA:TYPE=SUBTITLES,URI=\"http://playlists.org/fr.m3u8\","
       "GROUP-ID=\"textgroup\",LANGUAGE=\"fr\",NAME=\"french\",DEFAULT=YES,"
       "AUTOSELECT=YES\n"
@@ -513,8 +514,8 @@ TEST_F(MasterPlaylistTest, WriteMasterPlaylistVideoAndTextWithCharacteritics) {
       "version test\n"
       "\n"
       "#EXT-X-MEDIA:TYPE=SUBTITLES,URI=\"http://playlists.org/eng.m3u8\","
-      "GROUP-ID=\"textgroup\",LANGUAGE=\"en\",NAME=\"english\",AUTOSELECT=YES,"
-      "CHARACTERISTICS=\""
+      "GROUP-ID=\"textgroup\",LANGUAGE=\"en\",NAME=\"english\",DEFAULT=NO,"
+      "AUTOSELECT=YES,CHARACTERISTICS=\""
       "public.accessibility.transcribes-spoken-dialog,public.easy-to-read\"\n"
       "\n"
       "#EXT-X-STREAM-INF:BANDWIDTH=300000,AVERAGE-BANDWIDTH=200000,"
@@ -555,7 +556,7 @@ TEST_F(MasterPlaylistTest, WriteMasterPlaylistVideoAndDvsAudio) {
       "version test\n"
       "\n"
       "#EXT-X-MEDIA:TYPE=AUDIO,URI=\"http://playlists.org/dvs_eng.m3u8\","
-      "GROUP-ID=\"audiogroup\",LANGUAGE=\"en\",NAME=\"DVS english\","
+      "GROUP-ID=\"audiogroup\",LANGUAGE=\"en\",NAME=\"DVS english\",DEFAULT=NO,"
       "AUTOSELECT=YES,CHARACTERISTICS=\"public.accessibility.describes-video\","
       "CHANNELS=\"2\"\n"
       "#EXT-X-MEDIA:TYPE=AUDIO,URI=\"http://playlists.org/eng.m3u8\","
@@ -598,7 +599,7 @@ TEST_F(MasterPlaylistTest, WriteMasterPlaylistVideoAndTextGroups) {
       "\n"
       "#EXT-X-MEDIA:TYPE=SUBTITLES,URI=\"http://playlists.org/eng.m3u8\","
       "GROUP-ID=\"en-text-group\",LANGUAGE=\"en\",NAME=\"english\","
-      "AUTOSELECT=YES\n"
+      "DEFAULT=NO,AUTOSELECT=YES\n"
       "#EXT-X-MEDIA:TYPE=SUBTITLES,URI=\"http://playlists.org/fr.m3u8\","
       "GROUP-ID=\"fr-text-group\",LANGUAGE=\"fr\",NAME=\"french\","
       "DEFAULT=YES,AUTOSELECT=YES\n"
@@ -648,7 +649,7 @@ TEST_F(MasterPlaylistTest, WriteMasterPlaylistVideoAndAudioAndText) {
       "\n"
       "#EXT-X-MEDIA:TYPE=SUBTITLES,URI=\"http://playlists.org/eng.m3u8\","
       "GROUP-ID=\"textgroup\",LANGUAGE=\"en\",NAME=\"english\","
-      "AUTOSELECT=YES\n"
+      "DEFAULT=NO,AUTOSELECT=YES\n"
       "\n"
       "#EXT-X-STREAM-INF:BANDWIDTH=350000,AVERAGE-BANDWIDTH=230000,"
       "CODECS=\"sdvideocodec,audiocodec,textcodec\",RESOLUTION=800x600,"
@@ -720,11 +721,11 @@ TEST_F(MasterPlaylistTest, WriteMasterPlaylistMixedPlaylistsDifferentGroups) {
       "DEFAULT=YES,AUTOSELECT=YES,CHANNELS=\"2\"\n"
       "#EXT-X-MEDIA:TYPE=AUDIO,URI=\"http://playlists.org/audio-2.m3u8\","
       "GROUP-ID=\"audio-group-2\",LANGUAGE=\"fr\",NAME=\"audio 2\","
-      "AUTOSELECT=YES,CHANNELS=\"2\"\n"
+      "DEFAULT=NO,AUTOSELECT=YES,CHANNELS=\"2\"\n"
       "\n"
       "#EXT-X-MEDIA:TYPE=SUBTITLES,URI=\"http://playlists.org/text-1.m3u8\","
       "GROUP-ID=\"text-group-1\",LANGUAGE=\"en\",NAME=\"text 1\","
-      "AUTOSELECT=YES\n"
+      "DEFAULT=NO,AUTOSELECT=YES\n"
       "#EXT-X-MEDIA:TYPE=SUBTITLES,URI=\"http://playlists.org/text-2.m3u8\","
       "GROUP-ID=\"text-group-2\",LANGUAGE=\"fr\",NAME=\"text 2\","
       "DEFAULT=YES,AUTOSELECT=YES\n"
@@ -823,7 +824,7 @@ TEST_F(MasterPlaylistTest, WriteMasterPlaylistAudioOnly) {
       "DEFAULT=YES,AUTOSELECT=YES,CHANNELS=\"2\"\n"
       "#EXT-X-MEDIA:TYPE=AUDIO,URI=\"http://playlists.org/audio-2.m3u8\","
       "GROUP-ID=\"audio-group-2\",LANGUAGE=\"fr\",NAME=\"audio 2\","
-      "AUTOSELECT=YES,CHANNELS=\"2\"\n"
+      "DEFAULT=NO,AUTOSELECT=YES,CHANNELS=\"2\"\n"
       "\n"
       "#EXT-X-STREAM-INF:BANDWIDTH=50000,AVERAGE-BANDWIDTH=30000,"
       "CODECS=\"audiocodec\",AUDIO=\"audio-group-1\",CLOSED-CAPTIONS=NONE\n"