From 3783ffd44b7d31bd2bbeea1aebecf608ac42e2a2 Mon Sep 17 00:00:00 2001 From: David HM Morgan <37144605+david-hm-morgan@users.noreply.github.com> Date: Fri, 14 Jun 2024 20:30:01 +0100 Subject: [PATCH] fix(TTML): Fix timing parsing when using 1dp (#6830) Fixes #6829 --- lib/text/ttml_text_parser.js | 4 ++-- test/text/ttml_text_parser_unit.js | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/lib/text/ttml_text_parser.js b/lib/text/ttml_text_parser.js index b6cd8b586..b7a93adf2 100644 --- a/lib/text/ttml_text_parser.js +++ b/lib/text/ttml_text_parser.js @@ -1336,10 +1336,10 @@ shaka.text.TtmlTextParser.timeColonFormat_ = /^(?:(\d{2,}):)?(\d{2}):(\d{2})$/; /** * @const * @private {!RegExp} - * @example 01:02:43.0345555 or 02:43.03 + * @example 01:02:43.0345555 or 02:43.03 or 02:45.5 */ shaka.text.TtmlTextParser.timeColonFormatMilliseconds_ = - /^(?:(\d{2,}):)?(\d{2}):(\d{2}\.\d{2,})$/; + /^(?:(\d{2,}):)?(\d{2}):(\d{2}\.\d+)$/; /** * @const diff --git a/test/text/ttml_text_parser_unit.js b/test/text/ttml_text_parser_unit.js index b34801c6f..aa8fa607c 100644 --- a/test/text/ttml_text_parser_unit.js +++ b/test/text/ttml_text_parser_unit.js @@ -358,6 +358,18 @@ describe('TtmlTextParser', () => { {startTime: 62.05, endTime: 3723.2}); }); + it('supports colon formatted time with 0 or 1 dp', () => { + verifyHelper( + [ + {startTime: 62, endTime: 3723.2, payload: 'Test'}, + ], + '
' + + '

Test

' + + '
', + {periodStart: 0, segmentStart: 60, segmentEnd: 3730, vttOffset: 0}, + {startTime: 62, endTime: 3723.2}); + }); + it('accounts for offset', () => { verifyHelper( [