diff options
author | Clément Bœsch <u@pkh.me> | 2017-07-29 20:56:25 +0200 |
---|---|---|
committer | Clément Bœsch <u@pkh.me> | 2017-08-01 15:50:00 +0200 |
commit | f0f8da545d80665ae54d51df61e8f6903c85390a (patch) | |
tree | 22fe6bbbabdb2f484fee2ec6cf3835e50bc33f59 /tests/ref/fate/sub-webvttenc | |
parent | b2d9d7226943d6229a17e31714ce5162bdf88b33 (diff) | |
download | ffmpeg-f0f8da545d80665ae54d51df61e8f6903c85390a.tar.gz |
lavc/htmlsubtitles: improve handling broken garbage
This commit switches off forced correct nesting of tags and only keeps
it for font tags. See long explanations in the code for the rationale.
This results in various FATE changes which I'll explain here:
- various swapping in font attributes, this is mostly noise due to the
old reverse stack way of printing them. The new one is more correct as
the last attribute takes over the previous ones.
- unrecognized tags disappears
- invalid tags that were previously displayed aren't anymore (instead,
we have a warning). This is better for the end user
The main benefit of this commit is to be more tolerant to error, leading
to a better handling of badly nested tags or random wrong formatting for
the end user.
Diffstat (limited to 'tests/ref/fate/sub-webvttenc')
-rw-r--r-- | tests/ref/fate/sub-webvttenc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/ref/fate/sub-webvttenc b/tests/ref/fate/sub-webvttenc index ba567c33f6..45ae0b6131 100644 --- a/tests/ref/fate/sub-webvttenc +++ b/tests/ref/fate/sub-webvttenc @@ -39,14 +39,14 @@ should be underline</u> > It would be a good thing to hide invalid html tags that are closed and show the text in them -<invalid_tag_unclosed>but show un-closed invalid html tags -Show not opened tags</invalid_tag_not_opened> +but show un-closed invalid html tags +Show not opened tags < 00:17.501 --> 00:20.500 and also hide invalid html tags with parameters that are closed and show the text in them -<invalid_tag_uc par=5>but show un-closed invalid html tags +but show un-closed invalid html tags <u>This text should be showed underlined without problems also: 2<3,5>1,4<6</u> This shouldn't be underlined @@ -164,14 +164,14 @@ should be hidden. 01:02.501 --> 01:04.500 It shouldn't be strikethrough, -not opened tag showed as text.</s> -Not opened tag showed as text.</xxxxx> +not opened tag showed as text. +Not opened tag showed as text. 01:04.501 --> 01:06.500 Three lines should be strikethrough, yes. -<yyyy>Not closed tags showed as text +Not closed tags showed as text 01:06.501 --> 01:08.500 Both line should be strikethrough but -the wrong closing tag should be showed</b> +the wrong closing tag should be showed |