Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[WEBVTT] Fix missing text alignment tags from output 

Legacy players, e.g. older versions of ExoPlayer, do not handle default webvtt text alignment correctly. Need to specify `align:center` explicitly cues without text alignment for backwards compatibility.

Fixes #925.
This commit is contained in:
Vishal Shah 2021-05-04 22:57:43 -07:00 committed by GitHub
parent 37b16b4091
commit d9124d6aaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
61 changed files with 48 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packager/app/test/testdata/audio-video-with-accessibilities-and-roles/bear-english-text.vtt vendored
View File

@ -3,9 +3,9 @@ WEBVTT
STYLE
::cue { color:lime }
00:00:00.000 --> 00:00:00.800
00:00:00.000 --> 00:00:00.800 align:center
Yup, that's a bear, eh.
00:00:01.000 --> 00:00:04.700
00:00:01.000 --> 00:00:04.700 align:center
He 's... um... doing bear-like stuff.

2
packager/app/test/testdata/audio-video-with-accessibilities-and-roles/output.mpd vendored
View File

@ -23,7 +23,7 @@
</AdaptationSet>
<AdaptationSet id="2" contentType="text" subsegmentAlignment="true">
<Role schemeIdUri="urn:mpeg:dash:role:2011" value="caption"/>
<Representation id="2" bandwidth="273" mimeType="text/vtt">
<Representation id="2" bandwidth="317" mimeType="text/vtt">
<BaseURL>bear-english-text.vtt</BaseURL>
</Representation>
</AdaptationSet>

2
packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-english-text-1.vtt vendored
View File

@ -3,6 +3,6 @@ WEBVTT
STYLE
::cue { color:lime }
00:00:00.000 --> 00:00:00.800
00:00:00.000 --> 00:00:00.800 align:center
Yup, that's a bear, eh.

2
packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-english-text-2.vtt vendored
View File

@ -3,6 +3,6 @@ WEBVTT
STYLE
::cue { color:lime }
00:00:01.000 --> 00:00:04.700
00:00:01.000 --> 00:00:04.700 align:center
He 's... um... doing bear-like stuff.

2
packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-english-text-3.vtt vendored
View File

@ -3,6 +3,6 @@ WEBVTT
STYLE
::cue { color:lime }
00:00:01.000 --> 00:00:04.700
00:00:01.000 --> 00:00:04.700 align:center
He 's... um... doing bear-like stuff.

2
packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-english-text-4.vtt vendored
View File

@ -3,6 +3,6 @@ WEBVTT
STYLE
::cue { color:lime }
00:00:01.000 --> 00:00:04.700
00:00:01.000 --> 00:00:04.700 align:center
He 's... um... doing bear-like stuff.

2
packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-english-text-5.vtt vendored
View File

@ -3,6 +3,6 @@ WEBVTT
STYLE
::cue { color:lime }
00:00:01.000 --> 00:00:04.700
00:00:01.000 --> 00:00:04.700 align:center
He 's... um... doing bear-like stuff.

2
packager/app/test/testdata/hls-audio-video-text-with-ad-cues/bear-english-text-6.vtt vendored
View File

@ -3,6 +3,6 @@ WEBVTT
STYLE
::cue { color:lime }
00:00:01.000 --> 00:00:04.700
00:00:01.000 --> 00:00:04.700 align:center
He 's... um... doing bear-like stuff.

BIN
packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-1.m4s vendored
View File

Binary file not shown.

2
packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-1.vtt vendored
View File

@ -3,6 +3,6 @@ WEBVTT
STYLE
::cue { color:lime }
00:00:00.000 --> 00:00:00.800
00:00:00.000 --> 00:00:00.800 align:center
Yup, that's a bear, eh.

BIN
packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-2.m4s vendored
View File

Binary file not shown.

2
packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-2.vtt vendored
View File

@ -3,6 +3,6 @@ WEBVTT
STYLE
::cue { color:lime }
00:00:01.000 --> 00:00:04.700
00:00:01.000 --> 00:00:04.700 align:center
He 's... um... doing bear-like stuff.

BIN
packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-3.m4s vendored
View File

