[16/20] tests: Move do_lavf() to fate-run.sh

Message ID 20180920084729.4523-17-diego@biurrun.de
State New
Headers show
Series
  • [01/20] tests: Use more consistent names for tests
Related show

Commit Message

Diego Biurrun Sept. 20, 2018, 8:47 a.m.
---
 tests/fate-run.sh        |  7 ++++++
 tests/fate/avformat.mak  | 53 +++++++++++++++++++++++++++++++------------
 tests/lavf-regression.sh | 59 ------------------------------------------------
 tests/ref/lavf/asf       |  6 ++---
 tests/ref/lavf/avi       |  6 ++---
 tests/ref/lavf/dv        |  6 ++---
 tests/ref/lavf/flv       |  6 ++---
 tests/ref/lavf/gxf       |  6 ++---
 tests/ref/lavf/mkv       |  6 ++---
 tests/ref/lavf/mov       |  6 ++---
 tests/ref/lavf/mpg       |  6 ++---
 tests/ref/lavf/mxf       |  6 ++---
 tests/ref/lavf/mxf_d10   |  6 ++---
 tests/ref/lavf/nut       |  6 ++---
 tests/ref/lavf/swf       |  6 ++---
 tests/ref/lavf/ts        |  6 ++---
 16 files changed, 84 insertions(+), 113 deletions(-)

Comments

Vittorio Giovara Sept. 20, 2018, 11:39 a.m. | #1
On Thu, Sep 20, 2018 at 10:47 AM, Diego Biurrun <diego@biurrun.de> wrote:

> ---
>  tests/fate-run.sh        |  7 ++++++
>  tests/fate/avformat.mak  | 53 +++++++++++++++++++++++++++++++------------
>  tests/lavf-regression.sh | 59 ------------------------------
> ------------------
>  tests/ref/lavf/asf       |  6 ++---
>  tests/ref/lavf/avi       |  6 ++---
>  tests/ref/lavf/dv        |  6 ++---
>  tests/ref/lavf/flv       |  6 ++---
>  tests/ref/lavf/gxf       |  6 ++---
>  tests/ref/lavf/mkv       |  6 ++---
>  tests/ref/lavf/mov       |  6 ++---
>  tests/ref/lavf/mpg       |  6 ++---
>  tests/ref/lavf/mxf       |  6 ++---
>  tests/ref/lavf/mxf_d10   |  6 ++---
>  tests/ref/lavf/nut       |  6 ++---
>  tests/ref/lavf/swf       |  6 ++---
>  tests/ref/lavf/ts        |  6 ++---
>  16 files changed, 84 insertions(+), 113 deletions(-)
>
> diff --git a/tests/fate-run.sh b/tests/fate-run.sh
> index f8c3444e29..d6eb556dae 100755
> --- a/tests/fate-run.sh
> +++ b/tests/fate-run.sh
> -FATE_LAVF-$(call ENCDEC2, MPEG4,      MP2,       NUT)                +=
> nut
>  FATE_LAVF-$(call ENCMUX,  RV10 AC3_FIXED,        RM)                 += rm
> -FATE_LAVF-$(call ENCDEC,  FLV,                   SWF)                +=
> swf
> -FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, MP2,       MPEGTS)             += ts
>  FATE_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER)                               +=
> y4m
>
> +
> +FATE_LAVF_LAVF-$(call ENCDEC2, MSMPEG4V3,  MP2,       ASF)
> += asf
>

LAVF_LAVF? :-/
isn't there a way to prevent this duplication?

diff --git a/tests/ref/lavf/asf b/tests/ref/lavf/asf
> index 9a808d4e9a..ece5beb833 100644
> --- a/tests/ref/lavf/asf
> +++ b/tests/ref/lavf/asf
> @@ -1,3 +1,3 @@
> -33e857a06b2b5dedce0bf76c9973944c *./tests/data/fate/lavf.asf
> -333379 ./tests/data/fate/lavf.asf
> -./tests/data/fate/lavf.asf CRC=0xf6340a10
> +33e857a06b2b5dedce0bf76c9973944c *tests/data/fate/lavf.asf
> +333379 tests/data/fate/lavf.asf
> +tests/data/fate/lavf.asf CRC=0xf6340a10
>

