[FFmpeg-devel] [PATCH 2/2] tests: make sure subtitles test are run with a rawdiff

[Clément Bœsch]

On Sun, Apr 26, 2015 at 10:30:14PM +0200, Clément Bœsch wrote:
> On Sun, Apr 26, 2015 at 10:18:24PM +0200, Michael Niedermayer wrote:
> > On Sun, Apr 26, 2015 at 10:07:09PM +0200, Michael Niedermayer wrote:
> > > On Sun, Apr 26, 2015 at 08:55:02PM +0200, Clément Bœsch wrote:
> > > > On Sun, Apr 26, 2015 at 08:36:28PM +0200, Michael Niedermayer wrote:
> > > > > On Sun, Apr 26, 2015 at 07:30:59PM +0200, Clément Bœsch wrote:
> > > > > > This will test properly CRLF with make fate and any make fate-sub-*
> > > > > > test. The rawdiff was currently triggered only by make fate-subtitles.
> > > > > > ---
> > > > > >  tests/fate/subtitles.mak | 2 ++
> > > > > >  1 file changed, 2 insertions(+)
> > > > > 
> > > > > fails with:
> > > > > 
> > > > > @@ -4,18 +4,18 @@
> > > > >  PlayResX: 384
> > > > >  PlayResY: 288
> > > > > 
> > > > > -[V4+ Styles]
> > > > > -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,Comic Sans MS,30,&H123456,&H123456,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0
> > > > > -
> > > > > -[Events]
> > > > > -Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
> > > > > -Dialogue: 0,0:00:40.00,0:00:52.00,Default,,0,0,0,,{\c&H345678&}foo{\c}\N{\c&HABCDEF&}bar{\c}\Nbla
> > > > > -Dialogue: 0,0:00:52.00,0:00:56.00,Default,,0,0,0,,{\u1}{\s1}{\i1}{\b1}italic bold underline strike{\s0}{\u0}\Nitalic bold no-underline no-strike
> > > > > -Dialogue: 0,0:00:56.00,0:01:00.00,Default,,0,0,0,,back to
> > > > > -Dialogue: 0,0:01:00.00,0:01:04.00,Default,,0,0,0,,the future
> > > > > -Dialogue: 0,0:01:20.00,0:01:24.92,Default,,0,0,0,,{\pos(10,20)}Some more crazy stuff
> > > > > -Dialogue: 0,0:02:14.00,0:02:15.60,Default,,0,0,0,,this subtitle...
> > > > > +[V4+ Styles]
> > > > > +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,Comic Sans MS,30,&H123456,&H123456,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0
> > > > > +
> > > > > +[Events]
> > > > > +Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
> > > > > +Dialogue: 0,0:00:40.00,0:00:52.00,Default,,0,0,0,,{\c&H345678&}foo{\c}\N{\c&HABCDEF&}bar{\c}\Nbla
> > > > > +Dialogue: 0,0:00:52.00,0:00:56.00,Default,,0,0,0,,{\u1}{\s1}{\i1}{\b1}italic bold underline strike{\s0}{\u0}\Nitalic bold no-underline no-strike
> > > > > +Dialogue: 0,0:00:56.00,0:01:00.00,Default,,0,0,0,,back to
> > > > > +Dialogue: 0,0:01:00.00,0:01:04.00,Default,,0,0,0,,the future
> > > > > +Dialogue: 0,0:01:20.00,0:01:24.92,Default,,0,0,0,,{\pos(10,20)}Some more crazy stuff
> > > > > +Dialogue: 0,0:02:14.00,0:02:15.60,Default,,0,0,0,,this subtitle...
> > > > >  Dialogue: 0,0:02:15.60,0:02:40.00,Default,,0,0,0,,...continues up to...
> > > > >  Dialogue: 0,0:02:40.00,0:03:00.00,Default,,0,0,0,,this one.
> > > > >  Dialogue: 0,0:03:04.00,0:03:12.00,Default,,0,0,0,,and now...
> > > > > 
> > > > 
> > > > Weird, I can't reproduce. I wonder if that's because of the mail layer...
> > > > Can you try https://github.com/ubitux/FFmpeg/compare/microdvd-fate-fix
> > > > instead?
> > > 
> > > yes, that works
> > 
> > fails on mingw
> > 
> > --- /home/michael/ffmpeg-git/ffmpeg/tests/ref/fate/sub-movtextenc       2015-04-26 21:54:27.091838220 +0200
> > +++ tests/data/fate/sub-movtextenc      2015-04-26 22:09:25.663857151 +0200
> > @@ -1 +1 @@
> > -ef264064c522389d0cf267c4d6235561
> > +ef264064c522389d0cf267c4d6235561
> > Test sub-movtextenc failed. Look at tests/data/fate/sub-movtextenc.err for details.
> > 
> 
> Is this better? (also available on my branch)
> 

Sorry, proper patch attached.

-- 
Clément B.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-tests-make-sure-subtitles-test-are-run-with-a-rawdif.patch
Type: text/x-diff
Size: 2711 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20150426/f55d7d14/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 473 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20150426/f55d7d14/attachment.asc>