Binary file not shown.

2
packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-3.vtt vendored
View File

@ -3,6 +3,6 @@ WEBVTT
STYLE
::cue { color:lime }
00:00:01.000 --> 00:00:04.700
00:00:01.000 --> 00:00:04.700 align:center
He 's... um... doing bear-like stuff.

BIN
packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-4.m4s vendored
View File

Binary file not shown.

2
packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-4.vtt vendored
View File

@ -3,6 +3,6 @@ WEBVTT
STYLE
::cue { color:lime }
00:00:01.000 --> 00:00:04.700
00:00:01.000 --> 00:00:04.700 align:center
He 's... um... doing bear-like stuff.

BIN
packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-5.m4s vendored
View File

Binary file not shown.

2
packager/app/test/testdata/hls-only-dash-only-captions/bear-english-text-5.vtt vendored
View File

@ -3,6 +3,6 @@ WEBVTT
STYLE
::cue { color:lime }
00:00:01.000 --> 00:00:04.700
00:00:01.000 --> 00:00:04.700 align:center
He 's... um... doing bear-like stuff.

2
packager/app/test/testdata/hls-only-dash-only-captions/output.mpd vendored
View File

@ -26,7 +26,7 @@
</AdaptationSet>
<AdaptationSet id="2" contentType="text" segmentAlignment="true">
<Role schemeIdUri="urn:mpeg:dash:role:2011" value="subtitle"/>
<Representation id="2" bandwidth="2056" codecs="wvtt" mimeType="application/mp4">
<Representation id="2" bandwidth="2216" codecs="wvtt" 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"/>

2
packager/app/test/testdata/hls-segmented-webvtt/bear-english-text-1.vtt vendored
View File

@ -4,6 +4,6 @@ X-TIMESTAMP-MAP=LOCAL:00:00:00.000,MPEGTS:9000
STYLE
::cue { color:lime }
00:00:00.000 --> 00:00:00.800
00:00:00.000 --> 00:00:00.800 align:center
Yup, that's a bear, eh.

2
packager/app/test/testdata/hls-segmented-webvtt/bear-english-text-2.vtt vendored
View File

@ -4,6 +4,6 @@ X-TIMESTAMP-MAP=LOCAL:00:00:00.000,MPEGTS:9000
STYLE
::cue { color:lime }
00:00:01.000 --> 00:00:04.700
00:00:01.000 --> 00:00:04.700 align:center
He 's... um... doing bear-like stuff.

2
packager/app/test/testdata/hls-segmented-webvtt/bear-english-text-3.vtt vendored
View File

@ -4,6 +4,6 @@ X-TIMESTAMP-MAP=LOCAL:00:00:00.000,MPEGTS:9000
STYLE
::cue { color:lime }
00:00:01.000 --> 00:00:04.700
00:00:01.000 --> 00:00:04.700 align:center
He 's... um... doing bear-like stuff.

2
packager/app/test/testdata/hls-segmented-webvtt/bear-english-text-4.vtt vendored
View File

@ -4,6 +4,6 @@ X-TIMESTAMP-MAP=LOCAL:00:00:00.000,MPEGTS:9000
STYLE
::cue { color:lime }
00:00:01.000 --> 00:00:04.700
00:00:01.000 --> 00:00:04.700 align:center
He 's... um... doing bear-like stuff.

2
packager/app/test/testdata/hls-segmented-webvtt/bear-english-text-5.vtt vendored
View File

@ -4,6 +4,6 @@ X-TIMESTAMP-MAP=LOCAL:00:00:00.000,MPEGTS:9000
STYLE
::cue { color:lime }
00:00:01.000 --> 00:00:04.700
00:00:01.000 --> 00:00:04.700 align:center
He 's... um... doing bear-like stuff.

BIN
packager/app/test/testdata/segmented-webvtt-mp4/bear-english-text-1.m4s vendored
View File

Binary file not shown.

BIN
packager/app/test/testdata/segmented-webvtt-mp4/bear-english-text-2.m4s vendored
View File

Binary file not shown.