is there a way to avoid having to modify these test files?
or does changing the path (dropping "./") actually matter?
Diego Biurrun Sept. 21, 2018, 12:56 p.m. | #2
On Thu, Sep 20, 2018 at 01:39:20PM +0200, Vittorio Giovara wrote:
> On Thu, Sep 20, 2018 at 10:47 AM, Diego Biurrun <diego@biurrun.de> wrote:
> > --- a/tests/fate-run.sh
> > +++ b/tests/fate-run.sh
> > -FATE_LAVF-$(call ENCDEC2, MPEG4,      MP2,       NUT)                += nut
> >  FATE_LAVF-$(call ENCMUX,  RV10 AC3_FIXED,        RM)                 += rm
> > -FATE_LAVF-$(call ENCDEC,  FLV,                   SWF)                += swf
> > -FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, MP2,       MPEGTS)             += ts
> >  FATE_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER)                               += y4m
> >
> > +
> > +FATE_LAVF_LAVF-$(call ENCDEC2, MSMPEG4V3,  MP2,       ASF)
> > += asf
> 
> LAVF_LAVF? :-/
> isn't there a way to prevent this duplication?

Admittedly, this is not pretty. I'd have to rename the testing function as
well, the Make variables match the testing function names. Suggestions?

> > --- a/tests/ref/lavf/asf
> > +++ b/tests/ref/lavf/asf
> > @@ -1,3 +1,3 @@
> > -33e857a06b2b5dedce0bf76c9973944c *./tests/data/fate/lavf.asf
> > -333379 ./tests/data/fate/lavf.asf
> > -./tests/data/fate/lavf.asf CRC=0xf6340a10
> > +33e857a06b2b5dedce0bf76c9973944c *tests/data/fate/lavf.asf
> > +333379 tests/data/fate/lavf.asf
> > +tests/data/fate/lavf.asf CRC=0xf6340a10
> 
> is there a way to avoid having to modify these test files?

Not really; the "./" is a remnant of the legacy test infrastructure.
All the other reference files do not have it, so I think the change
is actually an improvement.

> or does changing the path (dropping "./") actually matter?

It matters because the files are compared literally, character by character.

Diego
Vittorio Giovara Sept. 21, 2018, 3:28 p.m. | #3
On Fri, Sep 21, 2018 at 2:56 PM, Diego Biurrun <diego@biurrun.de> wrote:

> On Thu, Sep 20, 2018 at 01:39:20PM +0200, Vittorio Giovara wrote:
> > On Thu, Sep 20, 2018 at 10:47 AM, Diego Biurrun <diego@biurrun.de>
> wrote:
> > > --- a/tests/fate-run.sh
> > > +++ b/tests/fate-run.sh
> > > -FATE_LAVF-$(call ENCDEC2, MPEG4,      MP2,       NUT)
> += nut
> > >  FATE_LAVF-$(call ENCMUX,  RV10 AC3_FIXED,        RM)
>  += rm
> > > -FATE_LAVF-$(call ENCDEC,  FLV,                   SWF)
> += swf
> > > -FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, MP2,       MPEGTS)
>  += ts
> > >  FATE_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER)
>  += y4m
> > >
> > > +
> > > +FATE_LAVF_LAVF-$(call ENCDEC2, MSMPEG4V3,  MP2,       ASF)
> > > += asf
> >
> > LAVF_LAVF? :-/
> > isn't there a way to prevent this duplication?
>
> Admittedly, this is not pretty. I'd have to rename the testing function as
> well, the Make variables match the testing function names. Suggestions?
>

IMO renaming as you propose is fine


