avcodec/ass: output missing fields in AVSubtitles and output files

Fixes Ticket #3207

1 files changed, 40 insertions, 40 deletions

diff --git a/tests/ref/fate/sub-srt b/tests/ref/fate/sub-srt
index fa29516..8b5e32b 100644
--- a/tests/ref/fate/sub-srt
+++ b/tests/ref/fate/sub-srt
@@ -4,45 +4,45 @@ PlayResX: 384
 PlayResY: 288

 

 [V4+ Styles]

-Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, AlphaLevel, Encoding

-Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,1,1,0,2,10,10,10,0,0

+Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding

+Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0

 

 [Events]

-Format: Layer, Start, End, Style, Text

-Dialogue: 0,0:00:00.00,0:00:00.00,Default,Don't show this text it may be used to insert hidden data

-Dialogue: 0,0:00:01.50,0:00:04.50,Default,SubRip subtitles capability tester 1.3o by ale5000\N{\b1}{\i1}Use VLC 1.1 or higher as reference for most things and MPC Home Cinema for others{\i0}{\b0}\N{\c&HFF0000&}This text should be blue{\c}\N{\c&HFF&}This text should be red{\c}\N{\c&H0&}This text should be black{\c}\N{\fnWebdings}If you see this with the normal font, the player don't (fully) support font face{\fn}

-Dialogue: 0,0:00:04.50,0:00:04.50,Default,Hidden

-Dialogue: 0,0:00:04.50,0:00:07.50,Default,{\fs8}This text should be small{\fs}\NThis text should be normal\N{\fs35}This text should be big{\fs}

-Dialogue: 0,0:00:07.50,0:00:11.50,Default,This should be an E with an accent: È\N日本語\N{\fs30}{\b1}{\i1}{\u1}This text should be bold, italics and underline{\u0}{\i0}{\b0}{\fs}\N{\fs9}{\c&HFF00&}This text should be small and green{\c}{\fs}\N{\fs9}{\c&HFF&}This text should be small and red{\c}{\fs}\N{\fs24}{\c&H2A2AA5&}This text should be big and brown{\c}{\fs}

-Dialogue: 0,0:00:11.50,0:00:14.50,Default,{\b1}This line should be bold{\b0}\N{\i1}This line should be italics{\i0}\N{\u1}This line should be underline{\u0}\N{\s1}This line should be strikethrough{\s0}\N{\u1}Both lines\Nshould be underline{\u0}

-Dialogue: 0,0:00:14.50,0:00:17.50,Default,>\NIt would be a good thing to\Nhide invalid html tags that are closed and show the text in them\N<invalid_tag_unclosed>but show un-closed invalid html tags\NShow not opened tags</invalid_tag_not_opened>\N<

-Dialogue: 0,0:00:17.50,0:00:20.50,Default,and also\Nhide invalid html tags with parameters that are closed and show the text in them\N<invalid_tag_uc par=5>but show un-closed invalid html tags\N{\u1}This text should be showed underlined without problems also: 2<3,5>1,4<6{\u0}\NThis shouldn't be underlined

-Dialogue: 0,0:00:20.50,0:00:21.50,Default,This text should be in the normal position...

-Dialogue: 0,0:00:21.50,0:00:22.50,Default,{\an1}{\move(0,50,0,100)}This text should NOT be in the normal position

-Dialogue: 0,0:00:22.50,0:00:24.50,Default,Implementation is the same of the ASS tag\N{\an8}This text should be at the\Ntop and horizontally centered

-Dialogue: 0,0:00:22.50,0:00:24.50,Default,{\an5}This text should be at the\Nmiddle and horizontally centered

-Dialogue: 0,0:00:22.50,0:00:24.50,Default,{\an2}This text should be at the\Nbottom and horizontally centered

-Dialogue: 0,0:00:24.50,0:00:26.50,Default,This text should be at the\Ntop and horizontally at the left{\an7}