BIN
packager/app/test/testdata/segmented-webvtt-mp4/bear-english-text-3.m4s vendored
View File

Binary file not shown.

BIN
packager/app/test/testdata/segmented-webvtt-mp4/bear-english-text-4.m4s vendored
View File

Binary file not shown.

BIN
packager/app/test/testdata/segmented-webvtt-mp4/bear-english-text-5.m4s vendored
View File

Binary file not shown.

2
packager/app/test/testdata/segmented-webvtt-mp4/output.mpd vendored
View File

@ -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="2056" codecs="wvtt" mimeType="application/mp4">
<Representation id="0" bandwidth="2216" codecs="wvtt" 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"/>

2
packager/app/test/testdata/segmented-webvtt-text/bear-english-text-1.vtt vendored
View File

@ -4,6 +4,6 @@ X-TIMESTAMP-MAP=LOCAL:00:00:00.000,MPEGTS:9000
STYLE
::cue { color:lime }
00:00:00.000 --> 00:00:00.800
00:00:00.000 --> 00:00:00.800 align:center
Yup, that's a bear, eh.

2
packager/app/test/testdata/segmented-webvtt-text/bear-english-text-2.vtt vendored
View File

@ -4,6 +4,6 @@ X-TIMESTAMP-MAP=LOCAL:00:00:00.000,MPEGTS:9000
STYLE
::cue { color:lime }
00:00:01.000 --> 00:00:04.700
00:00:01.000 --> 00:00:04.700 align:center
He 's... um... doing bear-like stuff.

2
packager/app/test/testdata/segmented-webvtt-text/bear-english-text-3.vtt vendored
View File

@ -4,6 +4,6 @@ X-TIMESTAMP-MAP=LOCAL:00:00:00.000,MPEGTS:9000
STYLE
::cue { color:lime }
00:00:01.000 --> 00:00:04.700
00:00:01.000 --> 00:00:04.700 align:center
He 's... um... doing bear-like stuff.

2
packager/app/test/testdata/segmented-webvtt-text/bear-english-text-4.vtt vendored
View File

@ -4,6 +4,6 @@ X-TIMESTAMP-MAP=LOCAL:00:00:00.000,MPEGTS:9000
STYLE
::cue { color:lime }
00:00:01.000 --> 00:00:04.700
00:00:01.000 --> 00:00:04.700 align:center
He 's... um... doing bear-like stuff.

2
packager/app/test/testdata/segmented-webvtt-text/bear-english-text-5.vtt vendored
View File

@ -4,6 +4,6 @@ X-TIMESTAMP-MAP=LOCAL:00:00:00.000,MPEGTS:9000
STYLE
::cue { color:lime }
00:00:01.000 --> 00:00:04.700
00:00:01.000 --> 00:00:04.700 align:center
He 's... um... doing bear-like stuff.

2
packager/app/test/testdata/segmented-webvtt-text/output.mpd vendored
View File

@ -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="1216" mimeType="text/vtt">
<Representation id="0" bandwidth="1320" mimeType="text/vtt">
<SegmentTemplate timescale="1000" media="bear-english-text-$Number$.vtt" startNumber="1">
<SegmentTimeline>
<S t="0" d="1000" r="4"/>

BIN
packager/app/test/testdata/segmented-webvtt-with-language-override/bear-english-text-1.m4s vendored
View File

Binary file not shown.

2
packager/app/test/testdata/segmented-webvtt-with-language-override/bear-english-text-1.vtt vendored
View File

@ -3,6 +3,6 @@ WEBVTT
STYLE
::cue { color:lime }
00:00:00.000 --> 00:00:00.800
00:00:00.000 --> 00:00:00.800 align:center
Yup, that's a bear, eh.

BIN
packager/app/test/testdata/segmented-webvtt-with-language-override/bear-english-text-2.m4s vendored
View File

Binary file not shown.

2
packager/app/test/testdata/segmented-webvtt-with-language-override/bear-english-text-2.vtt vendored
View File

@ -3,6 +3,6 @@ WEBVTT
STYLE
::cue { color:lime }
00:00:01.000 --> 00:00:04.700
00:00:01.000 --> 00:00:04.700 align:center
He 's... um... doing bear-like stuff.