> > > --- a/tests/ref/lavf/asf
> > > +++ b/tests/ref/lavf/asf
> > > @@ -1,3 +1,3 @@
> > > -33e857a06b2b5dedce0bf76c9973944c *./tests/data/fate/lavf.asf
> > > -333379 ./tests/data/fate/lavf.asf
> > > -./tests/data/fate/lavf.asf CRC=0xf6340a10
> > > +33e857a06b2b5dedce0bf76c9973944c *tests/data/fate/lavf.asf
> > > +333379 tests/data/fate/lavf.asf
> > > +tests/data/fate/lavf.asf CRC=0xf6340a10
> >
> > is there a way to avoid having to modify these test files?
>
> Not really; the "./" is a remnant of the legacy test infrastructure.
> All the other reference files do not have it, so I think the change
> is actually an improvement.
>

ok thanks for clarifying
Diego Biurrun Sept. 21, 2018, 5:06 p.m. | #4
On Fri, Sep 21, 2018 at 05:28:01PM +0200, Vittorio Giovara wrote:
> On Fri, Sep 21, 2018 at 2:56 PM, Diego Biurrun <diego@biurrun.de> wrote:
> > On Thu, Sep 20, 2018 at 01:39:20PM +0200, Vittorio Giovara wrote:
> > > On Thu, Sep 20, 2018 at 10:47 AM, Diego Biurrun <diego@biurrun.de>
> > wrote:
> > > > --- a/tests/fate-run.sh
> > > > +++ b/tests/fate-run.sh
> > > > -FATE_LAVF-$(call ENCDEC2, MPEG4,      MP2,       NUT)
> > += nut
> > > >  FATE_LAVF-$(call ENCMUX,  RV10 AC3_FIXED,        RM)
> >  += rm
> > > > -FATE_LAVF-$(call ENCDEC,  FLV,                   SWF)
> > += swf
> > > > -FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, MP2,       MPEGTS)
> >  += ts
> > > >  FATE_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER)
> >  += y4m
> > > >
> > > > +
> > > > +FATE_LAVF_LAVF-$(call ENCDEC2, MSMPEG4V3,  MP2,       ASF)
> > > > += asf
> > >
> > > LAVF_LAVF? :-/
> > > isn't there a way to prevent this duplication?
> >
> > Admittedly, this is not pretty. I'd have to rename the testing function as
> > well, the Make variables match the testing function names. Suggestions?
> 
> IMO renaming as you propose is fine

I did not propose anything, I am waiting for suggestions ;-)

Diego
Vittorio Giovara Sept. 21, 2018, 6:02 p.m. | #5
On Fri, Sep 21, 2018 at 7:06 PM, Diego Biurrun <diego@biurrun.de> wrote:

> On Fri, Sep 21, 2018 at 05:28:01PM +0200, Vittorio Giovara wrote:
> > On Fri, Sep 21, 2018 at 2:56 PM, Diego Biurrun <diego@biurrun.de> wrote:
> > > On Thu, Sep 20, 2018 at 01:39:20PM +0200, Vittorio Giovara wrote:
> > > > On Thu, Sep 20, 2018 at 10:47 AM, Diego Biurrun <diego@biurrun.de>
> > > wrote:
> > > > > --- a/tests/fate-run.sh
> > > > > +++ b/tests/fate-run.sh
> > > > > -FATE_LAVF-$(call ENCDEC2, MPEG4,      MP2,       NUT)
> > > += nut
> > > > >  FATE_LAVF-$(call ENCMUX,  RV10 AC3_FIXED,        RM)
> > >  += rm
> > > > > -FATE_LAVF-$(call ENCDEC,  FLV,                   SWF)
> > > += swf
> > > > > -FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, MP2,       MPEGTS)
> > >  += ts
> > > > >  FATE_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER)
> > >  += y4m
> > > > >
> > > > > +
> > > > > +FATE_LAVF_LAVF-$(call ENCDEC2, MSMPEG4V3,  MP2,       ASF)
> > > > > += asf
> > > >
> > > > LAVF_LAVF? :-/
> > > > isn't there a way to prevent this duplication?
> > >
> > > Admittedly, this is not pretty. I'd have to rename the testing
> function as
> > > well, the Make variables match the testing function names. Suggestions?
> >
> > IMO renaming as you propose is fine
>
> I did not propose anything, I am waiting for suggestions ;-)
>
>