-Dialogue: 0,0:00:24.50,0:00:26.50,Default,{\an4}This text should be at the\Nmiddle and horizontally at the left\N(The second position must be ignored)

-Dialogue: 0,0:00:24.50,0:00:26.50,Default,{\an1}This text should be at the\Nbottom and horizontally at the left

-Dialogue: 0,0:00:26.50,0:00:28.50,Default,{\an9}This text should be at the\Ntop and horizontally at the right

-Dialogue: 0,0:00:26.50,0:00:28.50,Default,{\an6}This text should be at the\Nmiddle and horizontally at the right

-Dialogue: 0,0:00:26.50,0:00:28.50,Default,{\an3}This text should be at the\Nbottom and horizontally at the right

-Dialogue: 0,0:00:28.50,0:00:31.50,Default,{\fs6}{\c&HFF00&}This could be the {\fs35}m{\c&H0&}o{\c&HFF00&}st{\fs6} difficult thing to implement{\c}{\fs}

-Dialogue: 0,0:00:31.50,0:00:50.50,Default,First text

-Dialogue: 0,0:00:33.50,0:00:35.50,Default,Second, it shouldn't overlap first

-Dialogue: 0,0:00:35.50,0:00:37.50,Default,Third, it should replace second

-Dialogue: 0,0:00:36.50,0:00:50.50,Default,Fourth, it shouldn't overlap first and third

-Dialogue: 0,0:00:40.50,0:00:45.50,Default,Fifth, it should replace third

-Dialogue: 0,0:00:45.50,0:00:50.50,Default,Sixth, it shouldn't be\Nshowed overlapped

-Dialogue: 0,0:00:50.50,0:00:52.50,Default,TEXT 1 (bottom)

-Dialogue: 0,0:00:50.50,0:00:52.50,Default,text 2

-Dialogue: 0,0:00:52.50,0:00:54.50,Default,Hide these tags:\Nalso hide these tags:\Nbut show this: {normal text}

-Dialogue: 0,0:00:54.50,0:01:00.50,Default,{\an8}\N\ N is a forced line break\N\ h is a hard space\NNormal spaces at the start and at the end of the line are trimmed while hard spaces are not trimmed.\NThe\hline\hwill\hnever\hbreak\hautomatically\hright\hbefore\hor\hafter\ha\hhard\hspace.\h:-D

-Dialogue: 0,0:00:54.50,0:00:56.50,Default,{\an1}\N\h\h\h\h\hA (05 hard spaces followed by a letter)\NA (Normal  spaces followed by a letter)\NA (No hard spaces followed by a letter)

-Dialogue: 0,0:00:56.50,0:00:58.50,Default,\h\h\h\h\hA (05 hard spaces followed by a letter)\NA (Normal  spaces followed by a letter)\NA (No hard spaces followed by a letter)\NShow this: \TEST and this: \-)

-Dialogue: 0,0:00:58.50,0:01:00.50,Default,{\an3}\NA letter followed by 05 hard spaces: A\h\h\h\h\h\NA letter followed by normal  spaces: A\NA letter followed by no hard spaces: A\N05 hard  spaces between letters: A\h\h\h\h\hA\N5 normal spaces between letters: A     A\N\N^--Forced line break

-Dialogue: 0,0:01:00.50,0:01:02.50,Default,{\s1}Both line should be strikethrough,\Nyes.{\s0}\NCorrectly closed tags\Nshould be hidden.

-Dialogue: 0,0:01:02.50,0:01:04.50,Default,It shouldn't be strikethrough,\Nnot opened tag showed as text.</s>\NNot opened tag showed as text.</xxxxx>

-Dialogue: 0,0:01:04.50,0:01:06.50,Default,{\s1}Three lines should be strikethrough,\Nyes.\N<yyyy>Not closed tags showed as text

-Dialogue: 0,0:01:06.50,0:01:08.50,Default,{\s1}Both line should be strikethrough but\Nthe wrong closing tag should be showed</b>

+Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text

