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.
From d58e72522416d3824e5ca21bfc8896b1e81b6cca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <u...@pkh.me> Date: Sun, 26 Apr 2015 19:29:40 +0200 Subject: [PATCH 2/2] tests: make sure subtitles test are run with a rawdiff This will test properly CRLF with make fate and any make fate-sub-* test. The rawdiff was currently triggered only by make fate-subtitles. Also make sure fate-sub-* only match the tests relying on fmtstdout command, to at least avoid failing on MingW. See https://ffmpeg.org/pipermail/ffmpeg-devel/2015-April/172395.html --- tests/fate/subtitles.mak | 7 ++++--- tests/ref/fate/binsub-movtextenc | 1 + tests/ref/fate/sub-movtextenc | 1 - 3 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 tests/ref/fate/binsub-movtextenc delete mode 100644 tests/ref/fate/sub-movtextenc diff --git a/tests/fate/subtitles.mak b/tests/fate/subtitles.mak index 53cd4cb..07d886a 100644 --- a/tests/fate/subtitles.mak +++ b/tests/fate/subtitles.mak @@ -13,8 +13,8 @@ fate-sub-microdvd-remux: CMD = fmtstdout microdvd -i $(TARGET_SAMPLES)/sub/Micro FATE_SUBTITLES_ASS-$(call DEMDEC, MOV, MOVTEXT) += fate-sub-movtext fate-sub-movtext: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/MovText_capability_tester.mp4 -FATE_SUBTITLES-$(call ENCDEC, MOVTEXT, MOV) += fate-sub-movtextenc -fate-sub-movtextenc: CMD = md5 -i $(TARGET_SAMPLES)/sub/MovText_capability_tester.mp4 -map 0 -scodec mov_text -f mp4 -flags +bitexact -movflags frag_keyframe+empty_moov +FATE_SUBTITLES-$(call ENCDEC, MOVTEXT, MOV) += fate-binsub-movtextenc +fate-binsub-movtextenc: CMD = md5 -i $(TARGET_SAMPLES)/sub/MovText_capability_tester.mp4 -map 0 -scodec mov_text -f mp4 -flags +bitexact -movflags frag_keyframe+empty_moov FATE_SUBTITLES_ASS-$(call DEMDEC, MPL2, MPL2) += fate-sub-mpl2 fate-sub-mpl2: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/MPL2_capability_tester.txt @@ -64,6 +64,7 @@ fate-sub-charenc: CMD = fmtstdout ass -sub_charenc cp1251 -i $(TARGET_SAMPLES)/s FATE_SUBTITLES-$(call ENCMUX, ASS, ASS) += $(FATE_SUBTITLES_ASS-yes) FATE_SUBTITLES += $(FATE_SUBTITLES-yes) +fate-sub-%: CMP = rawdiff + FATE_SAMPLES_FFMPEG += $(FATE_SUBTITLES) -fate-subtitles: CMP = rawdiff fate-subtitles: $(FATE_SUBTITLES) diff --git a/tests/ref/fate/binsub-movtextenc b/tests/ref/fate/binsub-movtextenc new file mode 100644 index 0000000..6efe2c0 --- /dev/null +++ b/tests/ref/fate/binsub-movtextenc @@ -0,0 +1 @@ +ef264064c522389d0cf267c4d6235561 diff --git a/tests/ref/fate/sub-movtextenc b/tests/ref/fate/sub-movtextenc deleted file mode 100644 index 6efe2c0..0000000 --- a/tests/ref/fate/sub-movtextenc +++ /dev/null @@ -1 +0,0 @@ -ef264064c522389d0cf267c4d6235561 -- 2.3.6
pgp0_dVPw939b.pgp
Description: PGP signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