> I'd have to rename the testing function as
> well, the Make variables match the testing function names.
>

That sounded like a proposal :-p

Patch

diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index f8c3444e29..d6eb556dae 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -206,6 +206,13 @@  image_formats(){
     echo $(wc -c ${outdir}/02.$t)
 }
 
+lavf(){
+    t="${test#lavf-}"
+    file=${outdir}/lavf.$t
+    do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $DEC_OPTS -ar 44100 -f s16le $1 -i $pcm_src $ENC_OPTS -b:a 64k -t 1 -qscale:v 10 $2
+    do_avconv_crc $file $DEC_OPTS -i $target_path/$file $3
+}
+
 streamed_images(){
     t="${test#lavf-}"
     t="${t%pipe}"
diff --git a/tests/fate/avformat.mak b/tests/fate/avformat.mak
index 34292cf03c..026f6e3084 100644
--- a/tests/fate/avformat.mak
+++ b/tests/fate/avformat.mak
@@ -1,20 +1,43 @@ 
-FATE_LAVF-$(call ENCDEC2, MSMPEG4V3,  MP2,       ASF)                += asf
-FATE_LAVF-$(call ENCDEC2, MPEG4,      MP2,       AVI)                += avi
-FATE_LAVF-$(call ENCDEC2, DVVIDEO,    PCM_S16LE, AVI)                += dv
-FATE_LAVF-$(call ENCDEC,  FLV,                   FLV)                += flv
 FATE_LAVF-$(call ENCDEC,  GIF,                   IMAGE2)             += gif
-FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, GXF)                += gxf
-FATE_LAVF-$(call ENCDEC2, MPEG4,      MP2,       MATROSKA)           += mkv
-FATE_LAVF-$(call ENCDEC2, MPEG4,      PCM_ALAW,  MOV)                += mov
-FATE_LAVF-$(call ENCDEC2, MPEG1VIDEO, MP2,       MPEG1SYSTEM MPEGPS) += mpg
-FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF)                += mxf
-FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF_D10 MXF)        += mxf_d10
-FATE_LAVF-$(call ENCDEC2, MPEG4,      MP2,       NUT)                += nut
 FATE_LAVF-$(call ENCMUX,  RV10 AC3_FIXED,        RM)                 += rm
-FATE_LAVF-$(call ENCDEC,  FLV,                   SWF)                += swf
-FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, MP2,       MPEGTS)             += ts
 FATE_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER)                               += y4m
 