+Dialogue: 0,0:00:00.00,0:00:00.00,Default,,0,0,0,,Don't show this text it may be used to insert hidden data

+Dialogue: 0,0:00:01.50,0:00:04.50,Default,,0,0,0,,SubRip subtitles capability tester 1.3o by ale5000\N{\b1}{\i1}Use VLC 1.1 or higher as reference for most things and MPC Home Cinema for others{\i0}{\b0}\N{\c&HFF0000&}This text should be blue{\c}\N{\c&HFF&}This text should be red{\c}\N{\c&H0&}This text should be black{\c}\N{\fnWebdings}If you see this with the normal font, the player don't (fully) support font face{\fn}

+Dialogue: 0,0:00:04.50,0:00:04.50,Default,,0,0,0,,Hidden

+Dialogue: 0,0:00:04.50,0:00:07.50,Default,,0,0,0,,{\fs8}This text should be small{\fs}\NThis text should be normal\N{\fs35}This text should be big{\fs}

+Dialogue: 0,0:00:07.50,0:00:11.50,Default,,0,0,0,,This should be an E with an accent: È\N日本語\N{\fs30}{\b1}{\i1}{\u1}This text should be bold, italics and underline{\u0}{\i0}{\b0}{\fs}\N{\fs9}{\c&HFF00&}This text should be small and green{\c}{\fs}\N{\fs9}{\c&HFF&}This text should be small and red{\c}{\fs}\N{\fs24}{\c&H2A2AA5&}This text should be big and brown{\c}{\fs}

+Dialogue: 0,0:00:11.50,0:00:14.50,Default,,0,0,0,,{\b1}This line should be bold{\b0}\N{\i1}This line should be italics{\i0}\N{\u1}This line should be underline{\u0}\N{\s1}This line should be strikethrough{\s0}\N{\u1}Both lines\Nshould be underline{\u0}

+Dialogue: 0,0:00:14.50,0:00:17.50,Default,,0,0,0,,>\NIt would be a good thing to\Nhide invalid html tags that are closed and show the text in them\N<invalid_tag_unclosed>but show un-closed invalid html tags\NShow not opened tags</invalid_tag_not_opened>\N<

+Dialogue: 0,0:00:17.50,0:00:20.50,Default,,0,0,0,,and also\Nhide invalid html tags with parameters that are closed and show the text in them\N<invalid_tag_uc par=5>but show un-closed invalid html tags\N{\u1}This text should be showed underlined without problems also: 2<3,5>1,4<6{\u0}\NThis shouldn't be underlined

+Dialogue: 0,0:00:20.50,0:00:21.50,Default,,0,0,0,,This text should be in the normal position...

+Dialogue: 0,0:00:21.50,0:00:22.50,Default,,0,0,0,,{\an1}{\move(0,50,0,100)}This text should NOT be in the normal position

+Dialogue: 0,0:00:22.50,0:00:24.50,Default,,0,0,0,,Implementation is the same of the ASS tag\N{\an8}This text should be at the\Ntop and horizontally centered

+Dialogue: 0,0:00:22.50,0:00:24.50,Default,,0,0,0,,{\an5}This text should be at the\Nmiddle and horizontally centered

+Dialogue: 0,0:00:22.50,0:00:24.50,Default,,0,0,0,,{\an2}This text should be at the\Nbottom and horizontally centered

+Dialogue: 0,0:00:24.50,0:00:26.50,Default,,0,0,0,,This text should be at the\Ntop and horizontally at the left{\an7}

+Dialogue: 0,0:00:24.50,0:00:26.50,Default,,0,0,0,,{\an4}This text should be at the\Nmiddle and horizontally at the left\N(The second position must be ignored)

+Dialogue: 0,0:00:24.50,0:00:26.50,Default,,0,0,0,,{\an1}This text should be at the\Nbottom and horizontally at the left

+Dialogue: 0,0:00:26.50,0:00:28.50,Default,,0,0,0,,{\an9}This text should be at the\Ntop and horizontally at the right