BIN
packager/app/test/testdata/segmented-webvtt-with-language-override/bear-english-text-3.m4s vendored
View File

Binary file not shown.

2
packager/app/test/testdata/segmented-webvtt-with-language-override/bear-english-text-3.vtt vendored
View File

@ -3,6 +3,6 @@ WEBVTT
STYLE
::cue { color:lime }
00:00:01.000 --> 00:00:04.700
00:00:01.000 --> 00:00:04.700 align:center
He 's... um... doing bear-like stuff.

BIN
packager/app/test/testdata/segmented-webvtt-with-language-override/bear-english-text-4.m4s vendored
View File

Binary file not shown.

2
packager/app/test/testdata/segmented-webvtt-with-language-override/bear-english-text-4.vtt vendored
View File

@ -3,6 +3,6 @@ WEBVTT
STYLE
::cue { color:lime }
00:00:01.000 --> 00:00:04.700
00:00:01.000 --> 00:00:04.700 align:center
He 's... um... doing bear-like stuff.

BIN
packager/app/test/testdata/segmented-webvtt-with-language-override/bear-english-text-5.m4s vendored
View File

Binary file not shown.

2
packager/app/test/testdata/segmented-webvtt-with-language-override/bear-english-text-5.vtt vendored
View File

@ -3,6 +3,6 @@ WEBVTT
STYLE
::cue { color:lime }
00:00:01.000 --> 00:00:04.700
00:00:01.000 --> 00:00:04.700 align:center
He 's... um... doing bear-like stuff.

2
packager/app/test/testdata/segmented-webvtt-with-language-override/output.mpd vendored
View File

@ -4,7 +4,7 @@
<Period id="0" start="PT0S">
<AdaptationSet id="0" contentType="text" lang="pt" segmentAlignment="true">
<Role schemeIdUri="urn:mpeg:dash:role:2011" value="subtitle"/>
<Representation id="0" bandwidth="2056" codecs="wvtt" mimeType="application/mp4">
<Representation id="0" bandwidth="2216" codecs="wvtt" 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"/>

4
packager/app/test/testdata/single-file-webvtt-text/bear-english-text.vtt vendored
View File

@ -4,9 +4,9 @@ X-TIMESTAMP-MAP=LOCAL:00:00:00.000,MPEGTS:9000
STYLE
::cue { color:lime }
00:00:00.000 --> 00:00:00.800
00:00:00.000 --> 00:00:00.800 align:center
Yup, that's a bear, eh.
00:00:01.000 --> 00:00:04.700
00:00:01.000 --> 00:00:04.700 align:center
He 's... um... doing bear-like stuff.

2
packager/app/test/testdata/single-file-webvtt-text/output.mpd vendored
View File

@ -4,7 +4,7 @@
<Period id="0">
<AdaptationSet id="0" contentType="text" subsegmentAlignment="true">
<Role schemeIdUri="urn:mpeg:dash:role:2011" value="subtitle"/>
<Representation id="0" bandwidth="353" mimeType="text/vtt">
<Representation id="0" bandwidth="397" mimeType="text/vtt">
<BaseURL>bear-english-text.vtt</BaseURL>
</Representation>
</AdaptationSet>

4
packager/app/test/testdata/video-audio-webvtt/bear-english-text.vtt vendored
View File

@ -3,9 +3,9 @@ WEBVTT
STYLE
::cue { color:lime }
00:00:00.000 --> 00:00:00.800
00:00:00.000 --> 00:00:00.800 align:center
Yup, that's a bear, eh.
00:00:01.000 --> 00:00:04.700
00:00:01.000 --> 00:00:04.700 align:center
He 's... um... doing bear-like stuff.

2
packager/app/test/testdata/video-audio-webvtt/output.mpd vendored
View File

@ -21,7 +21,7 @@
</AdaptationSet>
<AdaptationSet id="2" contentType="text" subsegmentAlignment="true">
<Role schemeIdUri="urn:mpeg:dash:role:2011" value="subtitle"/>
<Representation id="2" bandwidth="273" mimeType="text/vtt">
<Representation id="2" bandwidth="317" mimeType="text/vtt">
<BaseURL>bear-english-text.vtt</BaseURL>
</Representation>
</AdaptationSet>