+
+FATE_LAVF_LAVF-$(call ENCDEC2, MSMPEG4V3,  MP2,       ASF)                += asf
+FATE_LAVF_LAVF-$(call ENCDEC2, MPEG4,      MP2,       AVI)                += avi
+FATE_LAVF_LAVF-$(call ENCDEC2, DVVIDEO,    PCM_S16LE, AVI)                += dv
+FATE_LAVF_LAVF-$(call ENCDEC,  FLV,                   FLV)                += flv
+FATE_LAVF_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, GXF)                += gxf
+FATE_LAVF_LAVF-$(call ENCDEC2, MPEG4,      MP2,       MATROSKA)           += mkv
+FATE_LAVF_LAVF-$(call ENCDEC2, MPEG4,      PCM_ALAW,  MOV)                += mov
+FATE_LAVF_LAVF-$(call ENCDEC2, MPEG1VIDEO, MP2,       MPEG1SYSTEM MPEGPS) += mpg
+FATE_LAVF_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF)                += mxf
+FATE_LAVF_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF_D10 MXF)        += mxf_d10
+FATE_LAVF_LAVF-$(call ENCDEC2, MPEG4,      MP2,       NUT)                += nut
+FATE_LAVF_LAVF-$(call ENCDEC,  FLV,                   SWF)                += swf
+FATE_LAVF_LAVF-$(call ENCDEC2, MPEG2VIDEO, MP2,       MPEGTS)             += ts
+
+FATE_LAVF_LAVF = $(FATE_LAVF_LAVF-yes:%=fate-lavf-%)
+
+$(FATE_LAVF_LAVF): CMD = lavf
+$(FATE_LAVF_LAVF): REF = $(SRC_PATH)/tests/ref/lavf/$(@:fate-lavf-%=%)
+$(FATE_LAVF_LAVF): $(AREF) $(VREF)
+
+fate-lavf-asf: CMD = lavf "" "-c:a mp2 -ar 44100" "-r 25"
+fate-lavf-avi: CMD = lavf "" "-c:a mp2 -ar 44100"
+fate-lavf-dv:  CMD = lavf "-ar 48000 -channel_layout stereo" "-r 25 -s pal"
+fate-lavf-flv: CMD = lavf "" "-an"
+fate-lavf-gxf: CMD = lavf "-ar 48000" "-r 25 -s pal -ac 1"
+fate-lavf-mkv: CMD = lavf "" "-c:a mp2 -c:v mpeg4 -ar 44100"
+fate-lavf-mov: CMD = lavf "" "-c:a pcm_alaw -c:v mpeg4"
+fate-lavf-mpg: CMD = lavf "" "-ar 44100"
+fate-lavf-mxf: CMD = lavf "-ar 48000" "-bf 2 -timecode_frame_start 264363"
+fate-lavf-mxf_d10: CMD = lavf "-ar 48000 -ac 2" "-r 25 -vf scale=720:576,pad=720:608:0:32 -c:v mpeg2video -g 0 -flags +ildct+low_delay -dc 10 -non_linear_quant 1 -intra_vlc 1 -qscale 1 -ps 1 -qmin 1 -rc_max_vbv_use 1 -rc_min_vbv_use 1 -pix_fmt yuv422p -minrate 30000k -maxrate 30000k -b 30000k -bufsize 1200000 -top 1 -rc_init_occupancy 1200000 -qmax 12 -f mxf_d10"
+fate-lavf-nut: CMD = lavf "" "-c:a mp2 -ar 44100"
+fate-lavf-swf: CMD = lavf "" "-an"
+fate-lavf-ts:  CMD = lavf "" "-mpegts_transport_stream_id 42 -ar 44100"
+
+
 FATE_LAVF_AUDIO_ONLY-$(call ENCDEC,  PCM_S16BE,    AIFF)             += aiff
 FATE_LAVF_AUDIO_ONLY-$(call ENCDEC,  PCM_ALAW,     PCM_ALAW)         += al
 FATE_LAVF_AUDIO_ONLY-$(call ENCDEC,  PCM_S16BE,    AU)               += au
@@ -78,5 +101,5 @@  FATE_LAVF += $(FATE_LAVF-yes:%=fate-lavf-%)
 $(FATE_LAVF): $(AREF) $(VREF)
 $(FATE_LAVF): CMD = lavftest
 
-FATE_AVCONV += $(FATE_LAVF) $(FATE_LAVF_AUDIO_ONLY) $(FATE_LAVF_IMAGES) $(FATE_LAVF_PIPE)
-fate-lavf:     $(FATE_LAVF) $(FATE_LAVF_AUDIO_ONLY) $(FATE_LAVF_IMAGES) $(FATE_LAVF_PIPE)
+FATE_AVCONV += $(FATE_LAVF) $(FATE_LAVF_AUDIO_ONLY) $(FATE_LAVF_IMAGES) $(FATE_LAVF_LAVF) $(FATE_LAVF_PIPE)
+fate-lavf:     $(FATE_LAVF) $(FATE_LAVF_AUDIO_ONLY) $(FATE_LAVF_IMAGES) $(FATE_LAVF_LAVF) $(FATE_LAVF_PIPE)
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
index 8dd4164a94..3d8f46d215 100755
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@ -11,21 +11,6 @@  set -e
 
 eval do_$test=y
 
