This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 320b671d054410adf02778b71ba5948ca404473a Author: Ruk Doe <[email protected]> AuthorDate: Sat Oct 10 16:10:24 2026 +0900 Commit: michaelni <[email protected]> CommitDate: Fri Nov 6 04:39:07 2026 +0000 fate/subtitles: add libaribcaption ignore_ruby tests The new sample sub/aribcaption_ruby.ts (1316 bytes, synthetic) is an ARIB STD-B24 profile A caption stream. Small size (SSZ) text is decoded as a ruby region. Caption glyphs are one DRCS pattern and ruby is an alphanumeric character that is never drawn with ignore_ruby, so the results do not depend on installed fonts: t=2s CS + caption t=3s CS + ruby only t=4s CS + ruby line above a caption line t=5s ruby only, without CS With ignore_ruby=1, only CS clears, ruby is not drawn, and a caption that is all skipped ruby without CS produces no event: bitmap: 2s 1 rect, 3s clear, 4s 1 rect (the one caption line) ass, multi rect: 2s, 3s clear, 4s ass, single rect: same events, checked with the dialogue text so the 4s position comes from the caption line, not the skipped ruby above it Before the fixes in this series, the bitmap test overflows the rects array at 4s, the multi rect ass test misses the 3s clear, and the single rect ass test has an extra 5s event and the ruby position. Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]> Claude-Session: https://claude.ai/code/session_01DdDiDRusmi6eD7qSrKBjHb --- tests/fate/subtitles.mak | 10 ++++++++++ .../{sub-aribcaption-clear-ass => sub-aribcaption-ruby-ass} | 5 +++-- ...-aribcaption-clear-ass => sub-aribcaption-ruby-ass-single} | 5 +++-- .../{sub-aribcaption-clear => sub-aribcaption-ruby-bitmap} | 11 ++++++++++- 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/tests/fate/subtitles.mak b/tests/fate/subtitles.mak index 7dbc8b8316..060df3bb0e 100644 --- a/tests/fate/subtitles.mak +++ b/tests/fate/subtitles.mak @@ -180,6 +180,16 @@ FATE_SUBTITLES_ASS-$(call DEMDEC, MPEGTS, LIBARIBCAPTION) += fate-sub-aribcaptio fate-sub-aribcaption-clear-ass: CMD = fmtstdout ass -sub_type ass -font sans-serif -i $(TARGET_SAMPLES)/sub/aribcaption_clear.ts fate-sub-aribcaption-clear-text fate-sub-aribcaption-clear-ass: CMP = diff +# caption, CS + ruby only, CS + ruby above a caption, ruby only without CS; +# with ignore_ruby only CS must clear, and skipped ruby must not be drawn +FATE_SUBTITLES_PROBE-$(call DEMDEC, MPEGTS, LIBARIBCAPTION) += fate-sub-aribcaption-ruby-bitmap +fate-sub-aribcaption-ruby-bitmap: CMD = probeframes -sub_type bitmap -ignore_ruby 1 $(TARGET_SAMPLES)/sub/aribcaption_ruby.ts +FATE_SUBTITLES_ASS-$(call DEMDEC, MPEGTS, LIBARIBCAPTION) += fate-sub-aribcaption-ruby-ass +fate-sub-aribcaption-ruby-ass: CMD = fmtstdout ass -sub_type ass -font sans-serif -ass_single_rect 0 -ignore_ruby 1 -i $(TARGET_SAMPLES)/sub/aribcaption_ruby.ts +FATE_SUBTITLES_ASS-$(call DEMDEC, MPEGTS, LIBARIBCAPTION) += fate-sub-aribcaption-ruby-ass-single +fate-sub-aribcaption-ruby-ass-single: CMD = fmtstdout ass -sub_type ass -font sans-serif -ass_single_rect 1 -ignore_ruby 1 -i $(TARGET_SAMPLES)/sub/aribcaption_ruby.ts +fate-sub-aribcaption-ruby-bitmap fate-sub-aribcaption-ruby-ass fate-sub-aribcaption-ruby-ass-single: CMP = diff + FATE_SUBTITLES-$(call ENCMUX, ASS, ASS) += $(FATE_SUBTITLES_ASS-yes) FATE_SUBTITLES += $(FATE_SUBTITLES-yes) FATE_SUBTITLES := $(if $(CONFIG_PIPE_PROTOCOL), $(FATE_SUBTITLES)) diff --git a/tests/ref/fate/sub-aribcaption-clear-ass b/tests/ref/fate/sub-aribcaption-ruby-ass similarity index 71% copy from tests/ref/fate/sub-aribcaption-clear-ass copy to tests/ref/fate/sub-aribcaption-ruby-ass index eaa595fd0b..135bd8d11b 100644 --- a/tests/ref/fate/sub-aribcaption-clear-ass +++ b/tests/ref/fate/sub-aribcaption-ruby-ass @@ -10,5 +10,6 @@ Style: Default,sans-serif,36,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,4,0,4 [Events] Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text -Dialogue: 0,0:00:01.00,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(200,300)}{\fsp4}{\3a&Hff&}{\4a&Hff&}〓 -Dialogue: 0,0:00:03.00,9:59:59.99,Default,,0,0,0,, +Dialogue: 0,0:00:01.00,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(100,300)}{\fsp4}{\3a&Hff&}{\4a&Hff&}〓 +Dialogue: 0,0:00:02.00,9:59:59.99,Default,,0,0,0,, +Dialogue: 0,0:00:03.00,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(100,300)}{\fsp4}{\3a&Hff&}{\4a&Hff&}〓 diff --git a/tests/ref/fate/sub-aribcaption-clear-ass b/tests/ref/fate/sub-aribcaption-ruby-ass-single similarity index 71% copy from tests/ref/fate/sub-aribcaption-clear-ass copy to tests/ref/fate/sub-aribcaption-ruby-ass-single index eaa595fd0b..135bd8d11b 100644 --- a/tests/ref/fate/sub-aribcaption-clear-ass +++ b/tests/ref/fate/sub-aribcaption-ruby-ass-single @@ -10,5 +10,6 @@ Style: Default,sans-serif,36,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,4,0,4 [Events] Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text -Dialogue: 0,0:00:01.00,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(200,300)}{\fsp4}{\3a&Hff&}{\4a&Hff&}〓 -Dialogue: 0,0:00:03.00,9:59:59.99,Default,,0,0,0,, +Dialogue: 0,0:00:01.00,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(100,300)}{\fsp4}{\3a&Hff&}{\4a&Hff&}〓 +Dialogue: 0,0:00:02.00,9:59:59.99,Default,,0,0,0,, +Dialogue: 0,0:00:03.00,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(100,300)}{\fsp4}{\3a&Hff&}{\4a&Hff&}〓 diff --git a/tests/ref/fate/sub-aribcaption-clear b/tests/ref/fate/sub-aribcaption-ruby-bitmap similarity index 66% copy from tests/ref/fate/sub-aribcaption-clear copy to tests/ref/fate/sub-aribcaption-ruby-bitmap index 8ba75d0220..b5ba9162b9 100644 --- a/tests/ref/fate/sub-aribcaption-clear +++ b/tests/ref/fate/sub-aribcaption-ruby-bitmap @@ -9,10 +9,19 @@ num_rects=1 [/SUBTITLE] [SUBTITLE] media_type=subtitle +pts=3000000 +pts_time=3.000000 +format=0 +start_display_time=0 +end_display_time=4294967295 +num_rects=0 +[/SUBTITLE] +[SUBTITLE] +media_type=subtitle pts=4000000 pts_time=4.000000 format=0 start_display_time=0 end_display_time=4294967295 -num_rects=0 +num_rects=1 [/SUBTITLE] -- To stop receiving notification emails like this one, please contact [email protected]. _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
