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

fix: TTML generator timestamp millisecond formatting (#1179) 

Fix bug where milliseconds were formatted with two digits instead of
three, resulting in incorrect timestamps in TTML cues.

Fixes #1180
This commit is contained in:
Marcus Spangenberg 2023-07-05 23:28:57 +02:00 committed by GitHub
parent 1ab6818832
commit 494769ca86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 48 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -22,6 +22,7 @@ Chun-da Chen <capitalm.c@gmail.com>
Daniel Cantarín <canta@canta.com.ar> Daniel Cantarín <canta@canta.com.ar>
Dolby Laboratories <*@dolby.com> Dolby Laboratories <*@dolby.com>
Evgeny Zajcev <zevlg@yandex.ru> Evgeny Zajcev <zevlg@yandex.ru>
Eyevinn Technology AB <*@eyevinn.se>
Google Inc. <*@google.com> Google Inc. <*@google.com>
Ivi.ru LLC <*@ivi.ru> Ivi.ru LLC <*@ivi.ru>
Leandro Moreira <leandro.ribeiro.moreira@gmail.com> Leandro Moreira <leandro.ribeiro.moreira@gmail.com>

1
CONTRIBUTORS
View File

@ -39,6 +39,7 @@ Joey Parrish <joeyparrish@google.com>
Kongqun Yang <kqyang@google.com> Kongqun Yang <kqyang@google.com>
Leandro Moreira <leandro.ribeiro.moreira@gmail.com> Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Leo Law <leoltlaw.gh@gmail.com> Leo Law <leoltlaw.gh@gmail.com>
Marcus Spangenberg <marcus.spangenberg@eyevinn.se>
Ole Andre Birkedal <o.birkedal@sportradar.com> Ole Andre Birkedal <o.birkedal@sportradar.com>
Piotr Srebrny <srebrny.piotr@gmail.com> Piotr Srebrny <srebrny.piotr@gmail.com>
Qingquan Wang <wangqq1103@gmail.com> Qingquan Wang <wangqq1103@gmail.com>

2
packager/media/formats/ttml/ttml_generator.cc
View File

@ -29,7 +29,7 @@ std::string ToTtmlTime(int64_t time, int32_t timescale) {
remaining /= 60; remaining /= 60;
const int hr = remaining; 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) { std::string ToTtmlSize(const TextNumber& x, const TextNumber& y) {

69
packager/media/formats/ttml/ttml_generator_unittest.cc
View File

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