-do_lavf()
-{
-    file=${outdir}lavf.$test
-    do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $DEC_OPTS -ar 44100 -f s16le $1 -i $pcm_src $ENC_OPTS -b:a 64k -t 1 -qscale:v 10 $2
-    do_avconv_crc $file $DEC_OPTS -i $target_path/$file $3
-}
-
-if [ -n "$do_avi" ] ; then
-do_lavf "" "-c:a mp2 -ar 44100"
-fi
-
-if [ -n "$do_asf" ] ; then
-do_lavf "" "-c:a mp2 -ar 44100" "-r 25"
-fi
-
 if [ -n "$do_rm" ] ; then
 file=${outdir}lavf.rm
 do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $DEC_OPTS -ar 44100 -f s16le -i $pcm_src $ENC_OPTS -t 1 -qscale 10 -c:a ac3_fixed -b:a 64k
@@ -33,50 +18,6 @@  do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $DEC_OPTS -ar 44100
 #do_avconv_crc $file -i $target_path/$file
 fi
 
-if [ -n "$do_mpg" ] ; then
-do_lavf "" "-ar 44100"
-fi
-
-if [ -n "$do_mxf" ] ; then
-do_lavf "-ar 48000" "-bf 2 -timecode_frame_start 264363"
-fi
-
-if [ -n "$do_mxf_d10" ]; then
-do_lavf "-ar 48000 -ac 2" "-r 25 -vf scale=720:576,pad=720:608:0:32 -c:v mpeg2video -g 0 -flags +ildct+low_delay -dc 10 -non_linear_quant 1 -intra_vlc 1 -qscale 1 -ps 1 -qmin 1 -rc_max_vbv_use 1 -rc_min_vbv_use 1 -pix_fmt yuv422p -minrate 30000k -maxrate 30000k -b 30000k -bufsize 1200000 -top 1 -rc_init_occupancy 1200000 -qmax 12 -f mxf_d10"
-fi
-
-if [ -n "$do_ts" ] ; then
-do_lavf "" "-mpegts_transport_stream_id 42 -ar 44100"
-fi
-
-if [ -n "$do_swf" ] ; then
-do_lavf "" "-an"
-fi
-
-if [ -n "$do_flv" ] ; then
-do_lavf "" "-an"
-fi
-
-if [ -n "$do_mov" ] ; then
-do_lavf "" "-c:a pcm_alaw -c:v mpeg4"
-fi
-
-if [ -n "$do_dv" ] ; then
-do_lavf "-ar 48000 -channel_layout stereo" "-r 25 -s pal"
-fi
-
-if [ -n "$do_gxf" ] ; then
-do_lavf "-ar 48000" "-r 25 -s pal -ac 1"
-fi
-
-if [ -n "$do_nut" ] ; then
-do_lavf "" "-c:a mp2 -ar 44100"
-fi
-
-if [ -n "$do_mkv" ] ; then
-do_lavf "" "-c:a mp2 -c:v mpeg4 -ar 44100"
-fi
-
 
 # streamed images
 # mjpeg