+Dialogue: 0,0:00:26.50,0:00:28.50,Default,,0,0,0,,{\an6}This text should be at the\Nmiddle and horizontally at the right

+Dialogue: 0,0:00:26.50,0:00:28.50,Default,,0,0,0,,{\an3}This text should be at the\Nbottom and horizontally at the right

+Dialogue: 0,0:00:28.50,0:00:31.50,Default,,0,0,0,,{\fs6}{\c&HFF00&}This could be the {\fs35}m{\c&H0&}o{\c&HFF00&}st{\fs6} difficult thing to implement{\c}{\fs}

+Dialogue: 0,0:00:31.50,0:00:50.50,Default,,0,0,0,,First text

+Dialogue: 0,0:00:33.50,0:00:35.50,Default,,0,0,0,,Second, it shouldn't overlap first

+Dialogue: 0,0:00:35.50,0:00:37.50,Default,,0,0,0,,Third, it should replace second

+Dialogue: 0,0:00:36.50,0:00:50.50,Default,,0,0,0,,Fourth, it shouldn't overlap first and third

+Dialogue: 0,0:00:40.50,0:00:45.50,Default,,0,0,0,,Fifth, it should replace third

+Dialogue: 0,0:00:45.50,0:00:50.50,Default,,0,0,0,,Sixth, it shouldn't be\Nshowed overlapped

+Dialogue: 0,0:00:50.50,0:00:52.50,Default,,0,0,0,,TEXT 1 (bottom)

+Dialogue: 0,0:00:50.50,0:00:52.50,Default,,0,0,0,,text 2

+Dialogue: 0,0:00:52.50,0:00:54.50,Default,,0,0,0,,Hide these tags:\Nalso hide these tags:\Nbut show this: {normal text}

+Dialogue: 0,0:00:54.50,0:01:00.50,Default,,0,0,0,,{\an8}\N\ N is a forced line break\N\ h is a hard space\NNormal spaces at the start and at the end of the line are trimmed while hard spaces are not trimmed.\NThe\hline\hwill\hnever\hbreak\hautomatically\hright\hbefore\hor\hafter\ha\hhard\hspace.\h:-D

+Dialogue: 0,0:00:54.50,0:00:56.50,Default,,0,0,0,,{\an1}\N\h\h\h\h\hA (05 hard spaces followed by a letter)\NA (Normal  spaces followed by a letter)\NA (No hard spaces followed by a letter)

+Dialogue: 0,0:00:56.50,0:00:58.50,Default,,0,0,0,,\h\h\h\h\hA (05 hard spaces followed by a letter)\NA (Normal  spaces followed by a letter)\NA (No hard spaces followed by a letter)\NShow this: \TEST and this: \-)

+Dialogue: 0,0:00:58.50,0:01:00.50,Default,,0,0,0,,{\an3}\NA letter followed by 05 hard spaces: A\h\h\h\h\h\NA letter followed by normal  spaces: A\NA letter followed by no hard spaces: A\N05 hard  spaces between letters: A\h\h\h\h\hA\N5 normal spaces between letters: A     A\N\N^--Forced line break

+Dialogue: 0,0:01:00.50,0:01:02.50,Default,,0,0,0,,{\s1}Both line should be strikethrough,\Nyes.{\s0}\NCorrectly closed tags\Nshould be hidden.

+Dialogue: 0,0:01:02.50,0:01:04.50,Default,,0,0,0,,It shouldn't be strikethrough,\Nnot opened tag showed as text.</s>\NNot opened tag showed as text.</xxxxx>

+Dialogue: 0,0:01:04.50,0:01:06.50,Default,,0,0,0,,{\s1}Three lines should be strikethrough,\Nyes.\N<yyyy>Not closed tags showed as text

+Dialogue: 0,0:01:06.50,0:01:08.50,Default,,0,0,0,,{\s1}Both line should be strikethrough but\Nthe wrong closing tag should be showed</b>