BIN
packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-1.m4s vendored
View File

Binary file not shown.

BIN
packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-2.m4s vendored
View File

Binary file not shown.

BIN
packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-3.m4s vendored
View File

Binary file not shown.

BIN
packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-4.m4s vendored
View File

Binary file not shown.

BIN
packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-5.m4s vendored
View File

Binary file not shown.

BIN
packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/bear-english-text-6.m4s vendored
View File

Binary file not shown.

4
packager/app/test/testdata/vtt-text-to-mp4-with-ad-cues/output.mpd vendored
View File

@ -24,7 +24,7 @@
</AdaptationSet>
<AdaptationSet id="2" contentType="text" segmentAlignment="true">
<Role schemeIdUri="urn:mpeg:dash:role:2011" value="subtitle"/>
<Representation id="2" bandwidth="1944" codecs="wvtt" mimeType="application/mp4">
<Representation id="2" bandwidth="2104" codecs="wvtt" 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="1"/>
@ -56,7 +56,7 @@
</AdaptationSet>
<AdaptationSet id="2" contentType="text" segmentAlignment="true">
<Role schemeIdUri="urn:mpeg:dash:role:2011" value="subtitle"/>
<Representation id="2" bandwidth="2056" codecs="wvtt" mimeType="application/mp4">
<Representation id="2" bandwidth="2216" codecs="wvtt" mimeType="application/mp4">
<SegmentTemplate timescale="1000" presentationTimeOffset="2001" initialization="bear-english-text-init.mp4" media="bear-english-text-$Number$.m4s" startNumber="4">
<SegmentTimeline>
<S t="2001" d="1000" r="2"/>

8
packager/media/formats/webvtt/webvtt_muxer_unittest.cc
View File

@ -83,7 +83,7 @@ TEST_F(WebVttMuxerTest, WithOneSegmentAndWithOneSample) {
const char* kExpectedOutput =
"WEBVTT\n"
"\n"
"00:00:05.000 --> 00:00:06.000\n"
"00:00:05.000 --> 00:00:06.000 align:center\n"
"payload\n"
"\n";
@ -122,14 +122,14 @@ TEST_F(WebVttMuxerTest, WithTwoSegmentAndWithOneSample) {
const char* kExpectedOutput1 =
"WEBVTT\n"
"\n"
"00:00:05.000 --> 00:00:06.000\n"
"00:00:05.000 --> 00:00:06.000 align:center\n"
"payload 1\n"
"\n";
const char* kExpectedOutput2 =
"WEBVTT\n"
"\n"
"00:00:15.000 --> 00:00:16.000\n"
"00:00:15.000 --> 00:00:16.000 align:center\n"
"payload 2\n"
"\n";
@ -189,7 +189,7 @@ TEST_F(WebVttMuxerTest, WithAnEmptySegment) {
const char* kExpectedOutput2 =
"WEBVTT\n"
"\n"
"00:00:15.000 --> 00:00:16.000\n"
"00:00:15.000 --> 00:00:16.000 align:center\n"
"payload 2\n"
"\n";

1
packager/media/formats/webvtt/webvtt_utils.cc
View File

@ -249,6 +249,7 @@ std::string WebVttSettingsToString(const TextSettings& settings) {
ret += " align:right";
break;
case TextAlignment::kCenter:
ret += " align:center";
break;
}

3
packager/media/formats/webvtt/webvtt_utils_unittest.cc
View File

@ -163,9 +163,10 @@ TEST(WebVttUtilsTest, SettingsToString) {
TEST(WebVttUtilsTest, SettingsToString_IgnoresDefaults) {
TextSettings settings;
settings.region = "foo";
settings.text_alignment = TextAlignment::kCenter;
const auto actual = WebVttSettingsToString(settings);
EXPECT_EQ(actual, "region:foo");
EXPECT_EQ(actual, "region:foo align:center");
}
TEST(WebVttUtilsTest, FragmentToString) {