diff --git a/tests/ref/lavf/asf b/tests/ref/lavf/asf
index 9a808d4e9a..ece5beb833 100644
--- a/tests/ref/lavf/asf
+++ b/tests/ref/lavf/asf
@@ -1,3 +1,3 @@ 
-33e857a06b2b5dedce0bf76c9973944c *./tests/data/fate/lavf.asf
-333379 ./tests/data/fate/lavf.asf
-./tests/data/fate/lavf.asf CRC=0xf6340a10
+33e857a06b2b5dedce0bf76c9973944c *tests/data/fate/lavf.asf
+333379 tests/data/fate/lavf.asf
+tests/data/fate/lavf.asf CRC=0xf6340a10
diff --git a/tests/ref/lavf/avi b/tests/ref/lavf/avi
index 2d1bc868df..e9d45f9ecd 100644
--- a/tests/ref/lavf/avi
+++ b/tests/ref/lavf/avi
@@ -1,3 +1,3 @@ 
-e2e7b7ceaf038b259558f41df203ded9 *./tests/data/fate/lavf.avi
-330786 ./tests/data/fate/lavf.avi
-./tests/data/fate/lavf.avi CRC=0x4c963cda
+e2e7b7ceaf038b259558f41df203ded9 *tests/data/fate/lavf.avi
+330786 tests/data/fate/lavf.avi
+tests/data/fate/lavf.avi CRC=0x4c963cda
diff --git a/tests/ref/lavf/dv b/tests/ref/lavf/dv
index 4617646f87..848dc54fac 100644
--- a/tests/ref/lavf/dv
+++ b/tests/ref/lavf/dv
@@ -1,3 +1,3 @@ 
-eb51fbb48af28584ea5515f9f2400fcd *./tests/data/fate/lavf.dv
-3600000 ./tests/data/fate/lavf.dv
-./tests/data/fate/lavf.dv CRC=0x0e868a82
+eb51fbb48af28584ea5515f9f2400fcd *tests/data/fate/lavf.dv
+3600000 tests/data/fate/lavf.dv
+tests/data/fate/lavf.dv CRC=0x0e868a82
diff --git a/tests/ref/lavf/flv b/tests/ref/lavf/flv
index 07c0c770cb..6908e12bd2 100644
--- a/tests/ref/lavf/flv
+++ b/tests/ref/lavf/flv
@@ -1,3 +1,3 @@ 
-689e8e53031a2c0793fb5b99fc6f1024 *./tests/data/fate/lavf.flv
-329521 ./tests/data/fate/lavf.flv
-./tests/data/fate/lavf.flv CRC=0x881785d1
+689e8e53031a2c0793fb5b99fc6f1024 *tests/data/fate/lavf.flv
+329521 tests/data/fate/lavf.flv
+tests/data/fate/lavf.flv CRC=0x881785d1
diff --git a/tests/ref/lavf/gxf b/tests/ref/lavf/gxf
index 320c903ee3..099809006a 100644
--- a/tests/ref/lavf/gxf
+++ b/tests/ref/lavf/gxf
@@ -1,3 +1,3 @@ 
-bfc25e31136275aff0f9126610b8a7e4 *./tests/data/fate/lavf.gxf
-796428 ./tests/data/fate/lavf.gxf
-./tests/data/fate/lavf.gxf CRC=0xd04c769f
+bfc25e31136275aff0f9126610b8a7e4 *tests/data/fate/lavf.gxf
+796428 tests/data/fate/lavf.gxf
+tests/data/fate/lavf.gxf CRC=0xd04c769f
diff --git a/tests/ref/lavf/mkv b/tests/ref/lavf/mkv
index 2871a900ac..2239cb08e3 100644
--- a/tests/ref/lavf/mkv
+++ b/tests/ref/lavf/mkv
@@ -1,3 +1,3 @@ 
-dad336329ef85127f97e9d12a3b57a59 *./tests/data/fate/lavf.mkv
-320383 ./tests/data/fate/lavf.mkv
-./tests/data/fate/lavf.mkv CRC=0x63ed3cda
+dad336329ef85127f97e9d12a3b57a59 *tests/data/fate/lavf.mkv
+320383 tests/data/fate/lavf.mkv
+tests/data/fate/lavf.mkv CRC=0x63ed3cda
diff --git a/tests/ref/lavf/mov b/tests/ref/lavf/mov
index 0cdf7ce8a3..25caad24c5 100644
--- a/tests/ref/lavf/mov
+++ b/tests/ref/lavf/mov
@@ -1,3 +1,3 @@ 
-e46f42ed71a589ac356e9cfad4e1e56a *./tests/data/fate/lavf.mov
-356797 ./tests/data/fate/lavf.mov
-./tests/data/fate/lavf.mov CRC=0xe3f4950d
+e46f42ed71a589ac356e9cfad4e1e56a *tests/data/fate/lavf.mov
+356797 tests/data/fate/lavf.mov
+tests/data/fate/lavf.mov CRC=0xe3f4950d
diff --git a/tests/ref/lavf/mpg b/tests/ref/lavf/mpg
index 8063b3342b..0462787eac 100644
--- a/tests/ref/lavf/mpg
+++ b/tests/ref/lavf/mpg
@@ -1,3 +1,3 @@ 
-7df31ba8a5909e3c88b1d1a3f93c4ec2 *./tests/data/fate/lavf.mpg
-372736 ./tests/data/fate/lavf.mpg
-./tests/data/fate/lavf.mpg CRC=0xdd24439e
+7df31ba8a5909e3c88b1d1a3f93c4ec2 *tests/data/fate/lavf.mpg
+372736 tests/data/fate/lavf.mpg
+tests/data/fate/lavf.mpg CRC=0xdd24439e
diff --git a/tests/ref/lavf/mxf b/tests/ref/lavf/mxf
index 08eb6cff94..b0b35833a4 100644
--- a/tests/ref/lavf/mxf
+++ b/tests/ref/lavf/mxf
@@ -1,3 +1,3 @@ 
-7c9efc1b6f5fc65bf39177887512fefd *./tests/data/fate/lavf.mxf
-525881 ./tests/data/fate/lavf.mxf
-./tests/data/fate/lavf.mxf CRC=0x773f059a
+7c9efc1b6f5fc65bf39177887512fefd *tests/data/fate/lavf.mxf
+525881 tests/data/fate/lavf.mxf
+tests/data/fate/lavf.mxf CRC=0x773f059a
diff --git a/tests/ref/lavf/mxf_d10 b/tests/ref/lavf/mxf_d10
index 6923927570..fc7c003d50 100644
--- a/tests/ref/lavf/mxf_d10
+++ b/tests/ref/lavf/mxf_d10
@@ -1,3 +1,3 @@ 
-5fbb6252f6b146cd36d1491ca96ad8a3 *./tests/data/fate/lavf.mxf_d10
-5330989 ./tests/data/fate/lavf.mxf_d10
-./tests/data/fate/lavf.mxf_d10 CRC=0x4474d480
+5fbb6252f6b146cd36d1491ca96ad8a3 *tests/data/fate/lavf.mxf_d10
+5330989 tests/data/fate/lavf.mxf_d10
+tests/data/fate/lavf.mxf_d10 CRC=0x4474d480
diff --git a/tests/ref/lavf/nut b/tests/ref/lavf/nut
index dbfda8a546..9749f64626 100644
--- a/tests/ref/lavf/nut
+++ b/tests/ref/lavf/nut
@@ -1,3 +1,3 @@ 
-d685d5af89cfddb2660f03b1dee3f9a2 *./tests/data/fate/lavf.nut
-319711 ./tests/data/fate/lavf.nut
-./tests/data/fate/lavf.nut CRC=0x4c963cda
+d685d5af89cfddb2660f03b1dee3f9a2 *tests/data/fate/lavf.nut
+319711 tests/data/fate/lavf.nut
+tests/data/fate/lavf.nut CRC=0x4c963cda
diff --git a/tests/ref/lavf/swf b/tests/ref/lavf/swf
index f1d0274c62..a311458ec9 100644
--- a/tests/ref/lavf/swf
+++ b/tests/ref/lavf/swf
@@ -1,3 +1,3 @@ 
-62c5aeb636fc82cf6ba6277d36e42cb5 *./tests/data/fate/lavf.swf
-329479 ./tests/data/fate/lavf.swf
-./tests/data/fate/lavf.swf CRC=0x881785d1
+62c5aeb636fc82cf6ba6277d36e42cb5 *tests/data/fate/lavf.swf
+329479 tests/data/fate/lavf.swf
+tests/data/fate/lavf.swf CRC=0x881785d1
diff --git a/tests/ref/lavf/ts b/tests/ref/lavf/ts
index a8b24e22f6..2d35672a72 100644
--- a/tests/ref/lavf/ts
+++ b/tests/ref/lavf/ts
@@ -1,3 +1,3 @@ 
-7a479525b7dc9264291cb2fc3e1d28e5 *./tests/data/fate/lavf.ts
-406456 ./tests/data/fate/lavf.ts
-./tests/data/fate/lavf.ts CRC=0xb4ca6cdc
+7a479525b7dc9264291cb2fc3e1d28e5 *tests/data/fate/lavf.ts
+406456 tests/data/fate/lavf.ts
+tests/data/fate/lavf.ts CRC=0xb4ca6cdc