[libav-devel] [RFC] the great lavf-tests cleanup

[Diego Biurrun]

Hello world!

I got bored/motivated while travelling a few weeks ago and finally
tackled this thing that I had been planning since forever.

The fate-lavf tests still use the legacy staged shellscript infrastructure
and are not properly managed through the Makefiles. This set fixes that
issue and eliminates the old legacy scripts, resulting in a simpler and
more maintainable test infrastructure.

It also splits the huge monolithic lavf-pixfmt test into small pieces,
resulting in more detailed error messages and a huge speedup when using
multiple cores.

This still has some rough edges here and there that show how the set
evolved initially. I could possibly squash some of the patches. For
example, I could drop the elimination of the silly first arguments
of the do_foo() helper functions and drop the argument as part of
the move to fate-run.sh.

It is, however, ripe for a first round of comments.

Diego

[Diego Biurrun]

This will help refactor the test infrastructure.
---
tests/fate/avformat.mak | 12 ++++++------
tests/fate/seek.mak | 22 +++++++++++-----------
tests/lavf-regression.sh | 18 +++++++++---------
tests/ref/lavf/aiff | 6 +++---
tests/ref/lavf/{alaw => al} | 0
tests/ref/lavf/{dv_fmt => dv} | 0
tests/ref/lavf/{flv_fmt => flv} | 0
tests/ref/lavf/{sunrast => sun} | 0
tests/ref/lavf/{mulaw => ul} | 0
tests/ref/lavf/voc_s16 | 6 +++---
tests/ref/lavf/{yuv4mpeg => y4m} | 0
tests/ref/seek/{lavf-alaw => lavf-al} | 0
tests/ref/seek/{lavf-dv_fmt => lavf-dv} | 0
tests/ref/seek/{lavf-flv_fmt => lavf-flv} | 0
tests/ref/seek/{lavf-mulaw => lavf-ul} | 0
tests/ref/seek/{lavf-yuv4mpeg => lavf-y4m} | 0
16 files changed, 32 insertions(+), 32 deletions(-)
rename tests/ref/lavf/{alaw => al} (100%)
rename tests/ref/lavf/{dv_fmt => dv} (100%)
rename tests/ref/lavf/{flv_fmt => flv} (100%)
rename tests/ref/lavf/{sunrast => sun} (100%)
rename tests/ref/lavf/{mulaw => ul} (100%)
rename tests/ref/lavf/{yuv4mpeg => y4m} (100%)
rename tests/ref/seek/{lavf-alaw => lavf-al} (100%)
rename tests/ref/seek/{lavf-dv_fmt => lavf-dv} (100%)
rename tests/ref/seek/{lavf-flv_fmt => lavf-flv} (100%)
rename tests/ref/seek/{lavf-mulaw => lavf-ul} (100%)
rename tests/ref/seek/{lavf-yuv4mpeg => lavf-y4m} (100%)

diff --git a/tests/fate/avformat.mak b/tests/fate/avformat.mak
index 458ae7cae9..6ffcde3f2b 100644
--- a/tests/fate/avformat.mak
+++ b/tests/fate/avformat.mak
@@ -1,12 +1,12 @@
FATE_LAVF-$(call ENCDEC, PCM_S16BE, AIFF) += aiff
-FATE_LAVF-$(call ENCDEC, PCM_ALAW, PCM_ALAW) += alaw
+FATE_LAVF-$(call ENCDEC, PCM_ALAW, PCM_ALAW) += al
FATE_LAVF-$(call ENCDEC2, MSMPEG4V3, MP2, ASF) += asf
FATE_LAVF-$(call ENCDEC, PCM_S16BE, AU) += au
FATE_LAVF-$(call ENCDEC2, MPEG4, MP2, AVI) += avi
FATE_LAVF-$(call ENCDEC, BMP, IMAGE2) += bmp
FATE_LAVF-$(call ENCDEC, DPX, IMAGE2) += dpx
-FATE_LAVF-$(call ENCDEC2, DVVIDEO, PCM_S16LE, AVI) += dv_fmt
-FATE_LAVF-$(call ENCDEC, FLV, FLV) += flv_fmt
+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 ENCDEC, MJPEG, IMAGE2) += jpg
@@ -14,7 +14,7 @@ FATE_LAVF-$(call ENCDEC2, MPEG4, MP2, MATROSKA) += mkv
FATE_LAVF-$(call ENCDEC, ADPCM_YAMAHA, MMF) += mmf
FATE_LAVF-$(call ENCDEC2, MPEG4, PCM_ALAW, MOV) += mov
FATE_LAVF-$(call ENCDEC2, MPEG1VIDEO, MP2, MPEG1SYSTEM MPEGPS) += mpg
-FATE_LAVF-$(call ENCDEC, PCM_MULAW, PCM_MULAW) += mulaw
+FATE_LAVF-$(call ENCDEC, PCM_MULAW, PCM_MULAW) += ul
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
@@ -31,7 +31,7 @@ FATE_LAVF-$(call ENCMUX, RV10 AC3_FIXED, RM) += rm
FATE_LAVF-$(call ENCDEC, PCM_U8, RSO) += rso
FATE_LAVF-$(call ENCDEC, SGI, IMAGE2) += sgi
FATE_LAVF-$(call ENCDEC, PCM_S16LE, SOX) += sox
-FATE_LAVF-$(call ENCDEC, SUNRAST, IMAGE2) += sunrast
+FATE_LAVF-$(call ENCDEC, SUNRAST, IMAGE2) += sun
FATE_LAVF-$(call ENCDEC, FLV, SWF) += swf
FATE_LAVF-$(call ENCDEC, TARGA, IMAGE2) += tga
FATE_LAVF-$(call ENCDEC, TIFF, IMAGE2) += tiff
@@ -40,7 +40,7 @@ FATE_LAVF-$(call ENCDEC, PCM_U8, VOC) += voc
FATE_LAVF-$(call ENCDEC, PCM_S16LE, VOC) += voc_s16
FATE_LAVF-$(call ENCDEC, PCM_S16LE, WAV) += wav
FATE_LAVF-$(call ENCDEC, XWD, IMAGE2) += xwd
-FATE_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpeg
+FATE_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER) += y4m

FATE_LAVF += $(FATE_LAVF-yes:%=fate-lavf-%)
FATE_LAVF += fate-lavf-pixfmt
diff --git a/tests/fate/seek.mak b/tests/fate/seek.mak
index 60adab2085..c7e56f811a 100644
--- a/tests/fate/seek.mak
+++ b/tests/fate/seek.mak
@@ -145,13 +145,13 @@ FATE_SEEK += $(FATE_SEEK_VSYNTH2-yes:%=fate-seek-vsynth2-%)
# files from fate-lavf

FATE_SEEK_LAVF-$(call ENCDEC, PCM_S16BE, AIFF) += aiff
-FATE_SEEK_LAVF-$(call ENCDEC, PCM_ALAW, PCM_ALAW) += alaw
+FATE_SEEK_LAVF-$(call ENCDEC, PCM_ALAW, PCM_ALAW) += al
FATE_SEEK_LAVF-$(call ENCDEC2, MSMPEG4V3, MP2, ASF) += asf
FATE_SEEK_LAVF-$(call ENCDEC, PCM_S16BE, AU) += au
FATE_SEEK_LAVF-$(call ENCDEC2, MPEG4, MP2, AVI) += avi
FATE_SEEK_LAVF-$(call ENCDEC, BMP, IMAGE2) += bmp
-FATE_SEEK_LAVF-$(call ENCDEC2, DVVIDEO, PCM_S16LE, AVI) += dv_fmt
-FATE_SEEK_LAVF-$(call ENCDEC, FLV, FLV) += flv_fmt
+FATE_SEEK_LAVF-$(call ENCDEC2, DVVIDEO, PCM_S16LE, AVI) += dv
+FATE_SEEK_LAVF-$(call ENCDEC, FLV, FLV) += flv
FATE_SEEK_LAVF-$(call ENCDEC, GIF, IMAGE2) += gif
FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, GXF) += gxf
FATE_SEEK_LAVF-$(call ENCDEC, MJPEG, IMAGE2) += jpg
@@ -159,7 +159,7 @@ FATE_SEEK_LAVF-$(call ENCDEC2, MPEG4, MP2, MATROSKA) += mkv
FATE_SEEK_LAVF-$(call ENCDEC, ADPCM_YAMAHA, MMF) += mmf
FATE_SEEK_LAVF-$(call ENCDEC2, MPEG4, PCM_ALAW, MOV) += mov
FATE_SEEK_LAVF-$(call ENCDEC2, MPEG1VIDEO, MP2, MPEG1SYSTEM MPEGPS) += mpg
-FATE_SEEK_LAVF-$(call ENCDEC, PCM_MULAW, PCM_MULAW) += mulaw
+FATE_SEEK_LAVF-$(call ENCDEC, PCM_MULAW, PCM_MULAW) += ul
FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += mxf
FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF_D10 MXF) += mxf_d10
FATE_SEEK_LAVF-$(call ENCDEC2, MPEG4, MP2, NUT) += nut
@@ -178,16 +178,16 @@ FATE_SEEK_LAVF-$(call ENCDEC, TIFF, IMAGE2) += tiff
FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, MP2, MPEGTS) += ts
FATE_SEEK_LAVF-$(call ENCDEC, PCM_U8, VOC) += voc
FATE_SEEK_LAVF-$(call ENCDEC, PCM_S16LE, WAV) += wav
-FATE_SEEK_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpeg
+FATE_SEEK_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER) += y4m

-fate-seek-lavf-aiff: SRC = lavf/lavf.aif
-fate-seek-lavf-alaw: SRC = lavf/lavf.al
+fate-seek-lavf-aiff: SRC = lavf/lavf.aiff
+fate-seek-lavf-al: SRC = lavf/lavf.al
fate-seek-lavf-asf: SRC = lavf/lavf.asf
fate-seek-lavf-au: SRC = lavf/lavf.au
fate-seek-lavf-avi: SRC = lavf/lavf.avi
fate-seek-lavf-bmp: SRC = images/bmp/%02d.bmp
-fate-seek-lavf-dv_fmt: SRC = lavf/lavf.dv
-fate-seek-lavf-flv_fmt: SRC = lavf/lavf.flv
+fate-seek-lavf-dv: SRC = lavf/lavf.dv
+fate-seek-lavf-flv: SRC = lavf/lavf.flv
fate-seek-lavf-gif: SRC = lavf/lavf.gif
fate-seek-lavf-gxf: SRC = lavf/lavf.gxf
fate-seek-lavf-jpg: SRC = images/jpg/%02d.jpg
@@ -195,7 +195,7 @@ fate-seek-lavf-mkv: SRC = lavf/lavf.mkv
fate-seek-lavf-mmf: SRC = lavf/lavf.mmf
fate-seek-lavf-mov: SRC = lavf/lavf.mov
fate-seek-lavf-mpg: SRC = lavf/lavf.mpg
-fate-seek-lavf-mulaw: SRC = lavf/lavf.ul
+fate-seek-lavf-ul: SRC = lavf/lavf.ul
fate-seek-lavf-mxf: SRC = lavf/lavf.mxf
fate-seek-lavf-mxf_d10: SRC = lavf/lavf.mxf_d10
fate-seek-lavf-nut: SRC = lavf/lavf.nut
@@ -214,7 +214,7 @@ fate-seek-lavf-tiff: SRC = images/tiff/%02d.tiff
fate-seek-lavf-ts: SRC = lavf/lavf.ts
fate-seek-lavf-voc: SRC = lavf/lavf.voc
fate-seek-lavf-wav: SRC = lavf/lavf.wav
-fate-seek-lavf-yuv4mpeg: SRC = lavf/lavf.y4m
+fate-seek-lavf-y4m: SRC = lavf/lavf.y4m

FATE_SEEK += $(FATE_SEEK_LAVF-yes:%=fate-seek-lavf-%)

diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
index fd4f5548d0..18f000bbea 100755
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@ -78,7 +78,7 @@ if [ -n "$do_swf" ] ; then
do_lavf swf "" "-an"
fi

-if [ -n "$do_flv_fmt" ] ; then
+if [ -n "$do_flv" ] ; then
do_lavf flv "" "-an"
fi

@@ -86,7 +86,7 @@ if [ -n "$do_mov" ] ; then
do_lavf mov "" "-c:a pcm_alaw -c:v mpeg4"
fi

-if [ -n "$do_dv_fmt" ] ; then
+if [ -n "$do_dv" ] ; then
do_lavf dv "-ar 48000 -channel_layout stereo" "-r 25 -s pal"
fi

@@ -127,8 +127,8 @@ do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $ENC_OPTS -t 1 -qsca
do_avconv_crc $file $DEC_OPTS -i $target_path/$file -pix_fmt rgb24
fi

-if [ -n "$do_yuv4mpeg" ] ; then
-file=${outfile}lavf.y4m
+if [ -n "$do_y4m" ] ; then
+file=${outfile}lavf.$test
do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $ENC_OPTS -t 1 -qscale 10
#do_avconv_crc $file -i $target_path/$file
fi
@@ -183,7 +183,7 @@ if [ -n "$do_dpx" ] ; then
do_image_formats dpx
fi

-if [ -n "$do_sunrast" ] ; then
+if [ -n "$do_sun" ] ; then
do_image_formats sun
fi

@@ -193,11 +193,11 @@ if [ -n "$do_wav" ] ; then
do_audio_only wav
fi

-if [ -n "$do_alaw" ] ; then
+if [ -n "$do_al" ] ; then
do_audio_only al "" "" "-ar 44100"
fi

-if [ -n "$do_mulaw" ] ; then
+if [ -n "$do_ul" ] ; then
do_audio_only ul "" "" "-ar 44100"
fi

@@ -210,7 +210,7 @@ do_audio_only mmf
fi

if [ -n "$do_aiff" ] ; then
-do_audio_only aif
+do_audio_only aiff
fi

if [ -n "$do_voc" ] ; then
@@ -218,7 +218,7 @@ do_audio_only voc
fi

if [ -n "$do_voc_s16" ] ; then
-do_audio_only s16.voc "-ac 2" "-c:a pcm_s16le"
+do_audio_only voc_s16 "-ac 2" "-c:a pcm_s16le -f voc"
fi

if [ -n "$do_ogg" ] ; then
diff --git a/tests/ref/lavf/aiff b/tests/ref/lavf/aiff
index c713d02909..e0b0edee5e 100644
--- a/tests/ref/lavf/aiff
+++ b/tests/ref/lavf/aiff
@@ -1,3 +1,3 @@
-9d9e55431800bf6aea46a7d67509da4e *./tests/data/lavf/lavf.aif
-88254 ./tests/data/lavf/lavf.aif
-./tests/data/lavf/lavf.aif CRC=0x3a1da17e
+9d9e55431800bf6aea46a7d67509da4e *./tests/data/lavf/lavf.aiff
+88254 ./tests/data/lavf/lavf.aiff
+./tests/data/lavf/lavf.aiff CRC=0x3a1da17e
diff --git a/tests/ref/lavf/alaw b/tests/ref/lavf/al
similarity index 100%
rename from tests/ref/lavf/alaw
rename to tests/ref/lavf/al
diff --git a/tests/ref/lavf/dv_fmt b/tests/ref/lavf/dv
similarity index 100%
rename from tests/ref/lavf/dv_fmt
rename to tests/ref/lavf/dv
diff --git a/tests/ref/lavf/flv_fmt b/tests/ref/lavf/flv
similarity index 100%
rename from tests/ref/lavf/flv_fmt
rename to tests/ref/lavf/flv
diff --git a/tests/ref/lavf/sunrast b/tests/ref/lavf/sun
similarity index 100%
rename from tests/ref/lavf/sunrast
rename to tests/ref/lavf/sun
diff --git a/tests/ref/lavf/mulaw b/tests/ref/lavf/ul
similarity index 100%
rename from tests/ref/lavf/mulaw
rename to tests/ref/lavf/ul
diff --git a/tests/ref/lavf/voc_s16 b/tests/ref/lavf/voc_s16
index deb7999485..776cc163fa 100644
--- a/tests/ref/lavf/voc_s16
+++ b/tests/ref/lavf/voc_s16
@@ -1,3 +1,3 @@
-e55a9c632cfeab90bcfb9ff29a71728c *./tests/data/lavf/lavf.s16.voc
-176613 ./tests/data/lavf/lavf.s16.voc
-./tests/data/lavf/lavf.s16.voc CRC=0xe61e3bd0
+e55a9c632cfeab90bcfb9ff29a71728c *./tests/data/lavf/lavf.voc_s16
+176613 ./tests/data/lavf/lavf.voc_s16
+./tests/data/lavf/lavf.voc_s16 CRC=0xe61e3bd0
diff --git a/tests/ref/lavf/yuv4mpeg b/tests/ref/lavf/y4m
similarity index 100%
rename from tests/ref/lavf/yuv4mpeg
rename to tests/ref/lavf/y4m
diff --git a/tests/ref/seek/lavf-alaw b/tests/ref/seek/lavf-al
similarity index 100%
rename from tests/ref/seek/lavf-alaw
rename to tests/ref/seek/lavf-al
diff --git a/tests/ref/seek/lavf-dv_fmt b/tests/ref/seek/lavf-dv
similarity index 100%
rename from tests/ref/seek/lavf-dv_fmt
rename to tests/ref/seek/lavf-dv
diff --git a/tests/ref/seek/lavf-flv_fmt b/tests/ref/seek/lavf-flv
similarity index 100%
rename from tests/ref/seek/lavf-flv_fmt
rename to tests/ref/seek/lavf-flv
diff --git a/tests/ref/seek/lavf-mulaw b/tests/ref/seek/lavf-ul
similarity index 100%
rename from tests/ref/seek/lavf-mulaw
rename to tests/ref/seek/lavf-ul
diff --git a/tests/ref/seek/lavf-yuv4mpeg b/tests/ref/seek/lavf-y4m
similarity index 100%
rename from tests/ref/seek/lavf-yuv4mpeg
rename to tests/ref/seek/lavf-y4m

[Diego Biurrun]

---
tests/lavf-regression.sh | 2 +-
tests/ref/lavf/y4m | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
index 18f000bbea..fc9869cb9d 100755
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@ -130,7 +130,7 @@ fi
if [ -n "$do_y4m" ] ; then
file=${outfile}lavf.$test
do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $ENC_OPTS -t 1 -qscale 10
-#do_avconv_crc $file -i $target_path/$file
+do_avconv_crc $file -i $target_path/$file
fi

# image formats
diff --git a/tests/ref/lavf/y4m b/tests/ref/lavf/y4m
index 8c1566ea0d..367b37621d 100644
--- a/tests/ref/lavf/y4m
+++ b/tests/ref/lavf/y4m
@@ -1,2 +1,3 @@
ec8178cb152f9cdbfd9cb724d977db2e *./tests/data/lavf/lavf.y4m
3801808 ./tests/data/lavf/lavf.y4m
+./tests/data/lavf/lavf.y4m CRC=0x0a941f26

[Vittorio Giovara]

Post by Diego Biurrun
---
tests/lavf-regression.sh | 2 +-
tests/ref/lavf/y4m | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
index 18f000bbea..fc9869cb9d 100755
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@ -130,7 +130,7 @@ fi
if [ -n "$do_y4m" ] ; then
file=${outfile}lavf.$test
do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $ENC_OPTS -t 1 -qscale 10
-#do_avconv_crc $file -i $target_path/$file
+do_avconv_crc $file -i $target_path/$file
fi
# image formats
diff --git a/tests/ref/lavf/y4m b/tests/ref/lavf/y4m
index 8c1566ea0d..367b37621d 100644
--- a/tests/ref/lavf/y4m
+++ b/tests/ref/lavf/y4m
@@ -1,2 +1,3 @@
ec8178cb152f9cdbfd9cb724d977db2e *./tests/data/lavf/lavf.y4m
3801808 ./tests/data/lavf/lavf.y4m
+./tests/data/lavf/lavf.y4m CRC=0x0a941f26
--

OK. Do you know why it was disabled?

[Diego Biurrun]

Post by Vittorio Giovara

Post by Diego Biurrun
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@ -130,7 +130,7 @@ fi
if [ -n "$do_y4m" ] ; then
file=${outfile}lavf.$test
do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $ENC_OPTS -t 1 -qscale 10
-#do_avconv_crc $file -i $target_path/$file
+do_avconv_crc $file -i $target_path/$file
fi
--- a/tests/ref/lavf/y4m
+++ b/tests/ref/lavf/y4m
@@ -1,2 +1,3 @@
ec8178cb152f9cdbfd9cb724d977db2e *./tests/data/lavf/lavf.y4m
3801808 ./tests/data/lavf/lavf.y4m
+./tests/data/lavf/lavf.y4m CRC=0x0a941f26

OK. Do you know why it was disabled?

It was added disabled back in 2003. I think it passed oracle the last time
around. Notice that the also-disabled lavf-rm CRC test is broken, it gives
different results on many configurations.

Diego

[Diego Biurrun]

---
tests/lavf-regression.sh | 30 +++++++++++++++---------------
tests/regression-funcs.sh | 4 ++--
2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
index fc9869cb9d..5c9a510403 100755
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@ -13,32 +13,32 @@ eval do_$test=y

do_lavf()
{
- file=${outfile}lavf.$1
+ file=${outdir}lavf.$1
do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $DEC_OPTS -ar 44100 -f s16le $2 -i $pcm_src $ENC_OPTS -b:a 64k -t 1 -qscale:v 10 $3
do_avconv_crc $file $DEC_OPTS -i $target_path/$file $4
}

do_streamed_images()
{
- file=${outfile}${1}pipe.$1
+ file=${outdir}${1}pipe.$1
do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src -f image2pipe $ENC_OPTS -t 1 -qscale 10
do_avconv_crc $file $DEC_OPTS -f image2pipe -i $target_path/$file
}

do_image_formats()
{
- outfile="$datadir/images/$1/"
- mkdir -p "$outfile"
- file=${outfile}%02d.$1
+ outdir="$datadir/images/$1/"
+ mkdir -p "$outdir"
+ file=${outdir}%02d.$1
run_avconv $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $2 $ENC_OPTS $3 -frames 12 -y -qscale 10 $target_path/$file
- do_md5sum ${outfile}02.$1
+ do_md5sum ${outdir}02.$1
do_avconv_crc $file $DEC_OPTS $3 -i $target_path/$file
- echo $(wc -c ${outfile}02.$1)
+ echo $(wc -c ${outdir}02.$1)
}

do_audio_only()
{
- file=${outfile}lavf.$1
+ file=${outdir}lavf.$1
do_avconv $file $DEC_OPTS $2 -ar 44100 -f s16le -i $pcm_src $ENC_OPTS -t 1 -qscale 10 $3
do_avconv_crc $file $DEC_OPTS $4 -i $target_path/$file
}
@@ -52,7 +52,7 @@ do_lavf asf "" "-c:a mp2 -ar 44100" "-r 25"
fi

if [ -n "$do_rm" ] ; then
-file=${outfile}lavf.rm
+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
# broken
#do_avconv_crc $file -i $target_path/$file
@@ -105,7 +105,7 @@ fi

# streamed images
# mjpeg
-#file=${outfile}lavf.mjpeg
+#file=${outdir}lavf.mjpeg
#do_avconv $file -t 1 -qscale 10 -f image2 -c:v pgmyuv -i $raw_src
#do_avconv_crc $file -i $target_path/$file

@@ -122,13 +122,13 @@ do_streamed_images ppm
fi

if [ -n "$do_gif" ] ; then
-file=${outfile}lavf.gif
+file=${outdir}lavf.gif
do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $ENC_OPTS -t 1 -qscale 10 -pix_fmt rgb24
do_avconv_crc $file $DEC_OPTS -i $target_path/$file -pix_fmt rgb24
fi

if [ -n "$do_y4m" ] ; then
-file=${outfile}lavf.$test
+file=${outdir}lavf.$test
do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $ENC_OPTS -t 1 -qscale 10
do_avconv_crc $file -i $target_path/$file
fi
@@ -236,13 +236,13 @@ fi
# pix_fmt conversions

if [ -n "$do_pixfmt" ] ; then
-outfile="$datadir/pixfmt/"
-mkdir -p "$outfile"
+outdir="$datadir/pixfmt/"
+mkdir -p "$outdir"
conversions="yuv420p yuv422p yuv444p yuyv422 yuv410p yuv411p yuvj420p \
yuvj422p yuvj444p rgb24 bgr24 rgb32 rgb565 rgb555 gray monow \
monob yuv440p yuvj440p"
for pix_fmt in $conversions ; do
- file=${outfile}${pix_fmt}.yuv
+ file=${outdir}${pix_fmt}.yuv
run_avconv $DEC_OPTS -r 1 -f image2 -c:v pgmyuv -i $raw_src \
$ENC_OPTS -f rawvideo -t 1 -s 352x288 -pix_fmt $pix_fmt $target_path/$raw_dst
do_avconv $file $DEC_OPTS -f rawvideo -s 352x288 -pix_fmt $pix_fmt -i $target_path/$raw_dst \
diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh
index 3728d44980..4dffd55221 100755
--- a/tests/regression-funcs.sh
+++ b/tests/regression-funcs.sh
@@ -16,7 +16,7 @@ datadir="./tests/data"
target_datadir="${target_path}/${datadir}"

this="$test.$test_ref"
-outfile="$datadir/$test_ref/"
+outdir="$datadir/$test_ref/"

# various files
avconv="$target_exec ${target_path}/avconv"
@@ -30,7 +30,7 @@ cleanfiles="$raw_dst $crcfile"
trap 'rm -f -- $cleanfiles' EXIT

mkdir -p "$datadir"
-mkdir -p "$outfile"
+mkdir -p "$outdir"

[ "${V-0}" -gt 0 ] && echov=echov || echov=:

[Diego Biurrun]

---
tests/lavf-regression.sh | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
index 5c9a510403..10fbe4cbeb 100755
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@ -20,7 +20,8 @@ do_lavf()

do_streamed_images()
{
- file=${outdir}${1}pipe.$1
+ t="${test%pipe}"
+ file=${outdir}${t}pipe.$t
do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src -f image2pipe $ENC_OPTS -t 1 -qscale 10
do_avconv_crc $file $DEC_OPTS -f image2pipe -i $target_path/$file
}
@@ -110,15 +111,15 @@ fi
#do_avconv_crc $file -i $target_path/$file

if [ -n "$do_pbmpipe" ] ; then
-do_streamed_images pbm
+do_streamed_images
fi

if [ -n "$do_pgmpipe" ] ; then
-do_streamed_images pgm
+do_streamed_images
fi

if [ -n "$do_ppmpipe" ] ; then
-do_streamed_images ppm
+do_streamed_images
fi

if [ -n "$do_gif" ] ; then

[Diego Biurrun]

---
tests/lavf-regression.sh | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
index 10fbe4cbeb..8eb5bf1fdf 100755
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@ -28,13 +28,13 @@ do_streamed_images()

do_image_formats()
{
- outdir="$datadir/images/$1/"
+ outdir="$datadir/images/$test/"
mkdir -p "$outdir"
- file=${outdir}%02d.$1
- run_avconv $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $2 $ENC_OPTS $3 -frames 12 -y -qscale 10 $target_path/$file
- do_md5sum ${outdir}02.$1
- do_avconv_crc $file $DEC_OPTS $3 -i $target_path/$file
- echo $(wc -c ${outdir}02.$1)
+ file=${outdir}%02d.$test
+ run_avconv $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $1 $ENC_OPTS $2 -frames 12 -y -qscale 10 $target_path/$file
+ do_md5sum ${outdir}02.$test
+ do_avconv_crc $file $DEC_OPTS $2 -i $target_path/$file
+ echo $(wc -c ${outdir}02.$test)
}

do_audio_only()
@@ -137,55 +137,55 @@ fi
# image formats

if [ -n "$do_pgm" ] ; then
-do_image_formats pgm
+do_image_formats
fi

if [ -n "$do_ppm" ] ; then
-do_image_formats ppm
+do_image_formats
fi

if [ -n "$do_png" ] ; then
-do_image_formats png
+do_image_formats
fi

if [ -n "$do_bmp" ] ; then
-do_image_formats bmp
+do_image_formats
fi

if [ -n "$do_tga" ] ; then
-do_image_formats tga
+do_image_formats
fi

if [ -n "$do_tiff" ] ; then
-do_image_formats tiff "-pix_fmt rgb24"
+do_image_formats "-pix_fmt rgb24"
fi

if [ -n "$do_sgi" ] ; then
-do_image_formats sgi
+do_image_formats
fi

if [ -n "$do_jpg" ] ; then
-do_image_formats jpg "-pix_fmt yuvj420p" "-f image2"
+do_image_formats "-pix_fmt yuvj420p" "-f image2"
fi

if [ -n "$do_pam" ] ; then
-do_image_formats pam
+do_image_formats
fi

if [ -n "$do_pcx" ] ; then
-do_image_formats pcx
+do_image_formats
fi

if [ -n "$do_xwd" ] ; then
-do_image_formats xwd
+do_image_formats
fi

if [ -n "$do_dpx" ] ; then
-do_image_formats dpx
+do_image_formats
fi

if [ -n "$do_sun" ] ; then
-do_image_formats sun
+do_image_formats
fi

# audio only

[Diego Biurrun]

---
tests/lavf-regression.sh | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
index 8eb5bf1fdf..992973b37c 100755
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@ -13,9 +13,9 @@ eval do_$test=y

do_lavf()
{
- file=${outdir}lavf.$1
- do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $DEC_OPTS -ar 44100 -f s16le $2 -i $pcm_src $ENC_OPTS -b:a 64k -t 1 -qscale:v 10 $3
- do_avconv_crc $file $DEC_OPTS -i $target_path/$file $4
+ 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
}

do_streamed_images()
@@ -45,11 +45,11 @@ do_audio_only()
}

if [ -n "$do_avi" ] ; then
-do_lavf avi "" "-c:a mp2 -ar 44100"
+do_lavf "" "-c:a mp2 -ar 44100"
fi

if [ -n "$do_asf" ] ; then
-do_lavf asf "" "-c:a mp2 -ar 44100" "-r 25"
+do_lavf "" "-c:a mp2 -ar 44100" "-r 25"
fi

if [ -n "$do_rm" ] ; then
@@ -60,47 +60,47 @@ do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $DEC_OPTS -ar 44100
fi

if [ -n "$do_mpg" ] ; then
-do_lavf mpg "" "-ar 44100"
+do_lavf "" "-ar 44100"
fi

if [ -n "$do_mxf" ] ; then
-do_lavf mxf "-ar 48000" "-bf 2 -timecode_frame_start 264363"
+do_lavf "-ar 48000" "-bf 2 -timecode_frame_start 264363"
fi

if [ -n "$do_mxf_d10" ]; then
-do_lavf mxf_d10 "-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"
+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 ts "" "-mpegts_transport_stream_id 42 -ar 44100"
+do_lavf "" "-mpegts_transport_stream_id 42 -ar 44100"
fi

if [ -n "$do_swf" ] ; then
-do_lavf swf "" "-an"
+do_lavf "" "-an"
fi

if [ -n "$do_flv" ] ; then
-do_lavf flv "" "-an"
+do_lavf "" "-an"
fi

if [ -n "$do_mov" ] ; then
-do_lavf mov "" "-c:a pcm_alaw -c:v mpeg4"
+do_lavf "" "-c:a pcm_alaw -c:v mpeg4"
fi

if [ -n "$do_dv" ] ; then
-do_lavf dv "-ar 48000 -channel_layout stereo" "-r 25 -s pal"
+do_lavf "-ar 48000 -channel_layout stereo" "-r 25 -s pal"
fi

if [ -n "$do_gxf" ] ; then
-do_lavf gxf "-ar 48000" "-r 25 -s pal -ac 1"
+do_lavf "-ar 48000" "-r 25 -s pal -ac 1"
fi

if [ -n "$do_nut" ] ; then
-do_lavf nut "" "-c:a mp2 -ar 44100"
+do_lavf "" "-c:a mp2 -ar 44100"
fi

if [ -n "$do_mkv" ] ; then
-do_lavf mkv "" "-c:a mp2 -c:v mpeg4 -ar 44100"
+do_lavf "" "-c:a mp2 -c:v mpeg4 -ar 44100"
fi

[Diego Biurrun]

---
tests/lavf-regression.sh | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
index 992973b37c..c6fbf68c31 100755
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@ -39,9 +39,9 @@ do_image_formats()

do_audio_only()
{
- file=${outdir}lavf.$1
- do_avconv $file $DEC_OPTS $2 -ar 44100 -f s16le -i $pcm_src $ENC_OPTS -t 1 -qscale 10 $3
- do_avconv_crc $file $DEC_OPTS $4 -i $target_path/$file
+ file=${outdir}lavf.$test
+ do_avconv $file $DEC_OPTS $1 -ar 44100 -f s16le -i $pcm_src $ENC_OPTS -t 1 -qscale 10 $2
+ do_avconv_crc $file $DEC_OPTS $3 -i $target_path/$file
}

if [ -n "$do_avi" ] ; then
@@ -191,47 +191,47 @@ fi
# audio only

if [ -n "$do_wav" ] ; then
-do_audio_only wav
+do_audio_only
fi

if [ -n "$do_al" ] ; then
-do_audio_only al "" "" "-ar 44100"
+do_audio_only "" "" "-ar 44100"
fi

if [ -n "$do_ul" ] ; then
-do_audio_only ul "" "" "-ar 44100"
+do_audio_only "" "" "-ar 44100"
fi

if [ -n "$do_au" ] ; then
-do_audio_only au
+do_audio_only
fi

if [ -n "$do_mmf" ] ; then
-do_audio_only mmf
+do_audio_only
fi

if [ -n "$do_aiff" ] ; then
-do_audio_only aiff
+do_audio_only
fi

if [ -n "$do_voc" ] ; then
-do_audio_only voc
+do_audio_only
fi

if [ -n "$do_voc_s16" ] ; then
-do_audio_only voc_s16 "-ac 2" "-c:a pcm_s16le -f voc"
+do_audio_only "-ac 2" "-c:a pcm_s16le -f voc"
fi

if [ -n "$do_ogg" ] ; then
-do_audio_only ogg "" "-c:a flac"
+do_audio_only "" "-c:a flac"
fi

if [ -n "$do_rso" ] ; then
-do_audio_only rso
+do_audio_only
fi

if [ -n "$do_sox" ] ; then
-do_audio_only sox
+do_audio_only
fi

# pix_fmt conversions

[Diego Biurrun]

---
tests/fate/seek.mak | 55 ++++++++++++++++++++++++-----------------------
tests/ref/lavf/aiff | 6 +++---
tests/ref/lavf/al | 6 +++---
tests/ref/lavf/asf | 6 +++---
tests/ref/lavf/au | 6 +++---
tests/ref/lavf/avi | 6 +++---
tests/ref/lavf/dv | 6 +++---
tests/ref/lavf/flv | 6 +++---
tests/ref/lavf/gif | 6 +++---
tests/ref/lavf/gxf | 6 +++---
tests/ref/lavf/mkv | 6 +++---
tests/ref/lavf/mmf | 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/ogg | 6 +++---
tests/ref/lavf/pbmpipe | 6 +++---
tests/ref/lavf/pgmpipe | 6 +++---
tests/ref/lavf/ppmpipe | 6 +++---
tests/ref/lavf/rm | 4 ++--
tests/ref/lavf/rso | 6 +++---
tests/ref/lavf/sox | 6 +++---
tests/ref/lavf/swf | 6 +++---
tests/ref/lavf/ts | 6 +++---
tests/ref/lavf/ul | 6 +++---
tests/ref/lavf/voc | 6 +++---
tests/ref/lavf/voc_s16 | 6 +++---
tests/ref/lavf/wav | 6 +++---
tests/ref/lavf/y4m | 6 +++---
tests/regression-funcs.sh | 5 +----
32 files changed, 118 insertions(+), 120 deletions(-)

diff --git a/tests/fate/seek.mak b/tests/fate/seek.mak
index c7e56f811a..23adb50254 100644
--- a/tests/fate/seek.mak
+++ b/tests/fate/seek.mak
@@ -180,41 +180,42 @@ FATE_SEEK_LAVF-$(call ENCDEC, PCM_U8, VOC) += voc
FATE_SEEK_LAVF-$(call ENCDEC, PCM_S16LE, WAV) += wav
FATE_SEEK_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER) += y4m

-fate-seek-lavf-aiff: SRC = lavf/lavf.aiff
-fate-seek-lavf-al: SRC = lavf/lavf.al
-fate-seek-lavf-asf: SRC = lavf/lavf.asf
-fate-seek-lavf-au: SRC = lavf/lavf.au
-fate-seek-lavf-avi: SRC = lavf/lavf.avi
+fate-seek-lavf-aiff: SRC = fate/lavf.aiff
+fate-seek-lavf-al: SRC = fate/lavf.al
+fate-seek-lavf-asf: SRC = fate/lavf.asf
+fate-seek-lavf-au: SRC = fate/lavf.au
+fate-seek-lavf-avi: SRC = fate/lavf.avi
+fate-seek-lavf-dv: SRC = fate/lavf.dv
+fate-seek-lavf-flv: SRC = fate/lavf.flv
+fate-seek-lavf-gif: SRC = fate/lavf.gif
+fate-seek-lavf-gxf: SRC = fate/lavf.gxf
+fate-seek-lavf-mkv: SRC = fate/lavf.mkv
+fate-seek-lavf-mmf: SRC = fate/lavf.mmf
+fate-seek-lavf-mov: SRC = fate/lavf.mov
+fate-seek-lavf-mpg: SRC = fate/lavf.mpg
+fate-seek-lavf-mxf: SRC = fate/lavf.mxf
+fate-seek-lavf-mxf_d10: SRC = fate/lavf.mxf_d10
+fate-seek-lavf-nut: SRC = fate/lavf.nut
+fate-seek-lavf-ogg: SRC = fate/lavf.ogg
+fate-seek-lavf-pbmpipe: SRC = fate/pbmpipe.pbm
+fate-seek-lavf-pgmpipe: SRC = fate/pgmpipe.pgm
+fate-seek-lavf-ppmpipe: SRC = fate/ppmpipe.ppm
+fate-seek-lavf-rm: SRC = fate/lavf.rm
+fate-seek-lavf-swf: SRC = fate/lavf.swf
+fate-seek-lavf-ts: SRC = fate/lavf.ts
+fate-seek-lavf-ul: SRC = fate/lavf.ul
+fate-seek-lavf-voc: SRC = fate/lavf.voc
+fate-seek-lavf-wav: SRC = fate/lavf.wav
+fate-seek-lavf-y4m: SRC = fate/lavf.y4m
+
fate-seek-lavf-bmp: SRC = images/bmp/%02d.bmp
-fate-seek-lavf-dv: SRC = lavf/lavf.dv
-fate-seek-lavf-flv: SRC = lavf/lavf.flv
-fate-seek-lavf-gif: SRC = lavf/lavf.gif
-fate-seek-lavf-gxf: SRC = lavf/lavf.gxf
fate-seek-lavf-jpg: SRC = images/jpg/%02d.jpg
-fate-seek-lavf-mkv: SRC = lavf/lavf.mkv
-fate-seek-lavf-mmf: SRC = lavf/lavf.mmf
-fate-seek-lavf-mov: SRC = lavf/lavf.mov
-fate-seek-lavf-mpg: SRC = lavf/lavf.mpg
-fate-seek-lavf-ul: SRC = lavf/lavf.ul
-fate-seek-lavf-mxf: SRC = lavf/lavf.mxf
-fate-seek-lavf-mxf_d10: SRC = lavf/lavf.mxf_d10
-fate-seek-lavf-nut: SRC = lavf/lavf.nut
-fate-seek-lavf-ogg: SRC = lavf/lavf.ogg
-fate-seek-lavf-pbmpipe: SRC = lavf/pbmpipe.pbm
fate-seek-lavf-pcx: SRC = images/pcx/%02d.pcx
fate-seek-lavf-pgm: SRC = images/pgm/%02d.pgm
-fate-seek-lavf-pgmpipe: SRC = lavf/pgmpipe.pgm
fate-seek-lavf-ppm: SRC = images/ppm/%02d.ppm
-fate-seek-lavf-ppmpipe: SRC = lavf/ppmpipe.ppm
-fate-seek-lavf-rm: SRC = lavf/lavf.rm
fate-seek-lavf-sgi: SRC = images/sgi/%02d.sgi
-fate-seek-lavf-swf: SRC = lavf/lavf.swf
fate-seek-lavf-tga: SRC = images/tga/%02d.tga
fate-seek-lavf-tiff: SRC = images/tiff/%02d.tiff
-fate-seek-lavf-ts: SRC = lavf/lavf.ts
-fate-seek-lavf-voc: SRC = lavf/lavf.voc
-fate-seek-lavf-wav: SRC = lavf/lavf.wav
-fate-seek-lavf-y4m: SRC = lavf/lavf.y4m

FATE_SEEK += $(FATE_SEEK_LAVF-yes:%=fate-seek-lavf-%)

diff --git a/tests/ref/lavf/aiff b/tests/ref/lavf/aiff
index e0b0edee5e..4e4c25e2e7 100644
--- a/tests/ref/lavf/aiff
+++ b/tests/ref/lavf/aiff
@@ -1,3 +1,3 @@
-9d9e55431800bf6aea46a7d67509da4e *./tests/data/lavf/lavf.aiff
-88254 ./tests/data/lavf/lavf.aiff
-./tests/data/lavf/lavf.aiff CRC=0x3a1da17e
+9d9e55431800bf6aea46a7d67509da4e *./tests/data/fate/lavf.aiff
+88254 ./tests/data/fate/lavf.aiff
+./tests/data/fate/lavf.aiff CRC=0x3a1da17e
diff --git a/tests/ref/lavf/al b/tests/ref/lavf/al
index d93d6fc0ee..3370149b03 100644
--- a/tests/ref/lavf/al
+++ b/tests/ref/lavf/al
@@ -1,3 +1,3 @@
-652d96e474869ddb01403743deb35117 *./tests/data/lavf/lavf.al
-44100 ./tests/data/lavf/lavf.al
-./tests/data/lavf/lavf.al CRC=0xf9643112
+652d96e474869ddb01403743deb35117 *./tests/data/fate/lavf.al
+44100 ./tests/data/fate/lavf.al
+./tests/data/fate/lavf.al CRC=0xf9643112
diff --git a/tests/ref/lavf/asf b/tests/ref/lavf/asf
index 2178435a52..9a808d4e9a 100644
--- a/tests/ref/lavf/asf
+++ b/tests/ref/lavf/asf
@@ -1,3 +1,3 @@
-33e857a06b2b5dedce0bf76c9973944c *./tests/data/lavf/lavf.asf
-333379 ./tests/data/lavf/lavf.asf
-./tests/data/lavf/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/au b/tests/ref/lavf/au
index 71cfdcb552..d5a4dddc49 100644
--- a/tests/ref/lavf/au
+++ b/tests/ref/lavf/au
@@ -1,3 +1,3 @@
-b9396e3775ea009094e751e7128d614e *./tests/data/lavf/lavf.au
-88224 ./tests/data/lavf/lavf.au
-./tests/data/lavf/lavf.au CRC=0x3a1da17e
+b9396e3775ea009094e751e7128d614e *./tests/data/fate/lavf.au
+88224 ./tests/data/fate/lavf.au
+./tests/data/fate/lavf.au CRC=0x3a1da17e
diff --git a/tests/ref/lavf/avi b/tests/ref/lavf/avi
index 08ae04206d..2d1bc868df 100644
--- a/tests/ref/lavf/avi
+++ b/tests/ref/lavf/avi
@@ -1,3 +1,3 @@
-e2e7b7ceaf038b259558f41df203ded9 *./tests/data/lavf/lavf.avi
-330786 ./tests/data/lavf/lavf.avi
-./tests/data/lavf/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 c2b7335001..4617646f87 100644
--- a/tests/ref/lavf/dv
+++ b/tests/ref/lavf/dv
@@ -1,3 +1,3 @@
-eb51fbb48af28584ea5515f9f2400fcd *./tests/data/lavf/lavf.dv
-3600000 ./tests/data/lavf/lavf.dv
-./tests/data/lavf/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 3414d1314c..07c0c770cb 100644
--- a/tests/ref/lavf/flv
+++ b/tests/ref/lavf/flv
@@ -1,3 +1,3 @@
-689e8e53031a2c0793fb5b99fc6f1024 *./tests/data/lavf/lavf.flv
-329521 ./tests/data/lavf/lavf.flv
-./tests/data/lavf/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/gif b/tests/ref/lavf/gif
index 4a4ebfb9dc..ca6eb1c1fd 100644
--- a/tests/ref/lavf/gif
+++ b/tests/ref/lavf/gif
@@ -1,3 +1,3 @@
-e6089fd4ef3b9df44090ab3650bdd810 *./tests/data/lavf/lavf.gif
-2906401 ./tests/data/lavf/lavf.gif
-./tests/data/lavf/lavf.gif CRC=0xe5605ff6
+e6089fd4ef3b9df44090ab3650bdd810 *./tests/data/fate/lavf.gif
+2906401 ./tests/data/fate/lavf.gif
+./tests/data/fate/lavf.gif CRC=0xe5605ff6
diff --git a/tests/ref/lavf/gxf b/tests/ref/lavf/gxf
index a390a070fc..320c903ee3 100644
--- a/tests/ref/lavf/gxf
+++ b/tests/ref/lavf/gxf
@@ -1,3 +1,3 @@
-bfc25e31136275aff0f9126610b8a7e4 *./tests/data/lavf/lavf.gxf
-796428 ./tests/data/lavf/lavf.gxf
-./tests/data/lavf/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 04c5f3cac2..2871a900ac 100644
--- a/tests/ref/lavf/mkv
+++ b/tests/ref/lavf/mkv
@@ -1,3 +1,3 @@
-dad336329ef85127f97e9d12a3b57a59 *./tests/data/lavf/lavf.mkv
-320383 ./tests/data/lavf/lavf.mkv
-./tests/data/lavf/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/mmf b/tests/ref/lavf/mmf
index 947abc746b..89538c4751 100644
--- a/tests/ref/lavf/mmf
+++ b/tests/ref/lavf/mmf
@@ -1,3 +1,3 @@
-1a3bbf19a41668c1e928bcafce88ff3e *./tests/data/lavf/lavf.mmf
-22617 ./tests/data/lavf/lavf.mmf
-./tests/data/lavf/lavf.mmf CRC=0x8dea1388
+1a3bbf19a41668c1e928bcafce88ff3e *./tests/data/fate/lavf.mmf
+22617 ./tests/data/fate/lavf.mmf
+./tests/data/fate/lavf.mmf CRC=0x8dea1388
diff --git a/tests/ref/lavf/mov b/tests/ref/lavf/mov
index f34a006fb4..0cdf7ce8a3 100644
--- a/tests/ref/lavf/mov
+++ b/tests/ref/lavf/mov
@@ -1,3 +1,3 @@
-e46f42ed71a589ac356e9cfad4e1e56a *./tests/data/lavf/lavf.mov
-356797 ./tests/data/lavf/lavf.mov
-./tests/data/lavf/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 e4c8ae0c17..8063b3342b 100644
--- a/tests/ref/lavf/mpg
+++ b/tests/ref/lavf/mpg
@@ -1,3 +1,3 @@
-7df31ba8a5909e3c88b1d1a3f93c4ec2 *./tests/data/lavf/lavf.mpg
-372736 ./tests/data/lavf/lavf.mpg
-./tests/data/lavf/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 105e33a3e2..08eb6cff94 100644
--- a/tests/ref/lavf/mxf
+++ b/tests/ref/lavf/mxf
@@ -1,3 +1,3 @@
-7c9efc1b6f5fc65bf39177887512fefd *./tests/data/lavf/lavf.mxf
-525881 ./tests/data/lavf/lavf.mxf
-./tests/data/lavf/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 74991a5750..6923927570 100644
--- a/tests/ref/lavf/mxf_d10
+++ b/tests/ref/lavf/mxf_d10
@@ -1,3 +1,3 @@
-5fbb6252f6b146cd36d1491ca96ad8a3 *./tests/data/lavf/lavf.mxf_d10
-5330989 ./tests/data/lavf/lavf.mxf_d10
-./tests/data/lavf/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 bdbe8232ef..dbfda8a546 100644
--- a/tests/ref/lavf/nut
+++ b/tests/ref/lavf/nut
@@ -1,3 +1,3 @@
-d685d5af89cfddb2660f03b1dee3f9a2 *./tests/data/lavf/lavf.nut
-319711 ./tests/data/lavf/lavf.nut
-./tests/data/lavf/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/ogg b/tests/ref/lavf/ogg
index ea827acd4c..0c35085358 100644
--- a/tests/ref/lavf/ogg
+++ b/tests/ref/lavf/ogg
@@ -1,3 +1,3 @@
-8ca901bc8d24b80ebe79e387e454d1e9 *./tests/data/lavf/lavf.ogg
-13476 ./tests/data/lavf/lavf.ogg
-./tests/data/lavf/lavf.ogg CRC=0x3a1da17e
+8ca901bc8d24b80ebe79e387e454d1e9 *./tests/data/fate/lavf.ogg
+13476 ./tests/data/fate/lavf.ogg
+./tests/data/fate/lavf.ogg CRC=0x3a1da17e
diff --git a/tests/ref/lavf/pbmpipe b/tests/ref/lavf/pbmpipe
index d50ed716bc..d1c56dbcf2 100644
--- a/tests/ref/lavf/pbmpipe
+++ b/tests/ref/lavf/pbmpipe
@@ -1,3 +1,3 @@
-8ced96f5b6b7362358199ae993b4ceb7 *./tests/data/lavf/pbmpipe.pbm
-317075 ./tests/data/lavf/pbmpipe.pbm
-./tests/data/lavf/pbmpipe.pbm CRC=0xfae0a1ba
+8ced96f5b6b7362358199ae993b4ceb7 *./tests/data/fate/pbmpipe.pbm
+317075 ./tests/data/fate/pbmpipe.pbm
+./tests/data/fate/pbmpipe.pbm CRC=0xfae0a1ba
diff --git a/tests/ref/lavf/pgmpipe b/tests/ref/lavf/pgmpipe
index 28ad60ea59..a6aa06134a 100644
--- a/tests/ref/lavf/pgmpipe
+++ b/tests/ref/lavf/pgmpipe
@@ -1,3 +1,3 @@
-04e66c8e9e064c8310bd657ee559bd70 *./tests/data/lavf/pgmpipe.pgm
-2534775 ./tests/data/lavf/pgmpipe.pgm
-./tests/data/lavf/pgmpipe.pgm CRC=0xadf48ba9
+04e66c8e9e064c8310bd657ee559bd70 *./tests/data/fate/pgmpipe.pgm
+2534775 ./tests/data/fate/pgmpipe.pgm
+./tests/data/fate/pgmpipe.pgm CRC=0xadf48ba9
diff --git a/tests/ref/lavf/ppmpipe b/tests/ref/lavf/ppmpipe
index b703e16e50..1d86ce4100 100644
--- a/tests/ref/lavf/ppmpipe
+++ b/tests/ref/lavf/ppmpipe
@@ -1,3 +1,3 @@
-74f1f6651ad8f192a7b4c11c2b6c71e5 *./tests/data/lavf/ppmpipe.ppm
-7603575 ./tests/data/lavf/ppmpipe.ppm
-./tests/data/lavf/ppmpipe.ppm CRC=0x87b3c15f
+74f1f6651ad8f192a7b4c11c2b6c71e5 *./tests/data/fate/ppmpipe.ppm
+7603575 ./tests/data/fate/ppmpipe.ppm
+./tests/data/fate/ppmpipe.ppm CRC=0x87b3c15f
diff --git a/tests/ref/lavf/rm b/tests/ref/lavf/rm
index 993310d4e3..4793d67e75 100644
--- a/tests/ref/lavf/rm
+++ b/tests/ref/lavf/rm
@@ -1,2 +1,2 @@
-9eeb3b91c0a45f519fd7f2efea882cf4 *./tests/data/lavf/lavf.rm
-346414 ./tests/data/lavf/lavf.rm
+9eeb3b91c0a45f519fd7f2efea882cf4 *./tests/data/fate/lavf.rm
+346414 ./tests/data/fate/lavf.rm
diff --git a/tests/ref/lavf/rso b/tests/ref/lavf/rso
index 5878f434a1..a7b88904a6 100644
--- a/tests/ref/lavf/rso
+++ b/tests/ref/lavf/rso
@@ -1,3 +1,3 @@
-443b72346065d6318ca18c8395aa1d87 *./tests/data/lavf/lavf.rso
-44108 ./tests/data/lavf/lavf.rso
-./tests/data/lavf/lavf.rso CRC=0x298fd284
+443b72346065d6318ca18c8395aa1d87 *./tests/data/fate/lavf.rso
+44108 ./tests/data/fate/lavf.rso
+./tests/data/fate/lavf.rso CRC=0x298fd284
diff --git a/tests/ref/lavf/sox b/tests/ref/lavf/sox
index fc368b1357..3e4c291333 100644
--- a/tests/ref/lavf/sox
+++ b/tests/ref/lavf/sox
@@ -1,3 +1,3 @@
-683635d5cb1344e44fa96df90c3a993c *./tests/data/lavf/lavf.sox
-176432 ./tests/data/lavf/lavf.sox
-./tests/data/lavf/lavf.sox CRC=0x3a1da17e
+683635d5cb1344e44fa96df90c3a993c *./tests/data/fate/lavf.sox
+176432 ./tests/data/fate/lavf.sox
+./tests/data/fate/lavf.sox CRC=0x3a1da17e
diff --git a/tests/ref/lavf/swf b/tests/ref/lavf/swf
index 1e07793e1e..f1d0274c62 100644
--- a/tests/ref/lavf/swf
+++ b/tests/ref/lavf/swf
@@ -1,3 +1,3 @@
-62c5aeb636fc82cf6ba6277d36e42cb5 *./tests/data/lavf/lavf.swf
-329479 ./tests/data/lavf/lavf.swf
-./tests/data/lavf/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 6846f700cc..a8b24e22f6 100644
--- a/tests/ref/lavf/ts
+++ b/tests/ref/lavf/ts
@@ -1,3 +1,3 @@
-7a479525b7dc9264291cb2fc3e1d28e5 *./tests/data/lavf/lavf.ts
-406456 ./tests/data/lavf/lavf.ts
-./tests/data/lavf/lavf.ts CRC=0xb4ca6cdc
+7a479525b7dc9264291cb2fc3e1d28e5 *./tests/data/fate/lavf.ts
+406456 ./tests/data/fate/lavf.ts
+./tests/data/fate/lavf.ts CRC=0xb4ca6cdc
diff --git a/tests/ref/lavf/ul b/tests/ref/lavf/ul
index bd540847de..1c4455e038 100644
--- a/tests/ref/lavf/ul
+++ b/tests/ref/lavf/ul
@@ -1,3 +1,3 @@
-ad492935e361f830f2f8302aa102701d *./tests/data/lavf/lavf.ul
-44100 ./tests/data/lavf/lavf.ul
-./tests/data/lavf/lavf.ul CRC=0x4515fa26
+ad492935e361f830f2f8302aa102701d *./tests/data/fate/lavf.ul
+44100 ./tests/data/fate/lavf.ul
+./tests/data/fate/lavf.ul CRC=0x4515fa26
diff --git a/tests/ref/lavf/voc b/tests/ref/lavf/voc
index 3131960237..2128593379 100644
--- a/tests/ref/lavf/voc
+++ b/tests/ref/lavf/voc
@@ -1,3 +1,3 @@
-ae01db5200e569371d4c27316575344c *./tests/data/lavf/lavf.voc
-44305 ./tests/data/lavf/lavf.voc
-./tests/data/lavf/lavf.voc CRC=0x298fd284
+ae01db5200e569371d4c27316575344c *./tests/data/fate/lavf.voc
+44305 ./tests/data/fate/lavf.voc
+./tests/data/fate/lavf.voc CRC=0x298fd284
diff --git a/tests/ref/lavf/voc_s16 b/tests/ref/lavf/voc_s16
index 776cc163fa..865c0942a8 100644
--- a/tests/ref/lavf/voc_s16
+++ b/tests/ref/lavf/voc_s16
@@ -1,3 +1,3 @@
-e55a9c632cfeab90bcfb9ff29a71728c *./tests/data/lavf/lavf.voc_s16
-176613 ./tests/data/lavf/lavf.voc_s16
-./tests/data/lavf/lavf.voc_s16 CRC=0xe61e3bd0
+e55a9c632cfeab90bcfb9ff29a71728c *./tests/data/fate/lavf.voc_s16
+176613 ./tests/data/fate/lavf.voc_s16
+./tests/data/fate/lavf.voc_s16 CRC=0xe61e3bd0
diff --git a/tests/ref/lavf/wav b/tests/ref/lavf/wav
index fa8a859cd0..498255a497 100644
--- a/tests/ref/lavf/wav
+++ b/tests/ref/lavf/wav
@@ -1,3 +1,3 @@
-41410d9bbe0603740d1c17050746f475 *./tests/data/lavf/lavf.wav
-88246 ./tests/data/lavf/lavf.wav
-./tests/data/lavf/lavf.wav CRC=0x3a1da17e
+41410d9bbe0603740d1c17050746f475 *./tests/data/fate/lavf.wav
+88246 ./tests/data/fate/lavf.wav
+./tests/data/fate/lavf.wav CRC=0x3a1da17e
diff --git a/tests/ref/lavf/y4m b/tests/ref/lavf/y4m
index 367b37621d..c130e1c7cc 100644
--- a/tests/ref/lavf/y4m
+++ b/tests/ref/lavf/y4m
@@ -1,3 +1,3 @@
-ec8178cb152f9cdbfd9cb724d977db2e *./tests/data/lavf/lavf.y4m
-3801808 ./tests/data/lavf/lavf.y4m
-./tests/data/lavf/lavf.y4m CRC=0x0a941f26
+ec8178cb152f9cdbfd9cb724d977db2e *./tests/data/fate/lavf.y4m
+3801808 ./tests/data/fate/lavf.y4m
+./tests/data/fate/lavf.y4m CRC=0x0a941f26
diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh
index 4dffd55221..9247139386 100755
--- a/tests/regression-funcs.sh
+++ b/tests/regression-funcs.sh
@@ -16,7 +16,7 @@ datadir="./tests/data"
target_datadir="${target_path}/${datadir}"

this="$test.$test_ref"
-outdir="$datadir/$test_ref/"
+outdir="$datadir/fate/"

# various files
avconv="$target_exec ${target_path}/avconv"
@@ -29,9 +29,6 @@ target_crcfile="$target_datadir/$this.crc"
cleanfiles="$raw_dst $crcfile"
trap 'rm -f -- $cleanfiles' EXIT

-mkdir -p "$datadir"
-mkdir -p "$outdir"
-
[ "${V-0}" -gt 0 ] && echov=echov || echov=:

echov(){

[Diego Biurrun]

---
tests/fate-run.sh | 51 ++++++++++++++++++++++++++++++++++++++++++++++++
tests/fate/avformat.mak | 17 +++++++++++-----
tests/lavf-regression.sh | 20 -------------------
tests/ref/lavf/pbmpipe | 6 +++---
tests/ref/lavf/pgmpipe | 6 +++---
tests/ref/lavf/ppmpipe | 6 +++---
6 files changed, 72 insertions(+), 34 deletions(-)

diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 8de749d4a7..41cb2be1fb 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -152,6 +152,57 @@ enc_dec(){
tests/tiny_psnr $srcfile $decfile $cmp_unit $cmp_shift
}

+datadir="tests/data"
+target_datadir="${target_path}/${datadir}"
+
+this="$test.lavf"
+
+# various files
+avconv2="$target_exec ${target_path}/avconv"
+raw_src="${target_path}/tests/vsynth1/%02d.pgm"
+raw_dst="$datadir/$this.out.yuv"
+pcm_src="$target_datadir/asynth1.sw"
+crcfile="$datadir/$this.crc"
+target_crcfile="$target_datadir/$this.crc"
+
+echov(){
+ echo "$@" >&3
+}
+
+AVCONV_OPTS="-nostats -y -cpuflags $cpuflags"
+COMMON_OPTS="-flags +bitexact -idct simple -sws_flags +accurate_rnd+bitexact -fflags +bitexact"
+DEC_OPTS="$COMMON_OPTS -threads $threads"
+ENC_OPTS="$COMMON_OPTS -threads 1 -dct fastint"
+
+run_avconv(){
+ $echov $avconv2 $AVCONV_OPTS $*
+ $avconv2 $AVCONV_OPTS $*
+}
+
+do_avconv(){
+ f="$1"
+ shift
+ set -- $* ${target_path}/$f
+ run_avconv $*
+ do_md5sum $f
+ echo $(wc -c $f)
+}
+
+do_avconv_crc(){
+ f="$1"
+ shift
+ run_avconv $* -f crc "$target_crcfile"
+ echo "$f $(cat $crcfile)"
+}
+
+streamed_images(){
+ t="${test#lavf-}"
+ t="${t%pipe}"
+ file=${outdir}/${t}pipe.$t
+ do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src -f image2pipe $ENC_OPTS -t 1 -qscale 10
+ do_avconv_crc $file $DEC_OPTS -f image2pipe -i $target_path/$file
+}
+
lavftest(){
t="${test#lavf-}"
ref=${base}/ref/lavf/$t
diff --git a/tests/fate/avformat.mak b/tests/fate/avformat.mak
index 6ffcde3f2b..51a9e2acaf 100644
--- a/tests/fate/avformat.mak
+++ b/tests/fate/avformat.mak
@@ -20,13 +20,10 @@ FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF_D10 MXF) += mxf_d10
FATE_LAVF-$(call ENCDEC2, MPEG4, MP2, NUT) += nut
FATE_LAVF-$(call ENCDEC, FLAC, OGG) += ogg
FATE_LAVF-$(call ENCDEC, PAM, IMAGE2) += pam
-FATE_LAVF-$(call ENCDEC, PBM, IMAGE2PIPE) += pbmpipe
FATE_LAVF-$(call ENCDEC, PCX, IMAGE2) += pcx
FATE_LAVF-$(call ENCDEC, PGM, IMAGE2) += pgm
-FATE_LAVF-$(call ENCDEC, PGM, IMAGE2PIPE) += pgmpipe
FATE_LAVF-$(call ENCDEC, PNG, IMAGE2) += png
FATE_LAVF-$(call ENCDEC, PPM, IMAGE2) += ppm
-FATE_LAVF-$(call ENCDEC, PPM, IMAGE2PIPE) += ppmpipe
FATE_LAVF-$(call ENCMUX, RV10 AC3_FIXED, RM) += rm
FATE_LAVF-$(call ENCDEC, PCM_U8, RSO) += rso
FATE_LAVF-$(call ENCDEC, SGI, IMAGE2) += sgi
@@ -42,11 +39,21 @@ FATE_LAVF-$(call ENCDEC, PCM_S16LE, WAV) += wav
FATE_LAVF-$(call ENCDEC, XWD, IMAGE2) += xwd
FATE_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER) += y4m

+FATE_LAVF_PIPE-$(call ENCDEC, PBM, IMAGE2PIPE) += pbmpipe
+FATE_LAVF_PIPE-$(call ENCDEC, PGM, IMAGE2PIPE) += pgmpipe
+FATE_LAVF_PIPE-$(call ENCDEC, PPM, IMAGE2PIPE) += ppmpipe
+
+FATE_LAVF_PIPE = $(FATE_LAVF_PIPE-yes:%=fate-lavf-%)
+
+$(FATE_LAVF_PIPE): CMD = streamed_images
+$(FATE_LAVF_PIPE): REF = $(SRC_PATH)/tests/ref/lavf/$(@:fate-lavf-%=%)
+$(FATE_LAVF_PIPE): $(VREF)
+
FATE_LAVF += $(FATE_LAVF-yes:%=fate-lavf-%)
FATE_LAVF += fate-lavf-pixfmt

$(FATE_LAVF): $(AREF) $(VREF)
$(FATE_LAVF): CMD = lavftest

-FATE_AVCONV += $(FATE_LAVF)
-fate-lavf: $(FATE_LAVF)
+FATE_AVCONV += $(FATE_LAVF) $(FATE_LAVF_PIPE)
+fate-lavf: $(FATE_LAVF) $(FATE_LAVF_PIPE)
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
index c6fbf68c31..dd73476669 100755
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@ -18,14 +18,6 @@ do_lavf()
do_avconv_crc $file $DEC_OPTS -i $target_path/$file $3
}

-do_streamed_images()
-{
- t="${test%pipe}"
- file=${outdir}${t}pipe.$t
- do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src -f image2pipe $ENC_OPTS -t 1 -qscale 10
- do_avconv_crc $file $DEC_OPTS -f image2pipe -i $target_path/$file
-}
-
do_image_formats()
{
outdir="$datadir/images/$test/"
@@ -110,18 +102,6 @@ fi
#do_avconv $file -t 1 -qscale 10 -f image2 -c:v pgmyuv -i $raw_src
#do_avconv_crc $file -i $target_path/$file

-if [ -n "$do_pbmpipe" ] ; then
-do_streamed_images
-fi
-
-if [ -n "$do_pgmpipe" ] ; then
-do_streamed_images
-fi
-
-if [ -n "$do_ppmpipe" ] ; then
-do_streamed_images
-fi
-
if [ -n "$do_gif" ] ; then
file=${outdir}lavf.gif
do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $ENC_OPTS -t 1 -qscale 10 -pix_fmt rgb24
diff --git a/tests/ref/lavf/pbmpipe b/tests/ref/lavf/pbmpipe
index d1c56dbcf2..af1b36c22a 100644
--- a/tests/ref/lavf/pbmpipe
+++ b/tests/ref/lavf/pbmpipe
@@ -1,3 +1,3 @@
-8ced96f5b6b7362358199ae993b4ceb7 *./tests/data/fate/pbmpipe.pbm
-317075 ./tests/data/fate/pbmpipe.pbm
-./tests/data/fate/pbmpipe.pbm CRC=0xfae0a1ba
+8ced96f5b6b7362358199ae993b4ceb7 *tests/data/fate/pbmpipe.pbm
+317075 tests/data/fate/pbmpipe.pbm
+tests/data/fate/pbmpipe.pbm CRC=0xfae0a1ba
diff --git a/tests/ref/lavf/pgmpipe b/tests/ref/lavf/pgmpipe
index a6aa06134a..e4d897e472 100644
--- a/tests/ref/lavf/pgmpipe
+++ b/tests/ref/lavf/pgmpipe
@@ -1,3 +1,3 @@
-04e66c8e9e064c8310bd657ee559bd70 *./tests/data/fate/pgmpipe.pgm
-2534775 ./tests/data/fate/pgmpipe.pgm
-./tests/data/fate/pgmpipe.pgm CRC=0xadf48ba9
+04e66c8e9e064c8310bd657ee559bd70 *tests/data/fate/pgmpipe.pgm
+2534775 tests/data/fate/pgmpipe.pgm
+tests/data/fate/pgmpipe.pgm CRC=0xadf48ba9
diff --git a/tests/ref/lavf/ppmpipe b/tests/ref/lavf/ppmpipe
index 1d86ce4100..c7f8266415 100644
--- a/tests/ref/lavf/ppmpipe
+++ b/tests/ref/lavf/ppmpipe
@@ -1,3 +1,3 @@
-74f1f6651ad8f192a7b4c11c2b6c71e5 *./tests/data/fate/ppmpipe.ppm
-7603575 ./tests/data/fate/ppmpipe.ppm
-./tests/data/fate/ppmpipe.ppm CRC=0x87b3c15f
+74f1f6651ad8f192a7b4c11c2b6c71e5 *tests/data/fate/ppmpipe.ppm
+7603575 tests/data/fate/ppmpipe.ppm
+tests/data/fate/ppmpipe.ppm CRC=0x87b3c15f

[Diego Biurrun]

---
tests/fate-run.sh | 1 -
1 file changed, 1 deletion(-)

diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 41cb2be1fb..74efa66057 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -213,7 +213,6 @@ video_filter(){
filters=$1
shift
label=${test#filter-}
- raw_src="${target_path}/tests/vsynth1/%02d.pgm"
printf '%-20s' $label
avconv $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src \
$FLAGS $ENC_OPTS -vf "$filters" -c:v rawvideo -frames:v 5 $* -f nut md5:

[Diego Biurrun]

---
tests/fate-run.sh | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 74efa66057..603860b81d 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -152,27 +152,19 @@ enc_dec(){
tests/tiny_psnr $srcfile $decfile $cmp_unit $cmp_shift
}

-datadir="tests/data"
-target_datadir="${target_path}/${datadir}"
-
-this="$test.lavf"
-
# various files
avconv2="$target_exec ${target_path}/avconv"
raw_src="${target_path}/tests/vsynth1/%02d.pgm"
-raw_dst="$datadir/$this.out.yuv"
-pcm_src="$target_datadir/asynth1.sw"
-crcfile="$datadir/$this.crc"
-target_crcfile="$target_datadir/$this.crc"
+crcfile="tests/data/$test.lavf.crc"
+target_crcfile="${target_path}/$crcfile"

echov(){
echo "$@" >&3
}

-AVCONV_OPTS="-nostats -y -cpuflags $cpuflags"
-COMMON_OPTS="-flags +bitexact -idct simple -sws_flags +accurate_rnd+bitexact -fflags +bitexact"
-DEC_OPTS="$COMMON_OPTS -threads $threads"
-ENC_OPTS="$COMMON_OPTS -threads 1 -dct fastint"
+AVCONV_OPTS="-nostats -y -cpuflags $cpuflags -threads $threads"
+DEC_OPTS="-flags +bitexact -idct simple -sws_flags +accurate_rnd+bitexact -fflags +bitexact"
+ENC_OPTS="$DEC_OPTS -threads 1 -dct fastint"

run_avconv(){
$echov $avconv2 $AVCONV_OPTS $*

[Diego Biurrun]

---
tests/fate-run.sh | 8 ++++++++
tests/fate/avformat.mak | 37 +++++++++++++++++++++------------
tests/lavf-regression.sh | 53 ------------------------------------------------
tests/ref/lavf/aiff | 6 +++---
tests/ref/lavf/al | 6 +++---
tests/ref/lavf/au | 6 +++---
tests/ref/lavf/mmf | 6 +++---
tests/ref/lavf/ogg | 6 +++---
tests/ref/lavf/rso | 6 +++---
tests/ref/lavf/sox | 6 +++---
tests/ref/lavf/ul | 6 +++---
tests/ref/lavf/voc | 6 +++---
tests/ref/lavf/voc_s16 | 6 +++---
tests/ref/lavf/wav | 6 +++---
14 files changed, 65 insertions(+), 99 deletions(-)

diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 603860b81d..63fc9662b7 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -155,6 +155,7 @@ enc_dec(){
# various files
avconv2="$target_exec ${target_path}/avconv"
raw_src="${target_path}/tests/vsynth1/%02d.pgm"
+pcm_src="${target_path}/tests/data/asynth1.sw"
crcfile="tests/data/$test.lavf.crc"
target_crcfile="${target_path}/$crcfile"

@@ -187,6 +188,13 @@ do_avconv_crc(){
echo "$f $(cat $crcfile)"
}

+audio_only(){
+ t="${test#lavf-}"
+ file=${outdir}/lavf.$t
+ do_avconv $file $DEC_OPTS $1 -ar 44100 -f s16le -i $pcm_src $ENC_OPTS -t 1 -qscale 10 $2
+ do_avconv_crc $file $DEC_OPTS $3 -i $target_path/$file
+}
+
streamed_images(){
t="${test#lavf-}"
t="${t%pipe}"
diff --git a/tests/fate/avformat.mak b/tests/fate/avformat.mak
index 51a9e2acaf..e677a21df5 100644
--- a/tests/fate/avformat.mak
+++ b/tests/fate/avformat.mak
@@ -1,7 +1,4 @@
-FATE_LAVF-$(call ENCDEC, PCM_S16BE, AIFF) += aiff
-FATE_LAVF-$(call ENCDEC, PCM_ALAW, PCM_ALAW) += al
FATE_LAVF-$(call ENCDEC2, MSMPEG4V3, MP2, ASF) += asf
-FATE_LAVF-$(call ENCDEC, PCM_S16BE, AU) += au
FATE_LAVF-$(call ENCDEC2, MPEG4, MP2, AVI) += avi
FATE_LAVF-$(call ENCDEC, BMP, IMAGE2) += bmp
FATE_LAVF-$(call ENCDEC, DPX, IMAGE2) += dpx
@@ -11,34 +8,48 @@ FATE_LAVF-$(call ENCDEC, GIF, IMAGE2) += gif
FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, GXF) += gxf
FATE_LAVF-$(call ENCDEC, MJPEG, IMAGE2) += jpg
FATE_LAVF-$(call ENCDEC2, MPEG4, MP2, MATROSKA) += mkv
-FATE_LAVF-$(call ENCDEC, ADPCM_YAMAHA, MMF) += mmf
FATE_LAVF-$(call ENCDEC2, MPEG4, PCM_ALAW, MOV) += mov
FATE_LAVF-$(call ENCDEC2, MPEG1VIDEO, MP2, MPEG1SYSTEM MPEGPS) += mpg
-FATE_LAVF-$(call ENCDEC, PCM_MULAW, PCM_MULAW) += ul
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 ENCDEC, FLAC, OGG) += ogg
FATE_LAVF-$(call ENCDEC, PAM, IMAGE2) += pam
FATE_LAVF-$(call ENCDEC, PCX, IMAGE2) += pcx
FATE_LAVF-$(call ENCDEC, PGM, IMAGE2) += pgm
FATE_LAVF-$(call ENCDEC, PNG, IMAGE2) += png
FATE_LAVF-$(call ENCDEC, PPM, IMAGE2) += ppm
FATE_LAVF-$(call ENCMUX, RV10 AC3_FIXED, RM) += rm
-FATE_LAVF-$(call ENCDEC, PCM_U8, RSO) += rso
FATE_LAVF-$(call ENCDEC, SGI, IMAGE2) += sgi
-FATE_LAVF-$(call ENCDEC, PCM_S16LE, SOX) += sox
FATE_LAVF-$(call ENCDEC, SUNRAST, IMAGE2) += sun
FATE_LAVF-$(call ENCDEC, FLV, SWF) += swf
FATE_LAVF-$(call ENCDEC, TARGA, IMAGE2) += tga
FATE_LAVF-$(call ENCDEC, TIFF, IMAGE2) += tiff
FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, MP2, MPEGTS) += ts
-FATE_LAVF-$(call ENCDEC, PCM_U8, VOC) += voc
-FATE_LAVF-$(call ENCDEC, PCM_S16LE, VOC) += voc_s16
-FATE_LAVF-$(call ENCDEC, PCM_S16LE, WAV) += wav
FATE_LAVF-$(call ENCDEC, XWD, IMAGE2) += xwd
FATE_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER) += y4m

+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
+FATE_LAVF_AUDIO_ONLY-$(call ENCDEC, ADPCM_YAMAHA, MMF) += mmf
+FATE_LAVF_AUDIO_ONLY-$(call ENCDEC, FLAC, OGG) += ogg
+FATE_LAVF_AUDIO_ONLY-$(call ENCDEC, PCM_U8, RSO) += rso
+FATE_LAVF_AUDIO_ONLY-$(call ENCDEC, PCM_S16LE, SOX) += sox
+FATE_LAVF_AUDIO_ONLY-$(call ENCDEC, PCM_MULAW, PCM_MULAW) += ul
+FATE_LAVF_AUDIO_ONLY-$(call ENCDEC, PCM_U8, VOC) += voc
+FATE_LAVF_AUDIO_ONLY-$(call ENCDEC, PCM_S16LE, VOC) += voc_s16
+FATE_LAVF_AUDIO_ONLY-$(call ENCDEC, PCM_S16LE, WAV) += wav
+
+FATE_LAVF_AUDIO_ONLY = $(FATE_LAVF_AUDIO_ONLY-yes:%=fate-lavf-%)
+
+$(FATE_LAVF_AUDIO_ONLY): CMD = audio_only
+$(FATE_LAVF_AUDIO_ONLY): REF = $(SRC_PATH)/tests/ref/lavf/$(@:fate-lavf-%=%)
+$(FATE_LAVF_AUDIO_ONLY): $(AREF)
+
+fate-lavf-al fate-lavf-ul: CMD = audio_only "" "" "-ar 44100"
+fate-lavf-ogg: CMD = audio_only "" "-c:a flac"
+fate-lavf-voc_s16: CMD = audio_only "-ac 2" "-c:a pcm_s16le -f voc"
+
FATE_LAVF_PIPE-$(call ENCDEC, PBM, IMAGE2PIPE) += pbmpipe
FATE_LAVF_PIPE-$(call ENCDEC, PGM, IMAGE2PIPE) += pgmpipe
FATE_LAVF_PIPE-$(call ENCDEC, PPM, IMAGE2PIPE) += ppmpipe
@@ -55,5 +66,5 @@ FATE_LAVF += fate-lavf-pixfmt
$(FATE_LAVF): $(AREF) $(VREF)
$(FATE_LAVF): CMD = lavftest

-FATE_AVCONV += $(FATE_LAVF) $(FATE_LAVF_PIPE)
-fate-lavf: $(FATE_LAVF) $(FATE_LAVF_PIPE)
+FATE_AVCONV += $(FATE_LAVF) $(FATE_LAVF_AUDIO_ONLY) $(FATE_LAVF_PIPE)
+fate-lavf: $(FATE_LAVF) $(FATE_LAVF_AUDIO_ONLY) $(FATE_LAVF_PIPE)
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
index dd73476669..66248f76d5 100755
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@ -29,13 +29,6 @@ do_image_formats()
echo $(wc -c ${outdir}02.$test)
}

-do_audio_only()
-{
- file=${outdir}lavf.$test
- do_avconv $file $DEC_OPTS $1 -ar 44100 -f s16le -i $pcm_src $ENC_OPTS -t 1 -qscale 10 $2
- do_avconv_crc $file $DEC_OPTS $3 -i $target_path/$file
-}
-
if [ -n "$do_avi" ] ; then
do_lavf "" "-c:a mp2 -ar 44100"
fi
@@ -168,52 +161,6 @@ if [ -n "$do_sun" ] ; then
do_image_formats
fi

-# audio only
-
-if [ -n "$do_wav" ] ; then
-do_audio_only
-fi
-
-if [ -n "$do_al" ] ; then
-do_audio_only "" "" "-ar 44100"
-fi
-
-if [ -n "$do_ul" ] ; then
-do_audio_only "" "" "-ar 44100"
-fi
-
-if [ -n "$do_au" ] ; then
-do_audio_only
-fi
-
-if [ -n "$do_mmf" ] ; then
-do_audio_only
-fi
-
-if [ -n "$do_aiff" ] ; then
-do_audio_only
-fi
-
-if [ -n "$do_voc" ] ; then
-do_audio_only
-fi
-
-if [ -n "$do_voc_s16" ] ; then
-do_audio_only "-ac 2" "-c:a pcm_s16le -f voc"
-fi
-
-if [ -n "$do_ogg" ] ; then
-do_audio_only "" "-c:a flac"
-fi
-
-if [ -n "$do_rso" ] ; then
-do_audio_only
-fi
-
-if [ -n "$do_sox" ] ; then
-do_audio_only
-fi
-
# pix_fmt conversions

if [ -n "$do_pixfmt" ] ; then
diff --git a/tests/ref/lavf/aiff b/tests/ref/lavf/aiff
index 4e4c25e2e7..e8868a6449 100644
--- a/tests/ref/lavf/aiff
+++ b/tests/ref/lavf/aiff
@@ -1,3 +1,3 @@
-9d9e55431800bf6aea46a7d67509da4e *./tests/data/fate/lavf.aiff
-88254 ./tests/data/fate/lavf.aiff
-./tests/data/fate/lavf.aiff CRC=0x3a1da17e
+9d9e55431800bf6aea46a7d67509da4e *tests/data/fate/lavf.aiff
+88254 tests/data/fate/lavf.aiff
+tests/data/fate/lavf.aiff CRC=0x3a1da17e
diff --git a/tests/ref/lavf/al b/tests/ref/lavf/al
index 3370149b03..bc7f18e241 100644
--- a/tests/ref/lavf/al
+++ b/tests/ref/lavf/al
@@ -1,3 +1,3 @@
-652d96e474869ddb01403743deb35117 *./tests/data/fate/lavf.al
-44100 ./tests/data/fate/lavf.al
-./tests/data/fate/lavf.al CRC=0xf9643112
+652d96e474869ddb01403743deb35117 *tests/data/fate/lavf.al
+44100 tests/data/fate/lavf.al
+tests/data/fate/lavf.al CRC=0xf9643112
diff --git a/tests/ref/lavf/au b/tests/ref/lavf/au
index d5a4dddc49..6de5904a6d 100644
--- a/tests/ref/lavf/au
+++ b/tests/ref/lavf/au
@@ -1,3 +1,3 @@
-b9396e3775ea009094e751e7128d614e *./tests/data/fate/lavf.au
-88224 ./tests/data/fate/lavf.au
-./tests/data/fate/lavf.au CRC=0x3a1da17e
+b9396e3775ea009094e751e7128d614e *tests/data/fate/lavf.au
+88224 tests/data/fate/lavf.au
+tests/data/fate/lavf.au CRC=0x3a1da17e
diff --git a/tests/ref/lavf/mmf b/tests/ref/lavf/mmf
index 89538c4751..043d8e7b8b 100644
--- a/tests/ref/lavf/mmf
+++ b/tests/ref/lavf/mmf
@@ -1,3 +1,3 @@
-1a3bbf19a41668c1e928bcafce88ff3e *./tests/data/fate/lavf.mmf
-22617 ./tests/data/fate/lavf.mmf
-./tests/data/fate/lavf.mmf CRC=0x8dea1388
+1a3bbf19a41668c1e928bcafce88ff3e *tests/data/fate/lavf.mmf
+22617 tests/data/fate/lavf.mmf
+tests/data/fate/lavf.mmf CRC=0x8dea1388
diff --git a/tests/ref/lavf/ogg b/tests/ref/lavf/ogg
index 0c35085358..032bbd0742 100644
--- a/tests/ref/lavf/ogg
+++ b/tests/ref/lavf/ogg
@@ -1,3 +1,3 @@
-8ca901bc8d24b80ebe79e387e454d1e9 *./tests/data/fate/lavf.ogg
-13476 ./tests/data/fate/lavf.ogg
-./tests/data/fate/lavf.ogg CRC=0x3a1da17e
+8ca901bc8d24b80ebe79e387e454d1e9 *tests/data/fate/lavf.ogg
+13476 tests/data/fate/lavf.ogg
+tests/data/fate/lavf.ogg CRC=0x3a1da17e
diff --git a/tests/ref/lavf/rso b/tests/ref/lavf/rso
index a7b88904a6..138f1a6340 100644
--- a/tests/ref/lavf/rso
+++ b/tests/ref/lavf/rso
@@ -1,3 +1,3 @@
-443b72346065d6318ca18c8395aa1d87 *./tests/data/fate/lavf.rso
-44108 ./tests/data/fate/lavf.rso
-./tests/data/fate/lavf.rso CRC=0x298fd284
+443b72346065d6318ca18c8395aa1d87 *tests/data/fate/lavf.rso
+44108 tests/data/fate/lavf.rso
+tests/data/fate/lavf.rso CRC=0x298fd284
diff --git a/tests/ref/lavf/sox b/tests/ref/lavf/sox
index 3e4c291333..b078a2922c 100644
--- a/tests/ref/lavf/sox
+++ b/tests/ref/lavf/sox
@@ -1,3 +1,3 @@
-683635d5cb1344e44fa96df90c3a993c *./tests/data/fate/lavf.sox
-176432 ./tests/data/fate/lavf.sox
-./tests/data/fate/lavf.sox CRC=0x3a1da17e
+683635d5cb1344e44fa96df90c3a993c *tests/data/fate/lavf.sox
+176432 tests/data/fate/lavf.sox
+tests/data/fate/lavf.sox CRC=0x3a1da17e
diff --git a/tests/ref/lavf/ul b/tests/ref/lavf/ul
index 1c4455e038..1f4dedf8a4 100644
--- a/tests/ref/lavf/ul
+++ b/tests/ref/lavf/ul
@@ -1,3 +1,3 @@
-ad492935e361f830f2f8302aa102701d *./tests/data/fate/lavf.ul
-44100 ./tests/data/fate/lavf.ul
-./tests/data/fate/lavf.ul CRC=0x4515fa26
+ad492935e361f830f2f8302aa102701d *tests/data/fate/lavf.ul
+44100 tests/data/fate/lavf.ul
+tests/data/fate/lavf.ul CRC=0x4515fa26
diff --git a/tests/ref/lavf/voc b/tests/ref/lavf/voc
index 2128593379..0dbbcc8364 100644
--- a/tests/ref/lavf/voc
+++ b/tests/ref/lavf/voc
@@ -1,3 +1,3 @@
-ae01db5200e569371d4c27316575344c *./tests/data/fate/lavf.voc
-44305 ./tests/data/fate/lavf.voc
-./tests/data/fate/lavf.voc CRC=0x298fd284
+ae01db5200e569371d4c27316575344c *tests/data/fate/lavf.voc
+44305 tests/data/fate/lavf.voc
+tests/data/fate/lavf.voc CRC=0x298fd284
diff --git a/tests/ref/lavf/voc_s16 b/tests/ref/lavf/voc_s16
index 865c0942a8..cb4c6e83dd 100644
--- a/tests/ref/lavf/voc_s16
+++ b/tests/ref/lavf/voc_s16
@@ -1,3 +1,3 @@
-e55a9c632cfeab90bcfb9ff29a71728c *./tests/data/fate/lavf.voc_s16
-176613 ./tests/data/fate/lavf.voc_s16
-./tests/data/fate/lavf.voc_s16 CRC=0xe61e3bd0
+e55a9c632cfeab90bcfb9ff29a71728c *tests/data/fate/lavf.voc_s16
+176613 tests/data/fate/lavf.voc_s16
+tests/data/fate/lavf.voc_s16 CRC=0xe61e3bd0
diff --git a/tests/ref/lavf/wav b/tests/ref/lavf/wav
index 498255a497..93c18f385c 100644
--- a/tests/ref/lavf/wav
+++ b/tests/ref/lavf/wav
@@ -1,3 +1,3 @@
-41410d9bbe0603740d1c17050746f475 *./tests/data/fate/lavf.wav
-88246 ./tests/data/fate/lavf.wav
-./tests/data/fate/lavf.wav CRC=0x3a1da17e
+41410d9bbe0603740d1c17050746f475 *tests/data/fate/lavf.wav
+88246 tests/data/fate/lavf.wav
+tests/data/fate/lavf.wav CRC=0x3a1da17e

[Diego Biurrun]

---
tests/fate-run.sh | 11 ++++++++
tests/fate/avformat.mak | 43 +++++++++++++++++++++-----------
tests/lavf-regression.sh | 65 ------------------------------------------------
tests/ref/lavf/bmp | 6 ++---
tests/ref/lavf/dpx | 6 ++---
tests/ref/lavf/jpg | 6 ++---
tests/ref/lavf/pam | 6 ++---
tests/ref/lavf/pcx | 6 ++---
tests/ref/lavf/pgm | 6 ++---
tests/ref/lavf/png | 6 ++---
tests/ref/lavf/ppm | 6 ++---
tests/ref/lavf/sgi | 6 ++---
tests/ref/lavf/sun | 6 ++---
tests/ref/lavf/tga | 6 ++---
tests/ref/lavf/tiff | 6 ++---
tests/ref/lavf/xwd | 6 ++---
16 files changed, 78 insertions(+), 119 deletions(-)

diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 63fc9662b7..875b410305 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -195,6 +195,17 @@ audio_only(){
do_avconv_crc $file $DEC_OPTS $3 -i $target_path/$file
}

+image_formats(){
+ t="${test#lavf-}"
+ outdir="tests/data/images/$t"
+ mkdir -p "$outdir"
+ file=${outdir}/%02d.$t
+ run_avconv $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $1 $ENC_OPTS $2 -frames 12 -y -qscale 10 $target_path/$file
+ do_md5sum ${outdir}/02.$t
+ do_avconv_crc $file $DEC_OPTS $2 -i $target_path/$file
+ echo $(wc -c ${outdir}/02.$t)
+}
+
streamed_images(){
t="${test#lavf-}"
t="${t%pipe}"
diff --git a/tests/fate/avformat.mak b/tests/fate/avformat.mak
index e677a21df5..f35cdcdfea 100644
--- a/tests/fate/avformat.mak
+++ b/tests/fate/avformat.mak
@@ -1,31 +1,18 @@
FATE_LAVF-$(call ENCDEC2, MSMPEG4V3, MP2, ASF) += asf
FATE_LAVF-$(call ENCDEC2, MPEG4, MP2, AVI) += avi
-FATE_LAVF-$(call ENCDEC, BMP, IMAGE2) += bmp
-FATE_LAVF-$(call ENCDEC, DPX, IMAGE2) += dpx
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 ENCDEC, MJPEG, IMAGE2) += jpg
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 ENCDEC, PAM, IMAGE2) += pam
-FATE_LAVF-$(call ENCDEC, PCX, IMAGE2) += pcx
-FATE_LAVF-$(call ENCDEC, PGM, IMAGE2) += pgm
-FATE_LAVF-$(call ENCDEC, PNG, IMAGE2) += png
-FATE_LAVF-$(call ENCDEC, PPM, IMAGE2) += ppm
FATE_LAVF-$(call ENCMUX, RV10 AC3_FIXED, RM) += rm
-FATE_LAVF-$(call ENCDEC, SGI, IMAGE2) += sgi
-FATE_LAVF-$(call ENCDEC, SUNRAST, IMAGE2) += sun
FATE_LAVF-$(call ENCDEC, FLV, SWF) += swf
-FATE_LAVF-$(call ENCDEC, TARGA, IMAGE2) += tga
-FATE_LAVF-$(call ENCDEC, TIFF, IMAGE2) += tiff
FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, MP2, MPEGTS) += ts
-FATE_LAVF-$(call ENCDEC, XWD, IMAGE2) += xwd
FATE_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER) += y4m

FATE_LAVF_AUDIO_ONLY-$(call ENCDEC, PCM_S16BE, AIFF) += aiff
@@ -50,6 +37,32 @@ fate-lavf-al fate-lavf-ul: CMD = audio_only "" "" "-ar 44100"
fate-lavf-ogg: CMD = audio_only "" "-c:a flac"
fate-lavf-voc_s16: CMD = audio_only "-ac 2" "-c:a pcm_s16le -f voc"

+
+
+FATE_LAVF_IMAGES-$(call ENCDEC, BMP, IMAGE2) += bmp
+FATE_LAVF_IMAGES-$(call ENCDEC, DPX, IMAGE2) += dpx
+FATE_LAVF_IMAGES-$(call ENCDEC, MJPEG, IMAGE2) += jpg
+FATE_LAVF_IMAGES-$(call ENCDEC, PAM, IMAGE2) += pam
+FATE_LAVF_IMAGES-$(call ENCDEC, PCX, IMAGE2) += pcx
+FATE_LAVF_IMAGES-$(call ENCDEC, PGM, IMAGE2) += pgm
+FATE_LAVF_IMAGES-$(call ENCDEC, PNG, IMAGE2) += png
+FATE_LAVF_IMAGES-$(call ENCDEC, PPM, IMAGE2) += ppm
+FATE_LAVF_IMAGES-$(call ENCDEC, SGI, IMAGE2) += sgi
+FATE_LAVF_IMAGES-$(call ENCDEC, SUNRAST, IMAGE2) += sun
+FATE_LAVF_IMAGES-$(call ENCDEC, TARGA, IMAGE2) += tga
+FATE_LAVF_IMAGES-$(call ENCDEC, TIFF, IMAGE2) += tiff
+FATE_LAVF_IMAGES-$(call ENCDEC, XWD, IMAGE2) += xwd
+
+FATE_LAVF_IMAGES = $(FATE_LAVF_IMAGES-yes:%=fate-lavf-%)
+
+$(FATE_LAVF_IMAGES): CMD = image_formats
+$(FATE_LAVF_IMAGES): REF = $(SRC_PATH)/tests/ref/lavf/$(@:fate-lavf-%=%)
+$(FATE_LAVF_IMAGES): $(VREF)
+
+fate-lavf-jpg: CMD = image_formats "-pix_fmt yuvj420p" "-f image2"
+fate-lavf-tiff: CMD = image_formats "-pix_fmt rgb24"
+
+
FATE_LAVF_PIPE-$(call ENCDEC, PBM, IMAGE2PIPE) += pbmpipe
FATE_LAVF_PIPE-$(call ENCDEC, PGM, IMAGE2PIPE) += pgmpipe
FATE_LAVF_PIPE-$(call ENCDEC, PPM, IMAGE2PIPE) += ppmpipe
@@ -66,5 +79,5 @@ FATE_LAVF += fate-lavf-pixfmt
$(FATE_LAVF): $(AREF) $(VREF)
$(FATE_LAVF): CMD = lavftest

-FATE_AVCONV += $(FATE_LAVF) $(FATE_LAVF_AUDIO_ONLY) $(FATE_LAVF_PIPE)
-fate-lavf: $(FATE_LAVF) $(FATE_LAVF_AUDIO_ONLY) $(FATE_LAVF_PIPE)
+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)
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
index 66248f76d5..d9759af1ef 100755
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@ -18,17 +18,6 @@ do_lavf()
do_avconv_crc $file $DEC_OPTS -i $target_path/$file $3
}

-do_image_formats()
-{
- outdir="$datadir/images/$test/"
- mkdir -p "$outdir"
- file=${outdir}%02d.$test
- run_avconv $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $1 $ENC_OPTS $2 -frames 12 -y -qscale 10 $target_path/$file
- do_md5sum ${outdir}02.$test
- do_avconv_crc $file $DEC_OPTS $2 -i $target_path/$file
- echo $(wc -c ${outdir}02.$test)
-}
-
if [ -n "$do_avi" ] ; then
do_lavf "" "-c:a mp2 -ar 44100"
fi
@@ -107,60 +96,6 @@ do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $ENC_OPTS -t 1 -qsca
do_avconv_crc $file -i $target_path/$file
fi

-# image formats
-
-if [ -n "$do_pgm" ] ; then
-do_image_formats
-fi
-
-if [ -n "$do_ppm" ] ; then
-do_image_formats
-fi
-
-if [ -n "$do_png" ] ; then
-do_image_formats
-fi
-
-if [ -n "$do_bmp" ] ; then
-do_image_formats
-fi
-
-if [ -n "$do_tga" ] ; then
-do_image_formats
-fi
-
-if [ -n "$do_tiff" ] ; then
-do_image_formats "-pix_fmt rgb24"
-fi
-
-if [ -n "$do_sgi" ] ; then
-do_image_formats
-fi
-
-if [ -n "$do_jpg" ] ; then
-do_image_formats "-pix_fmt yuvj420p" "-f image2"
-fi
-
-if [ -n "$do_pam" ] ; then
-do_image_formats
-fi
-
-if [ -n "$do_pcx" ] ; then
-do_image_formats
-fi
-
-if [ -n "$do_xwd" ] ; then
-do_image_formats
-fi
-
-if [ -n "$do_dpx" ] ; then
-do_image_formats
-fi
-
-if [ -n "$do_sun" ] ; then
-do_image_formats
-fi
-
# pix_fmt conversions

if [ -n "$do_pixfmt" ] ; then
diff --git a/tests/ref/lavf/bmp b/tests/ref/lavf/bmp
index b79ee4d47c..20dd173ea5 100644
--- a/tests/ref/lavf/bmp
+++ b/tests/ref/lavf/bmp
@@ -1,3 +1,3 @@
-71f4d64a6b3c71f43a4eff526f84841c *./tests/data/images/bmp/02.bmp
-./tests/data/images/bmp/%02d.bmp CRC=0x3447369b
-304182 ./tests/data/images/bmp/02.bmp
+71f4d64a6b3c71f43a4eff526f84841c *tests/data/images/bmp/02.bmp
+tests/data/images/bmp/%02d.bmp CRC=0x3447369b
+304182 tests/data/images/bmp/02.bmp
diff --git a/tests/ref/lavf/dpx b/tests/ref/lavf/dpx
index 42c0a335fb..090a1cc058 100644
--- a/tests/ref/lavf/dpx
+++ b/tests/ref/lavf/dpx
@@ -1,3 +1,3 @@
-d2f0b4e854fda2d3b3bee84cef80593c *./tests/data/images/dpx/02.dpx
-./tests/data/images/dpx/%02d.dpx CRC=0x28c7369b
-305792 ./tests/data/images/dpx/02.dpx
+d2f0b4e854fda2d3b3bee84cef80593c *tests/data/images/dpx/02.dpx
+tests/data/images/dpx/%02d.dpx CRC=0x28c7369b
+305792 tests/data/images/dpx/02.dpx
diff --git a/tests/ref/lavf/jpg b/tests/ref/lavf/jpg
index 584a97a285..2b589965f3 100644
--- a/tests/ref/lavf/jpg
+++ b/tests/ref/lavf/jpg
@@ -1,3 +1,3 @@
-131878fee153a086d740543fbf2ab359 *./tests/data/images/jpg/02.jpg
-./tests/data/images/jpg/%02d.jpg CRC=0x9d770966
-28406 ./tests/data/images/jpg/02.jpg
+131878fee153a086d740543fbf2ab359 *tests/data/images/jpg/02.jpg
+tests/data/images/jpg/%02d.jpg CRC=0x9d770966
+28406 tests/data/images/jpg/02.jpg
diff --git a/tests/ref/lavf/pam b/tests/ref/lavf/pam
index 636a419a47..753c374a0c 100644
--- a/tests/ref/lavf/pam
+++ b/tests/ref/lavf/pam
@@ -1,3 +1,3 @@
-0dce5565222cf0f8b309467f279aecd2 *./tests/data/images/pam/02.pam
-./tests/data/images/pam/%02d.pam CRC=0x28c7369b
-304191 ./tests/data/images/pam/02.pam
+0dce5565222cf0f8b309467f279aecd2 *tests/data/images/pam/02.pam
+tests/data/images/pam/%02d.pam CRC=0x28c7369b
+304191 tests/data/images/pam/02.pam
diff --git a/tests/ref/lavf/pcx b/tests/ref/lavf/pcx
index e60ea782bc..4f43b1a428 100644
--- a/tests/ref/lavf/pcx
+++ b/tests/ref/lavf/pcx
@@ -1,3 +1,3 @@
-2df1d747fba23d03b6ff9c91b8b465c9 *./tests/data/images/pcx/02.pcx
-./tests/data/images/pcx/%02d.pcx CRC=0x28c7369b
-364147 ./tests/data/images/pcx/02.pcx
+2df1d747fba23d03b6ff9c91b8b465c9 *tests/data/images/pcx/02.pcx
+tests/data/images/pcx/%02d.pcx CRC=0x28c7369b
+364147 tests/data/images/pcx/02.pcx
diff --git a/tests/ref/lavf/pgm b/tests/ref/lavf/pgm
index 419fdaa46f..83c0a294e1 100644
--- a/tests/ref/lavf/pgm
+++ b/tests/ref/lavf/pgm
@@ -1,3 +1,3 @@
-388f5c51a678ca6a52cc006095c12f08 *./tests/data/images/pgm/02.pgm
-./tests/data/images/pgm/%02d.pgm CRC=0xa6866b82
-101391 ./tests/data/images/pgm/02.pgm
+388f5c51a678ca6a52cc006095c12f08 *tests/data/images/pgm/02.pgm
+tests/data/images/pgm/%02d.pgm CRC=0xa6866b82
+101391 tests/data/images/pgm/02.pgm
diff --git a/tests/ref/lavf/png b/tests/ref/lavf/png
index f216e7e904..6aa59eda16 100644
--- a/tests/ref/lavf/png
+++ b/tests/ref/lavf/png
@@ -1,3 +1,3 @@
-c162094e51dc1a3203de43e496086dfd *./tests/data/images/png/02.png
-./tests/data/images/png/%02d.png CRC=0x28c7369b
-248612 ./tests/data/images/png/02.png
+c162094e51dc1a3203de43e496086dfd *tests/data/images/png/02.png
+tests/data/images/png/%02d.png CRC=0x28c7369b
+248612 tests/data/images/png/02.png
diff --git a/tests/ref/lavf/ppm b/tests/ref/lavf/ppm
index 33275e2d36..6668b87cc0 100644
--- a/tests/ref/lavf/ppm
+++ b/tests/ref/lavf/ppm
@@ -1,3 +1,3 @@
-16d5dadf0b362fc8ba3cb676c5dde985 *./tests/data/images/ppm/02.ppm
-./tests/data/images/ppm/%02d.ppm CRC=0x28c7369b
-304143 ./tests/data/images/ppm/02.ppm
+16d5dadf0b362fc8ba3cb676c5dde985 *tests/data/images/ppm/02.ppm
+tests/data/images/ppm/%02d.ppm CRC=0x28c7369b
+304143 tests/data/images/ppm/02.ppm
diff --git a/tests/ref/lavf/sgi b/tests/ref/lavf/sgi
index 703b83cf66..b42a700357 100644
--- a/tests/ref/lavf/sgi
+++ b/tests/ref/lavf/sgi
@@ -1,3 +1,3 @@
-d446e540a7c18da5fd3cc0e9942cd46f *./tests/data/images/sgi/02.sgi
-./tests/data/images/sgi/%02d.sgi CRC=0x28c7369b
-307287 ./tests/data/images/sgi/02.sgi
+d446e540a7c18da5fd3cc0e9942cd46f *tests/data/images/sgi/02.sgi
+tests/data/images/sgi/%02d.sgi CRC=0x28c7369b
+307287 tests/data/images/sgi/02.sgi
diff --git a/tests/ref/lavf/sun b/tests/ref/lavf/sun
index 097235b75c..ffcda04b61 100644
--- a/tests/ref/lavf/sun
+++ b/tests/ref/lavf/sun
@@ -1,3 +1,3 @@
-07518bcb0841bc677ce6aea8464ea240 *./tests/data/images/sun/02.sun
-./tests/data/images/sun/%02d.sun CRC=0x3447369b
-304123 ./tests/data/images/sun/02.sun
+07518bcb0841bc677ce6aea8464ea240 *tests/data/images/sun/02.sun
+tests/data/images/sun/%02d.sun CRC=0x3447369b
+304123 tests/data/images/sun/02.sun
diff --git a/tests/ref/lavf/tga b/tests/ref/lavf/tga
index ce6b6466bb..ac1097edb6 100644
--- a/tests/ref/lavf/tga
+++ b/tests/ref/lavf/tga
@@ -1,3 +1,3 @@
-c0305c53e6d79d4ed9f35f04f671246c *./tests/data/images/tga/02.tga
-./tests/data/images/tga/%02d.tga CRC=0x3447369b
-304172 ./tests/data/images/tga/02.tga
+c0305c53e6d79d4ed9f35f04f671246c *tests/data/images/tga/02.tga
+tests/data/images/tga/%02d.tga CRC=0x3447369b
+304172 tests/data/images/tga/02.tga
diff --git a/tests/ref/lavf/tiff b/tests/ref/lavf/tiff
index b636bd9c8b..f75840fa79 100644
--- a/tests/ref/lavf/tiff
+++ b/tests/ref/lavf/tiff
@@ -1,3 +1,3 @@
-b3299346a8959553a437e486d8f3bf76 *./tests/data/images/tiff/02.tiff
-./tests/data/images/tiff/%02d.tiff CRC=0x28c7369b
-307131 ./tests/data/images/tiff/02.tiff
+b3299346a8959553a437e486d8f3bf76 *tests/data/images/tiff/02.tiff
+tests/data/images/tiff/%02d.tiff CRC=0x28c7369b
+307131 tests/data/images/tiff/02.tiff
diff --git a/tests/ref/lavf/xwd b/tests/ref/lavf/xwd
index 3fd20c8f6c..ad7f9867c9 100644
--- a/tests/ref/lavf/xwd
+++ b/tests/ref/lavf/xwd
@@ -1,3 +1,3 @@
-50baa5560b7d1aa3188b19c1162bf7dc *./tests/data/images/xwd/02.xwd
-./tests/data/images/xwd/%02d.xwd CRC=0x28c7369b
-304239 ./tests/data/images/xwd/02.xwd
+50baa5560b7d1aa3188b19c1162bf7dc *tests/data/images/xwd/02.xwd
+tests/data/images/xwd/%02d.xwd CRC=0x28c7369b
+304239 tests/data/images/xwd/02.xwd

[Diego Biurrun]

---
tests/fate-run.sh | 17 +++++++++++
tests/fate/avformat.mak | 3 ++
tests/lavf-regression.sh | 17 -----------
tests/ref/lavf/pixfmt | 76 ++++++++++++++++++++++++------------------------
4 files changed, 58 insertions(+), 55 deletions(-)

diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 875b410305..1da1f599c8 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -220,6 +220,23 @@ lavftest(){
${base}/lavf-regression.sh $t lavf tests/vsynth1 "$target_exec" "$target_path" "$threads" "$thread_type" "$cpuflags"
}

+pixfmt(){
+ t="${test#lavf-}"
+ raw_dst="tests/data/$t.lavf.out.yuv"
+ outdir="tests/data/pixfmt"
+ mkdir -p "$outdir"
+ conversions="yuv420p yuv422p yuv444p yuyv422 yuv410p yuv411p yuvj420p \
+ yuvj422p yuvj444p rgb24 bgr24 rgb32 rgb565 rgb555 gray monow \
+ monob yuv440p yuvj440p"
+ for pix_fmt in $conversions ; do
+ file=${outdir}/${pix_fmt}.yuv
+ run_avconv $DEC_OPTS -r 1 -f image2 -c:v pgmyuv -i $raw_src \
+ $ENC_OPTS -f rawvideo -t 1 -s 352x288 -pix_fmt $pix_fmt $target_path/$raw_dst
+ do_avconv $file $DEC_OPTS -f rawvideo -s 352x288 -pix_fmt $pix_fmt -i $target_path/$raw_dst \
+ $ENC_OPTS -f rawvideo -s 352x288 -pix_fmt yuv444p
+ done
+}
+
video_filter(){
filters=$1
shift
diff --git a/tests/fate/avformat.mak b/tests/fate/avformat.mak
index f35cdcdfea..59b46be54a 100644
--- a/tests/fate/avformat.mak
+++ b/tests/fate/avformat.mak
@@ -79,5 +79,8 @@ FATE_LAVF += fate-lavf-pixfmt
$(FATE_LAVF): $(AREF) $(VREF)
$(FATE_LAVF): CMD = lavftest

+fate-lavf-pixfmt: REF = $(SRC_PATH)/tests/ref/lavf/$(@:fate-lavf-%=%)
+fate-lavf-pixfmt: CMD = pixfmt
+
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)
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
index d9759af1ef..8dd4164a94 100755
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@ -95,20 +95,3 @@ file=${outdir}lavf.$test
do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $ENC_OPTS -t 1 -qscale 10
do_avconv_crc $file -i $target_path/$file
fi
-
-# pix_fmt conversions
-
-if [ -n "$do_pixfmt" ] ; then
-outdir="$datadir/pixfmt/"
-mkdir -p "$outdir"
-conversions="yuv420p yuv422p yuv444p yuyv422 yuv410p yuv411p yuvj420p \
- yuvj422p yuvj444p rgb24 bgr24 rgb32 rgb565 rgb555 gray monow \
- monob yuv440p yuvj440p"
-for pix_fmt in $conversions ; do
- file=${outdir}${pix_fmt}.yuv
- run_avconv $DEC_OPTS -r 1 -f image2 -c:v pgmyuv -i $raw_src \
- $ENC_OPTS -f rawvideo -t 1 -s 352x288 -pix_fmt $pix_fmt $target_path/$raw_dst
- do_avconv $file $DEC_OPTS -f rawvideo -s 352x288 -pix_fmt $pix_fmt -i $target_path/$raw_dst \
- $ENC_OPTS -f rawvideo -s 352x288 -pix_fmt yuv444p
-done
-fi
diff --git a/tests/ref/lavf/pixfmt b/tests/ref/lavf/pixfmt
index 186dde5ed3..f13f3dfb23 100644
--- a/tests/ref/lavf/pixfmt
+++ b/tests/ref/lavf/pixfmt
@@ -1,38 +1,38 @@
-5641dba168ff665af1cdb4a91e1afdd6 *./tests/data/pixfmt/yuv420p.yuv
-304128 ./tests/data/pixfmt/yuv420p.yuv
-ac68f9fdd9d55efd0306d9b004038761 *./tests/data/pixfmt/yuv422p.yuv
-304128 ./tests/data/pixfmt/yuv422p.yuv
-5641dba168ff665af1cdb4a91e1afdd6 *./tests/data/pixfmt/yuv444p.yuv
-304128 ./tests/data/pixfmt/yuv444p.yuv
-ac68f9fdd9d55efd0306d9b004038761 *./tests/data/pixfmt/yuyv422.yuv
-304128 ./tests/data/pixfmt/yuyv422.yuv
-507c7e9f0c97660385df977469ca9e6d *./tests/data/pixfmt/yuv410p.yuv
-304128 ./tests/data/pixfmt/yuv410p.yuv
-8594ea0b8d7c2c964525b0801b5351de *./tests/data/pixfmt/yuv411p.yuv
-304128 ./tests/data/pixfmt/yuv411p.yuv
-e176bd14185788110e055f945de7f95f *./tests/data/pixfmt/yuvj420p.yuv
-304128 ./tests/data/pixfmt/yuvj420p.yuv
-472028e46a81c98d9b2477507def4723 *./tests/data/pixfmt/yuvj422p.yuv
-304128 ./tests/data/pixfmt/yuvj422p.yuv
-c10442da177c9f1d12be3c53be6fa12c *./tests/data/pixfmt/yuvj444p.yuv
-304128 ./tests/data/pixfmt/yuvj444p.yuv
-c6e0f9b5817f484b175c1ec4ffb4e9c9 *./tests/data/pixfmt/rgb24.yuv
-304128 ./tests/data/pixfmt/rgb24.yuv
-c6e0f9b5817f484b175c1ec4ffb4e9c9 *./tests/data/pixfmt/bgr24.yuv
-304128 ./tests/data/pixfmt/bgr24.yuv
-c6e0f9b5817f484b175c1ec4ffb4e9c9 *./tests/data/pixfmt/rgb32.yuv
-304128 ./tests/data/pixfmt/rgb32.yuv
-66d39d464bd89ded2a124897f0a75ade *./tests/data/pixfmt/rgb565.yuv
-304128 ./tests/data/pixfmt/rgb565.yuv
-c894c3bd8d2631ed1964500b90a0c350 *./tests/data/pixfmt/rgb555.yuv
-304128 ./tests/data/pixfmt/rgb555.yuv
-6be306b0cce5f8e6c271ea17fef9745b *./tests/data/pixfmt/gray.yuv
-304128 ./tests/data/pixfmt/gray.yuv
-31398104d2349dd48328a6862bc6711f *./tests/data/pixfmt/monow.yuv
-304128 ./tests/data/pixfmt/monow.yuv
-31398104d2349dd48328a6862bc6711f *./tests/data/pixfmt/monob.yuv
-304128 ./tests/data/pixfmt/monob.yuv
-00b85790df5740bab95e2559d81603a7 *./tests/data/pixfmt/yuv440p.yuv
-304128 ./tests/data/pixfmt/yuv440p.yuv
-4d8d402c45d913038d4b725396719111 *./tests/data/pixfmt/yuvj440p.yuv
-304128 ./tests/data/pixfmt/yuvj440p.yuv
+5641dba168ff665af1cdb4a91e1afdd6 *tests/data/pixfmt/yuv420p.yuv
+304128 tests/data/pixfmt/yuv420p.yuv
+ac68f9fdd9d55efd0306d9b004038761 *tests/data/pixfmt/yuv422p.yuv
+304128 tests/data/pixfmt/yuv422p.yuv
+5641dba168ff665af1cdb4a91e1afdd6 *tests/data/pixfmt/yuv444p.yuv
+304128 tests/data/pixfmt/yuv444p.yuv
+ac68f9fdd9d55efd0306d9b004038761 *tests/data/pixfmt/yuyv422.yuv
+304128 tests/data/pixfmt/yuyv422.yuv
+507c7e9f0c97660385df977469ca9e6d *tests/data/pixfmt/yuv410p.yuv
+304128 tests/data/pixfmt/yuv410p.yuv
+8594ea0b8d7c2c964525b0801b5351de *tests/data/pixfmt/yuv411p.yuv
+304128 tests/data/pixfmt/yuv411p.yuv
+e176bd14185788110e055f945de7f95f *tests/data/pixfmt/yuvj420p.yuv
+304128 tests/data/pixfmt/yuvj420p.yuv
+472028e46a81c98d9b2477507def4723 *tests/data/pixfmt/yuvj422p.yuv
+304128 tests/data/pixfmt/yuvj422p.yuv
+c10442da177c9f1d12be3c53be6fa12c *tests/data/pixfmt/yuvj444p.yuv
+304128 tests/data/pixfmt/yuvj444p.yuv
+c6e0f9b5817f484b175c1ec4ffb4e9c9 *tests/data/pixfmt/rgb24.yuv
+304128 tests/data/pixfmt/rgb24.yuv
+c6e0f9b5817f484b175c1ec4ffb4e9c9 *tests/data/pixfmt/bgr24.yuv
+304128 tests/data/pixfmt/bgr24.yuv
+c6e0f9b5817f484b175c1ec4ffb4e9c9 *tests/data/pixfmt/rgb32.yuv
+304128 tests/data/pixfmt/rgb32.yuv
+66d39d464bd89ded2a124897f0a75ade *tests/data/pixfmt/rgb565.yuv
+304128 tests/data/pixfmt/rgb565.yuv
+c894c3bd8d2631ed1964500b90a0c350 *tests/data/pixfmt/rgb555.yuv
+304128 tests/data/pixfmt/rgb555.yuv
+6be306b0cce5f8e6c271ea17fef9745b *tests/data/pixfmt/gray.yuv
+304128 tests/data/pixfmt/gray.yuv
[phone]d2349dd48328a6862bc6711f *tests/data/pixfmt/monow.yuv
+304128 tests/data/pixfmt/monow.yuv
[phone]d2349dd48328a6862bc6711f *tests/data/pixfmt/monob.yuv
+304128 tests/data/pixfmt/monob.yuv
+00b85790df5740bab95e2559d81603a7 *tests/data/pixfmt/yuv440p.yuv
+304128 tests/data/pixfmt/yuv440p.yuv
+4d8d402c45d913038d4b725396719111 *tests/data/pixfmt/yuvj440p.yuv
+304128 tests/data/pixfmt/yuvj440p.yuv

[Diego Biurrun]

---
tests/Makefile | 1 +
tests/fate-run.sh | 18 +++++++-----------
tests/fate/avformat.mak | 4 ----
tests/fate/pixfmt.mak | 27 +++++++++++++++++++++++++++
tests/ref/fate/pixfmt-bgr24 | 2 ++
tests/ref/fate/pixfmt-gray | 2 ++
tests/ref/fate/pixfmt-monob | 2 ++
tests/ref/fate/pixfmt-monow | 2 ++
tests/ref/fate/pixfmt-rgb24 | 2 ++
tests/ref/fate/pixfmt-rgb32 | 2 ++
tests/ref/fate/pixfmt-rgb555 | 2 ++
tests/ref/fate/pixfmt-rgb565 | 2 ++
tests/ref/fate/pixfmt-yuv410p | 2 ++
tests/ref/fate/pixfmt-yuv411p | 2 ++
tests/ref/fate/pixfmt-yuv420p | 2 ++
tests/ref/fate/pixfmt-yuv422p | 2 ++
tests/ref/fate/pixfmt-yuv440p | 2 ++
tests/ref/fate/pixfmt-yuv444p | 2 ++
tests/ref/fate/pixfmt-yuvj420p | 2 ++
tests/ref/fate/pixfmt-yuvj422p | 2 ++
tests/ref/fate/pixfmt-yuvj440p | 2 ++
tests/ref/fate/pixfmt-yuvj444p | 2 ++
tests/ref/fate/pixfmt-yuyv422 | 2 ++
tests/ref/lavf/pixfmt | 38 --------------------------------------
24 files changed, 73 insertions(+), 53 deletions(-)
create mode 100644 tests/fate/pixfmt.mak
create mode 100644 tests/ref/fate/pixfmt-bgr24
create mode 100644 tests/ref/fate/pixfmt-gray
create mode 100644 tests/ref/fate/pixfmt-monob
create mode 100644 tests/ref/fate/pixfmt-monow
create mode 100644 tests/ref/fate/pixfmt-rgb24
create mode 100644 tests/ref/fate/pixfmt-rgb32
create mode 100644 tests/ref/fate/pixfmt-rgb555
create mode 100644 tests/ref/fate/pixfmt-rgb565
create mode 100644 tests/ref/fate/pixfmt-yuv410p
create mode 100644 tests/ref/fate/pixfmt-yuv411p
create mode 100644 tests/ref/fate/pixfmt-yuv420p
create mode 100644 tests/ref/fate/pixfmt-yuv422p
create mode 100644 tests/ref/fate/pixfmt-yuv440p
create mode 100644 tests/ref/fate/pixfmt-yuv444p
create mode 100644 tests/ref/fate/pixfmt-yuvj420p
create mode 100644 tests/ref/fate/pixfmt-yuvj422p
create mode 100644 tests/ref/fate/pixfmt-yuvj440p
create mode 100644 tests/ref/fate/pixfmt-yuvj444p
create mode 100644 tests/ref/fate/pixfmt-yuyv422
delete mode 100644 tests/ref/lavf/pixfmt

diff --git a/tests/Makefile b/tests/Makefile
index 9fec13211f..adca8ad172 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -105,6 +105,7 @@ include $(SRC_PATH)/tests/fate/mpc.mak
include $(SRC_PATH)/tests/fate/mpeg4.mak
include $(SRC_PATH)/tests/fate/opus.mak
include $(SRC_PATH)/tests/fate/pcm.mak
+include $(SRC_PATH)/tests/fate/pixfmt.mak
include $(SRC_PATH)/tests/fate/probe.mak
include $(SRC_PATH)/tests/fate/prores.mak
include $(SRC_PATH)/tests/fate/qt.mak
diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 1da1f599c8..f8c3444e29 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -220,21 +220,17 @@ lavftest(){
${base}/lavf-regression.sh $t lavf tests/vsynth1 "$target_exec" "$target_path" "$threads" "$thread_type" "$cpuflags"
}

-pixfmt(){
+pixfmt_conversion(){
t="${test#lavf-}"
+ conversion="${t#pixfmt-}"
raw_dst="tests/data/$t.lavf.out.yuv"
outdir="tests/data/pixfmt"
mkdir -p "$outdir"
- conversions="yuv420p yuv422p yuv444p yuyv422 yuv410p yuv411p yuvj420p \
- yuvj422p yuvj444p rgb24 bgr24 rgb32 rgb565 rgb555 gray monow \
- monob yuv440p yuvj440p"
- for pix_fmt in $conversions ; do
- file=${outdir}/${pix_fmt}.yuv
- run_avconv $DEC_OPTS -r 1 -f image2 -c:v pgmyuv -i $raw_src \
- $ENC_OPTS -f rawvideo -t 1 -s 352x288 -pix_fmt $pix_fmt $target_path/$raw_dst
- do_avconv $file $DEC_OPTS -f rawvideo -s 352x288 -pix_fmt $pix_fmt -i $target_path/$raw_dst \
- $ENC_OPTS -f rawvideo -s 352x288 -pix_fmt yuv444p
- done
+ file=${outdir}/${conversion}.yuv
+ run_avconv $DEC_OPTS -r 1 -f image2 -c:v pgmyuv -i $raw_src \
+ $ENC_OPTS -f rawvideo -t 1 -s 352x288 -pix_fmt $conversion $target_path/$raw_dst
+ do_avconv $file $DEC_OPTS -f rawvideo -s 352x288 -pix_fmt $conversion -i $target_path/$raw_dst \
+ $ENC_OPTS -f rawvideo -s 352x288 -pix_fmt yuv444p
}

video_filter(){
diff --git a/tests/fate/avformat.mak b/tests/fate/avformat.mak
index 59b46be54a..34292cf03c 100644
--- a/tests/fate/avformat.mak
+++ b/tests/fate/avformat.mak
@@ -74,13 +74,9 @@ $(FATE_LAVF_PIPE): REF = $(SRC_PATH)/tests/ref/lavf/$(@:fate-lavf-%=%)
$(FATE_LAVF_PIPE): $(VREF)

FATE_LAVF += $(FATE_LAVF-yes:%=fate-lavf-%)
-FATE_LAVF += fate-lavf-pixfmt

$(FATE_LAVF): $(AREF) $(VREF)
$(FATE_LAVF): CMD = lavftest

-fate-lavf-pixfmt: REF = $(SRC_PATH)/tests/ref/lavf/$(@:fate-lavf-%=%)
-fate-lavf-pixfmt: CMD = pixfmt
-
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)
diff --git a/tests/fate/pixfmt.mak b/tests/fate/pixfmt.mak
new file mode 100644
index 0000000000..eaa4cb01bf
--- /dev/null
+++ b/tests/fate/pixfmt.mak
@@ -0,0 +1,27 @@
+FATE_PIXFMT = bgr24 \
+ gray \
+ monob \
+ monow \
+ rgb24 \
+ rgb32 \
+ rgb555 \
+ rgb565 \
+ yuv410p \
+ yuv411p \
+ yuv420p \
+ yuv422p \
+ yuv440p \
+ yuv444p \
+ yuvj420p \
+ yuvj422p \
+ yuvj440p \
+ yuvj444p \
+ yuyv422 \
+
+FATE_PIXFMT := $(FATE_PIXFMT:%=fate-pixfmt-%)
+
+$(FATE_PIXFMT): CMD = pixfmt_conversion
+$(FATE_PIXFMT): $(VREF)
+
+FATE_AVCONV += $(FATE_PIXFMT)
+fate-pixfmt: $(FATE_PIXFMT)
diff --git a/tests/ref/fate/pixfmt-bgr24 b/tests/ref/fate/pixfmt-bgr24
new file mode 100644
index 0000000000..ac723db7b3
--- /dev/null
+++ b/tests/ref/fate/pixfmt-bgr24
@@ -0,0 +1,2 @@
+c6e0f9b5817f484b175c1ec4ffb4e9c9 *tests/data/pixfmt/bgr24.yuv
+304128 tests/data/pixfmt/bgr24.yuv
diff --git a/tests/ref/fate/pixfmt-gray b/tests/ref/fate/pixfmt-gray
new file mode 100644
index 0000000000..bc3843897e
--- /dev/null
+++ b/tests/ref/fate/pixfmt-gray
@@ -0,0 +1,2 @@
+6be306b0cce5f8e6c271ea17fef9745b *tests/data/pixfmt/gray.yuv
+304128 tests/data/pixfmt/gray.yuv
diff --git a/tests/ref/fate/pixfmt-monob b/tests/ref/fate/pixfmt-monob
new file mode 100644
index 0000000000..010739a5c7
--- /dev/null
+++ b/tests/ref/fate/pixfmt-monob
@@ -0,0 +1,2 @@
[phone]d2349dd48328a6862bc6711f *tests/data/pixfmt/monob.yuv
+304128 tests/data/pixfmt/monob.yuv
diff --git a/tests/ref/fate/pixfmt-monow b/tests/ref/fate/pixfmt-monow
new file mode 100644
index 0000000000..1b5143ab2a
--- /dev/null
+++ b/tests/ref/fate/pixfmt-monow
@@ -0,0 +1,2 @@
[phone]d2349dd48328a6862bc6711f *tests/data/pixfmt/monow.yuv
+304128 tests/data/pixfmt/monow.yuv
diff --git a/tests/ref/fate/pixfmt-rgb24 b/tests/ref/fate/pixfmt-rgb24
new file mode 100644
index 0000000000..c0d0026715
--- /dev/null
+++ b/tests/ref/fate/pixfmt-rgb24
@@ -0,0 +1,2 @@
+c6e0f9b5817f484b175c1ec4ffb4e9c9 *tests/data/pixfmt/rgb24.yuv
+304128 tests/data/pixfmt/rgb24.yuv
diff --git a/tests/ref/fate/pixfmt-rgb32 b/tests/ref/fate/pixfmt-rgb32
new file mode 100644
index 0000000000..b1a4ab1dd1
--- /dev/null
+++ b/tests/ref/fate/pixfmt-rgb32
@@ -0,0 +1,2 @@
+c6e0f9b5817f484b175c1ec4ffb4e9c9 *tests/data/pixfmt/rgb32.yuv
+304128 tests/data/pixfmt/rgb32.yuv
diff --git a/tests/ref/fate/pixfmt-rgb555 b/tests/ref/fate/pixfmt-rgb555
new file mode 100644
index 0000000000..a22a271a98
--- /dev/null
+++ b/tests/ref/fate/pixfmt-rgb555
@@ -0,0 +1,2 @@
+c894c3bd8d2631ed1964500b90a0c350 *tests/data/pixfmt/rgb555.yuv
+304128 tests/data/pixfmt/rgb555.yuv
diff --git a/tests/ref/fate/pixfmt-rgb565 b/tests/ref/fate/pixfmt-rgb565
new file mode 100644
index 0000000000..b81bb045f0
--- /dev/null
+++ b/tests/ref/fate/pixfmt-rgb565
@@ -0,0 +1,2 @@
+66d39d464bd89ded2a124897f0a75ade *tests/data/pixfmt/rgb565.yuv
+304128 tests/data/pixfmt/rgb565.yuv
diff --git a/tests/ref/fate/pixfmt-yuv410p b/tests/ref/fate/pixfmt-yuv410p
new file mode 100644
index 0000000000..0f1dcfda8c
--- /dev/null
+++ b/tests/ref/fate/pixfmt-yuv410p
@@ -0,0 +1,2 @@
+507c7e9f0c97660385df977469ca9e6d *tests/data/pixfmt/yuv410p.yuv
+304128 tests/data/pixfmt/yuv410p.yuv
diff --git a/tests/ref/fate/pixfmt-yuv411p b/tests/ref/fate/pixfmt-yuv411p
new file mode 100644
index 0000000000..0122b68e4a
--- /dev/null
+++ b/tests/ref/fate/pixfmt-yuv411p
@@ -0,0 +1,2 @@
+8594ea0b8d7c2c964525b0801b5351de *tests/data/pixfmt/yuv411p.yuv
+304128 tests/data/pixfmt/yuv411p.yuv
diff --git a/tests/ref/fate/pixfmt-yuv420p b/tests/ref/fate/pixfmt-yuv420p
new file mode 100644
index 0000000000..9adf81f856
--- /dev/null
+++ b/tests/ref/fate/pixfmt-yuv420p
@@ -0,0 +1,2 @@
+5641dba168ff665af1cdb4a91e1afdd6 *tests/data/pixfmt/yuv420p.yuv
+304128 tests/data/pixfmt/yuv420p.yuv
diff --git a/tests/ref/fate/pixfmt-yuv422p b/tests/ref/fate/pixfmt-yuv422p
new file mode 100644
index 0000000000..4240ec95a3
--- /dev/null
+++ b/tests/ref/fate/pixfmt-yuv422p
@@ -0,0 +1,2 @@
+ac68f9fdd9d55efd0306d9b004038761 *tests/data/pixfmt/yuv422p.yuv
+304128 tests/data/pixfmt/yuv422p.yuv
diff --git a/tests/ref/fate/pixfmt-yuv440p b/tests/ref/fate/pixfmt-yuv440p
new file mode 100644
index 0000000000..4e6ee4df6b
--- /dev/null
+++ b/tests/ref/fate/pixfmt-yuv440p
@@ -0,0 +1,2 @@
+00b85790df5740bab95e2559d81603a7 *tests/data/pixfmt/yuv440p.yuv
+304128 tests/data/pixfmt/yuv440p.yuv
diff --git a/tests/ref/fate/pixfmt-yuv444p b/tests/ref/fate/pixfmt-yuv444p
new file mode 100644
index 0000000000..85c871229a
--- /dev/null
+++ b/tests/ref/fate/pixfmt-yuv444p
@@ -0,0 +1,2 @@
+5641dba168ff665af1cdb4a91e1afdd6 *tests/data/pixfmt/yuv444p.yuv
+304128 tests/data/pixfmt/yuv444p.yuv
diff --git a/tests/ref/fate/pixfmt-yuvj420p b/tests/ref/fate/pixfmt-yuvj420p
new file mode 100644
index 0000000000..47a729ed45
--- /dev/null
+++ b/tests/ref/fate/pixfmt-yuvj420p
@@ -0,0 +1,2 @@
+e176bd14185788110e055f945de7f95f *tests/data/pixfmt/yuvj420p.yuv
+304128 tests/data/pixfmt/yuvj420p.yuv
diff --git a/tests/ref/fate/pixfmt-yuvj422p b/tests/ref/fate/pixfmt-yuvj422p
new file mode 100644
index 0000000000..6ab97d59db
--- /dev/null
+++ b/tests/ref/fate/pixfmt-yuvj422p
@@ -0,0 +1,2 @@
+472028e46a81c98d9b2477507def4723 *tests/data/pixfmt/yuvj422p.yuv
+304128 tests/data/pixfmt/yuvj422p.yuv
diff --git a/tests/ref/fate/pixfmt-yuvj440p b/tests/ref/fate/pixfmt-yuvj440p
new file mode 100644
index 0000000000..2beeae52c1
--- /dev/null
+++ b/tests/ref/fate/pixfmt-yuvj440p
@@ -0,0 +1,2 @@
+4d8d402c45d913038d4b725396719111 *tests/data/pixfmt/yuvj440p.yuv
+304128 tests/data/pixfmt/yuvj440p.yuv
diff --git a/tests/ref/fate/pixfmt-yuvj444p b/tests/ref/fate/pixfmt-yuvj444p
new file mode 100644
index 0000000000..63fb813d4b
--- /dev/null
+++ b/tests/ref/fate/pixfmt-yuvj444p
@@ -0,0 +1,2 @@
+c10442da177c9f1d12be3c53be6fa12c *tests/data/pixfmt/yuvj444p.yuv
+304128 tests/data/pixfmt/yuvj444p.yuv
diff --git a/tests/ref/fate/pixfmt-yuyv422 b/tests/ref/fate/pixfmt-yuyv422
new file mode 100644
index 0000000000..0978690007
--- /dev/null
+++ b/tests/ref/fate/pixfmt-yuyv422
@@ -0,0 +1,2 @@
+ac68f9fdd9d55efd0306d9b004038761 *tests/data/pixfmt/yuyv422.yuv
+304128 tests/data/pixfmt/yuyv422.yuv
diff --git a/tests/ref/lavf/pixfmt b/tests/ref/lavf/pixfmt
deleted file mode 100644
index f13f3dfb23..0000000000
--- a/tests/ref/lavf/pixfmt
+++ /dev/null
@@ -1,38 +0,0 @@
-5641dba168ff665af1cdb4a91e1afdd6 *tests/data/pixfmt/yuv420p.yuv
-304128 tests/data/pixfmt/yuv420p.yuv
-ac68f9fdd9d55efd0306d9b004038761 *tests/data/pixfmt/yuv422p.yuv
-304128 tests/data/pixfmt/yuv422p.yuv
-5641dba168ff665af1cdb4a91e1afdd6 *tests/data/pixfmt/yuv444p.yuv
-304128 tests/data/pixfmt/yuv444p.yuv
-ac68f9fdd9d55efd0306d9b004038761 *tests/data/pixfmt/yuyv422.yuv
-304128 tests/data/pixfmt/yuyv422.yuv
-507c7e9f0c97660385df977469ca9e6d *tests/data/pixfmt/yuv410p.yuv
-304128 tests/data/pixfmt/yuv410p.yuv
-8594ea0b8d7c2c964525b0801b5351de *tests/data/pixfmt/yuv411p.yuv
-304128 tests/data/pixfmt/yuv411p.yuv
-e176bd14185788110e055f945de7f95f *tests/data/pixfmt/yuvj420p.yuv
-304128 tests/data/pixfmt/yuvj420p.yuv
-472028e46a81c98d9b2477507def4723 *tests/data/pixfmt/yuvj422p.yuv
-304128 tests/data/pixfmt/yuvj422p.yuv
-c10442da177c9f1d12be3c53be6fa12c *tests/data/pixfmt/yuvj444p.yuv
-304128 tests/data/pixfmt/yuvj444p.yuv
-c6e0f9b5817f484b175c1ec4ffb4e9c9 *tests/data/pixfmt/rgb24.yuv
-304128 tests/data/pixfmt/rgb24.yuv
-c6e0f9b5817f484b175c1ec4ffb4e9c9 *tests/data/pixfmt/bgr24.yuv
-304128 tests/data/pixfmt/bgr24.yuv
-c6e0f9b5817f484b175c1ec4ffb4e9c9 *tests/data/pixfmt/rgb32.yuv
-304128 tests/data/pixfmt/rgb32.yuv
-66d39d464bd89ded2a124897f0a75ade *tests/data/pixfmt/rgb565.yuv
-304128 tests/data/pixfmt/rgb565.yuv
-c894c3bd8d2631ed1964500b90a0c350 *tests/data/pixfmt/rgb555.yuv
-304128 tests/data/pixfmt/rgb555.yuv
-6be306b0cce5f8e6c271ea17fef9745b *tests/data/pixfmt/gray.yuv
-304128 tests/data/pixfmt/gray.yuv
-31398104d2349dd48328a6862bc6711f *tests/data/pixfmt/monow.yuv
-304128 tests/data/pixfmt/monow.yuv
-31398104d2349dd48328a6862bc6711f *tests/data/pixfmt/monob.yuv
-304128 tests/data/pixfmt/monob.yuv
-00b85790df5740bab95e2559d81603a7 *tests/data/pixfmt/yuv440p.yuv
-304128 tests/data/pixfmt/yuv440p.yuv
-4d8d402c45d913038d4b725396719111 *tests/data/pixfmt/yuvj440p.yuv
-304128 tests/data/pixfmt/yuvj440p.yuv

[Luca Barbato]

---

YES!

[Diego Biurrun]

---

YES!

:-)

This had been a thorn in my side for a loooooong time...

Diego

[Sean McGovern]

Post by Diego Biurrun
---
tests/Makefile | 1 +
tests/fate-run.sh | 18 +++++++-----------
tests/fate/avformat.mak | 4 ----
tests/fate/pixfmt.mak | 27 +++++++++++++++++++++++++++
tests/ref/fate/pixfmt-bgr24 | 2 ++
tests/ref/fate/pixfmt-gray | 2 ++
tests/ref/fate/pixfmt-monob | 2 ++
tests/ref/fate/pixfmt-monow | 2 ++
tests/ref/fate/pixfmt-rgb24 | 2 ++
tests/ref/fate/pixfmt-rgb32 | 2 ++
tests/ref/fate/pixfmt-rgb555 | 2 ++
tests/ref/fate/pixfmt-rgb565 | 2 ++
tests/ref/fate/pixfmt-yuv410p | 2 ++
tests/ref/fate/pixfmt-yuv411p | 2 ++
tests/ref/fate/pixfmt-yuv420p | 2 ++
tests/ref/fate/pixfmt-yuv422p | 2 ++
tests/ref/fate/pixfmt-yuv440p | 2 ++
tests/ref/fate/pixfmt-yuv444p | 2 ++
tests/ref/fate/pixfmt-yuvj420p | 2 ++
tests/ref/fate/pixfmt-yuvj422p | 2 ++
tests/ref/fate/pixfmt-yuvj440p | 2 ++
tests/ref/fate/pixfmt-yuvj444p | 2 ++
tests/ref/fate/pixfmt-yuyv422 | 2 ++
tests/ref/lavf/pixfmt | 38 --------------------------------------
24 files changed, 73 insertions(+), 53 deletions(-)
create mode 100644 tests/fate/pixfmt.mak
create mode 100644 tests/ref/fate/pixfmt-bgr24
create mode 100644 tests/ref/fate/pixfmt-gray
create mode 100644 tests/ref/fate/pixfmt-monob
create mode 100644 tests/ref/fate/pixfmt-monow
create mode 100644 tests/ref/fate/pixfmt-rgb24
create mode 100644 tests/ref/fate/pixfmt-rgb32
create mode 100644 tests/ref/fate/pixfmt-rgb555
create mode 100644 tests/ref/fate/pixfmt-rgb565
create mode 100644 tests/ref/fate/pixfmt-yuv410p
create mode 100644 tests/ref/fate/pixfmt-yuv411p
create mode 100644 tests/ref/fate/pixfmt-yuv420p
create mode 100644 tests/ref/fate/pixfmt-yuv422p
create mode 100644 tests/ref/fate/pixfmt-yuv440p
create mode 100644 tests/ref/fate/pixfmt-yuv444p
create mode 100644 tests/ref/fate/pixfmt-yuvj420p
create mode 100644 tests/ref/fate/pixfmt-yuvj422p
create mode 100644 tests/ref/fate/pixfmt-yuvj440p
create mode 100644 tests/ref/fate/pixfmt-yuvj444p
create mode 100644 tests/ref/fate/pixfmt-yuyv422
delete mode 100644 tests/ref/lavf/pixfmt
diff --git a/tests/Makefile b/tests/Makefile
index 9fec13211f..adca8ad172 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -105,6 +105,7 @@ include $(SRC_PATH)/tests/fate/mpc.mak
include $(SRC_PATH)/tests/fate/mpeg4.mak
include $(SRC_PATH)/tests/fate/opus.mak
include $(SRC_PATH)/tests/fate/pcm.mak
+include $(SRC_PATH)/tests/fate/pixfmt.mak
include $(SRC_PATH)/tests/fate/probe.mak
include $(SRC_PATH)/tests/fate/prores.mak
include $(SRC_PATH)/tests/fate/qt.mak
diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 1da1f599c8..f8c3444e29 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -220,21 +220,17 @@ lavftest(){
${base}/lavf-regression.sh $t lavf tests/vsynth1 "$target_exec"
"$target_path" "$threads" "$thread_type" "$cpuflags"
}
-pixfmt(){
+pixfmt_conversion(){
t="${test#lavf-}"
+ conversion="${t#pixfmt-}"
raw_dst="tests/data/$t.lavf.out.yuv"
outdir="tests/data/pixfmt"
mkdir -p "$outdir"
- conversions="yuv420p yuv422p yuv444p yuyv422 yuv410p yuv411p yuvj420p \
- yuvj422p yuvj444p rgb24 bgr24 rgb32 rgb565 rgb555 gray monow \
- monob yuv440p yuvj440p"
- for pix_fmt in $conversions ; do
- file=${outdir}/${pix_fmt}.yuv
- run_avconv $DEC_OPTS -r 1 -f image2 -c:v pgmyuv -i $raw_src \
- $ENC_OPTS -f rawvideo -t 1 -s 352x288 -pix_fmt
$pix_fmt $target_path/$raw_dst
- do_avconv $file $DEC_OPTS -f rawvideo -s 352x288 -pix_fmt
$pix_fmt -i $target_path/$raw_dst \
- $ENC_OPTS -f rawvideo -s 352x288 -pix_fmt yuv444p
- done
+ file=${outdir}/${conversion}.yuv
+ run_avconv $DEC_OPTS -r 1 -f image2 -c:v pgmyuv -i $raw_src \
+ $ENC_OPTS -f rawvideo -t 1 -s 352x288 -pix_fmt $conversion
$target_path/$raw_dst
+ do_avconv $file $DEC_OPTS -f rawvideo -s 352x288 -pix_fmt $conversion
-i $target_path/$raw_dst \
+ $ENC_OPTS -f rawvideo -s 352x288 -pix_fmt yuv444p
}
video_filter(){
diff --git a/tests/fate/avformat.mak b/tests/fate/avformat.mak
index 59b46be54a..34292cf03c 100644
--- a/tests/fate/avformat.mak
+++ b/tests/fate/avformat.mak
@@ -74,13 +74,9 @@ $(FATE_LAVF_PIPE): REF =
$(FATE_LAVF_PIPE): $(VREF)
FATE_LAVF += $(FATE_LAVF-yes:%=fate-lavf-%)
-FATE_LAVF += fate-lavf-pixfmt
$(FATE_LAVF): $(AREF) $(VREF)
$(FATE_LAVF): CMD = lavftest
-fate-lavf-pixfmt: CMD = pixfmt
-
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)
diff --git a/tests/fate/pixfmt.mak b/tests/fate/pixfmt.mak
new file mode 100644
index 0000000000..eaa4cb01bf
--- /dev/null
+++ b/tests/fate/pixfmt.mak
@@ -0,0 +1,27 @@
+FATE_PIXFMT = bgr24 \
+ gray \
+ monob \
+ monow \
+ rgb24 \
+ rgb32 \
+ rgb555 \
+ rgb565 \
+ yuv410p \
+ yuv411p \
+ yuv420p \
+ yuv422p \
+ yuv440p \
+ yuv444p \
+ yuvj420p \
+ yuvj422p \
+ yuvj440p \
+ yuvj444p \
+ yuyv422 \
+
+FATE_PIXFMT := $(FATE_PIXFMT:%=fate-pixfmt-%)
+
+$(FATE_PIXFMT): CMD = pixfmt_conversion
+$(FATE_PIXFMT): $(VREF)
+
+FATE_AVCONV += $(FATE_PIXFMT)
+fate-pixfmt: $(FATE_PIXFMT)
diff --git a/tests/ref/fate/pixfmt-bgr24 b/tests/ref/fate/pixfmt-bgr24
new file mode 100644
index 0000000000..ac723db7b3
--- /dev/null
+++ b/tests/ref/fate/pixfmt-bgr24
@@ -0,0 +1,2 @@
+c6e0f9b5817f484b175c1ec4ffb4e9c9 *tests/data/pixfmt/bgr24.yuv
+304128 tests/data/pixfmt/bgr24.yuv
diff --git a/tests/ref/fate/pixfmt-gray b/tests/ref/fate/pixfmt-gray
new file mode 100644
index 0000000000..bc3843897e
--- /dev/null
+++ b/tests/ref/fate/pixfmt-gray
@@ -0,0 +1,2 @@
+6be306b0cce5f8e6c271ea17fef9745b *tests/data/pixfmt/gray.yuv
+304128 tests/data/pixfmt/gray.yuv
diff --git a/tests/ref/fate/pixfmt-monob b/tests/ref/fate/pixfmt-monob
new file mode 100644
index 0000000000..010739a5c7
--- /dev/null
+++ b/tests/ref/fate/pixfmt-monob
@@ -0,0 +1,2 @@
[phone]d2349dd48328a6862bc6711f *tests/data/pixfmt/monob.yuv
+304128 tests/data/pixfmt/monob.yuv
diff --git a/tests/ref/fate/pixfmt-monow b/tests/ref/fate/pixfmt-monow
new file mode 100644
index 0000000000..1b5143ab2a
--- /dev/null
+++ b/tests/ref/fate/pixfmt-monow
@@ -0,0 +1,2 @@
[phone]d2349dd48328a6862bc6711f *tests/data/pixfmt/monow.yuv
+304128 tests/data/pixfmt/monow.yuv
diff --git a/tests/ref/fate/pixfmt-rgb24 b/tests/ref/fate/pixfmt-rgb24
new file mode 100644
index 0000000000..c0d0026715
--- /dev/null
+++ b/tests/ref/fate/pixfmt-rgb24
@@ -0,0 +1,2 @@
+c6e0f9b5817f484b175c1ec4ffb4e9c9 *tests/data/pixfmt/rgb24.yuv
+304128 tests/data/pixfmt/rgb24.yuv
diff --git a/tests/ref/fate/pixfmt-rgb32 b/tests/ref/fate/pixfmt-rgb32
new file mode 100644
index 0000000000..b1a4ab1dd1
--- /dev/null
+++ b/tests/ref/fate/pixfmt-rgb32
@@ -0,0 +1,2 @@
+c6e0f9b5817f484b175c1ec4ffb4e9c9 *tests/data/pixfmt/rgb32.yuv
+304128 tests/data/pixfmt/rgb32.yuv
diff --git a/tests/ref/fate/pixfmt-rgb555 b/tests/ref/fate/pixfmt-rgb555
new file mode 100644
index 0000000000..a22a271a98
--- /dev/null
+++ b/tests/ref/fate/pixfmt-rgb555
@@ -0,0 +1,2 @@
+c894c3bd8d2631ed1964500b90a0c350 *tests/data/pixfmt/rgb555.yuv
+304128 tests/data/pixfmt/rgb555.yuv
diff --git a/tests/ref/fate/pixfmt-rgb565 b/tests/ref/fate/pixfmt-rgb565
new file mode 100644
index 0000000000..b81bb045f0
--- /dev/null
+++ b/tests/ref/fate/pixfmt-rgb565
@@ -0,0 +1,2 @@
+66d39d464bd89ded2a124897f0a75ade *tests/data/pixfmt/rgb565.yuv
+304128 tests/data/pixfmt/rgb565.yuv
diff --git a/tests/ref/fate/pixfmt-yuv410p b/tests/ref/fate/pixfmt-yuv410p
new file mode 100644
index 0000000000..0f1dcfda8c
--- /dev/null
+++ b/tests/ref/fate/pixfmt-yuv410p
@@ -0,0 +1,2 @@
+507c7e9f0c97660385df977469ca9e6d *tests/data/pixfmt/yuv410p.yuv
+304128 tests/data/pixfmt/yuv410p.yuv
diff --git a/tests/ref/fate/pixfmt-yuv411p b/tests/ref/fate/pixfmt-yuv411p
new file mode 100644
index 0000000000..0122b68e4a
--- /dev/null
+++ b/tests/ref/fate/pixfmt-yuv411p
@@ -0,0 +1,2 @@
+8594ea0b8d7c2c964525b0801b5351de *tests/data/pixfmt/yuv411p.yuv
+304128 tests/data/pixfmt/yuv411p.yuv
diff --git a/tests/ref/fate/pixfmt-yuv420p b/tests/ref/fate/pixfmt-yuv420p
new file mode 100644
index 0000000000..9adf81f856
--- /dev/null
+++ b/tests/ref/fate/pixfmt-yuv420p
@@ -0,0 +1,2 @@
+5641dba168ff665af1cdb4a91e1afdd6 *tests/data/pixfmt/yuv420p.yuv
+304128 tests/data/pixfmt/yuv420p.yuv
diff --git a/tests/ref/fate/pixfmt-yuv422p b/tests/ref/fate/pixfmt-yuv422p
new file mode 100644
index 0000000000..4240ec95a3
--- /dev/null
+++ b/tests/ref/fate/pixfmt-yuv422p
@@ -0,0 +1,2 @@
+ac68f9fdd9d55efd0306d9b004038761 *tests/data/pixfmt/yuv422p.yuv
+304128 tests/data/pixfmt/yuv422p.yuv
diff --git a/tests/ref/fate/pixfmt-yuv440p b/tests/ref/fate/pixfmt-yuv440p
new file mode 100644
index 0000000000..4e6ee4df6b
--- /dev/null
+++ b/tests/ref/fate/pixfmt-yuv440p
@@ -0,0 +1,2 @@
+00b85790df5740bab95e2559d81603a7 *tests/data/pixfmt/yuv440p.yuv
+304128 tests/data/pixfmt/yuv440p.yuv
diff --git a/tests/ref/fate/pixfmt-yuv444p b/tests/ref/fate/pixfmt-yuv444p
new file mode 100644
index 0000000000..85c871229a
--- /dev/null
+++ b/tests/ref/fate/pixfmt-yuv444p
@@ -0,0 +1,2 @@
+5641dba168ff665af1cdb4a91e1afdd6 *tests/data/pixfmt/yuv444p.yuv
+304128 tests/data/pixfmt/yuv444p.yuv
diff --git a/tests/ref/fate/pixfmt-yuvj420p
b/tests/ref/fate/pixfmt-yuvj420p
new file mode 100644
index 0000000000..47a729ed45
--- /dev/null
+++ b/tests/ref/fate/pixfmt-yuvj420p
@@ -0,0 +1,2 @@
+e176bd14185788110e055f945de7f95f *tests/data/pixfmt/yuvj420p.yuv
+304128 tests/data/pixfmt/yuvj420p.yuv
diff --git a/tests/ref/fate/pixfmt-yuvj422p
b/tests/ref/fate/pixfmt-yuvj422p
new file mode 100644
index 0000000000..6ab97d59db
--- /dev/null
+++ b/tests/ref/fate/pixfmt-yuvj422p
@@ -0,0 +1,2 @@
+472028e46a81c98d9b2477507def4723 *tests/data/pixfmt/yuvj422p.yuv
+304128 tests/data/pixfmt/yuvj422p.yuv
diff --git a/tests/ref/fate/pixfmt-yuvj440p
b/tests/ref/fate/pixfmt-yuvj440p
new file mode 100644
index 0000000000..2beeae52c1
--- /dev/null
+++ b/tests/ref/fate/pixfmt-yuvj440p
@@ -0,0 +1,2 @@
+4d8d402c45d913038d4b725396719111 *tests/data/pixfmt/yuvj440p.yuv
+304128 tests/data/pixfmt/yuvj440p.yuv
diff --git a/tests/ref/fate/pixfmt-yuvj444p
b/tests/ref/fate/pixfmt-yuvj444p
new file mode 100644
index 0000000000..63fb813d4b
--- /dev/null
+++ b/tests/ref/fate/pixfmt-yuvj444p
@@ -0,0 +1,2 @@
+c10442da177c9f1d12be3c53be6fa12c *tests/data/pixfmt/yuvj444p.yuv
+304128 tests/data/pixfmt/yuvj444p.yuv
diff --git a/tests/ref/fate/pixfmt-yuyv422 b/tests/ref/fate/pixfmt-yuyv422
new file mode 100644
index 0000000000..0978690007
--- /dev/null
+++ b/tests/ref/fate/pixfmt-yuyv422
@@ -0,0 +1,2 @@
+ac68f9fdd9d55efd0306d9b004038761 *tests/data/pixfmt/yuyv422.yuv
+304128 tests/data/pixfmt/yuyv422.yuv
diff --git a/tests/ref/lavf/pixfmt b/tests/ref/lavf/pixfmt
deleted file mode 100644
index f13f3dfb23..0000000000
--- a/tests/ref/lavf/pixfmt
+++ /dev/null
@@ -1,38 +0,0 @@
-5641dba168ff665af1cdb4a91e1afdd6 *tests/data/pixfmt/yuv420p.yuv
-304128 tests/data/pixfmt/yuv420p.yuv
-ac68f9fdd9d55efd0306d9b004038761 *tests/data/pixfmt/yuv422p.yuv
-304128 tests/data/pixfmt/yuv422p.yuv
-5641dba168ff665af1cdb4a91e1afdd6 *tests/data/pixfmt/yuv444p.yuv
-304128 tests/data/pixfmt/yuv444p.yuv
-ac68f9fdd9d55efd0306d9b004038761 *tests/data/pixfmt/yuyv422.yuv
-304128 tests/data/pixfmt/yuyv422.yuv
-507c7e9f0c97660385df977469ca9e6d *tests/data/pixfmt/yuv410p.yuv
-304128 tests/data/pixfmt/yuv410p.yuv
-8594ea0b8d7c2c964525b0801b5351de *tests/data/pixfmt/yuv411p.yuv
-304128 tests/data/pixfmt/yuv411p.yuv
-e176bd14185788110e055f945de7f95f *tests/data/pixfmt/yuvj420p.yuv
-304128 tests/data/pixfmt/yuvj420p.yuv
-472028e46a81c98d9b2477507def4723 *tests/data/pixfmt/yuvj422p.yuv
-304128 tests/data/pixfmt/yuvj422p.yuv
-c10442da177c9f1d12be3c53be6fa12c *tests/data/pixfmt/yuvj444p.yuv
-304128 tests/data/pixfmt/yuvj444p.yuv
-c6e0f9b5817f484b175c1ec4ffb4e9c9 *tests/data/pixfmt/rgb24.yuv
-304128 tests/data/pixfmt/rgb24.yuv
-c6e0f9b5817f484b175c1ec4ffb4e9c9 *tests/data/pixfmt/bgr24.yuv
-304128 tests/data/pixfmt/bgr24.yuv
-c6e0f9b5817f484b175c1ec4ffb4e9c9 *tests/data/pixfmt/rgb32.yuv
-304128 tests/data/pixfmt/rgb32.yuv
-66d39d464bd89ded2a124897f0a75ade *tests/data/pixfmt/rgb565.yuv
-304128 tests/data/pixfmt/rgb565.yuv
-c894c3bd8d2631ed1964500b90a0c350 *tests/data/pixfmt/rgb555.yuv
-304128 tests/data/pixfmt/rgb555.yuv
-6be306b0cce5f8e6c271ea17fef9745b *tests/data/pixfmt/gray.yuv
-304128 tests/data/pixfmt/gray.yuv
-31398104d2349dd48328a6862bc6711f *tests/data/pixfmt/monow.yuv
-304128 tests/data/pixfmt/monow.yuv
-31398104d2349dd48328a6862bc6711f *tests/data/pixfmt/monob.yuv
-304128 tests/data/pixfmt/monob.yuv
-00b85790df5740bab95e2559d81603a7 *tests/data/pixfmt/yuv440p.yuv
-304128 tests/data/pixfmt/yuv440p.yuv
-4d8d402c45d913038d4b725396719111 *tests/data/pixfmt/yuvj440p.yuv
-304128 tests/data/pixfmt/yuvj440p.yuv
--
2.11.0
_______________________________________________
libav-devel mailing list
https://lists.libav.org/mailman/listinfo/libav-devel

Thank you very much for completing this, Diego.

Much appreciated,

Sean McG.

[Diego Biurrun]

*PLEASE* snip your quotes.

Post by Sean McGovern

[...]

Thank you very much for completing this, Diego.
Much appreciated,

You are welcome :)

Diego

[Diego Biurrun]

---
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
@@ -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

[Vittorio Giovara]

Post by Diego Biurrun
---
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

Post by Diego Biurrun
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]

Post by Vittorio Giovara

Post by Diego Biurrun
--- 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?

Post by Vittorio Giovara

Post by Diego Biurrun
--- 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.

Post by Vittorio Giovara
or does changing the path (dropping "./") actually matter?

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

Diego

[Vittorio Giovara]

Post by Diego Biurrun

Post by Vittorio Giovara

Post by Diego Biurrun
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
-FATE_LAVF-$(call ENCDEC2, MPEG4, MP2, NUT)

+= nut

Post by Vittorio Giovara

Post by Diego Biurrun
FATE_LAVF-$(call ENCMUX, RV10 AC3_FIXED, RM)

+= rm

Post by Vittorio Giovara

Post by Diego Biurrun
-FATE_LAVF-$(call ENCDEC, FLV, SWF)

+= swf

Post by Vittorio Giovara

Post by Diego Biurrun
-FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, MP2, MPEGTS)

+= ts

Post by Vittorio Giovara

Post by Diego Biurrun
FATE_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER)

+= y4m

Post by Vittorio Giovara

Post by Diego Biurrun
+
+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

Post by Diego Biurrun

Post by Vittorio Giovara

Post by Diego Biurrun
--- 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]

Post by Vittorio Giovara

Post by Diego Biurrun

Post by Vittorio Giovara

Post by Diego Biurrun
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
-FATE_LAVF-$(call ENCDEC2, MPEG4, MP2, NUT)

+= nut

Post by Vittorio Giovara

Post by Diego Biurrun
FATE_LAVF-$(call ENCMUX, RV10 AC3_FIXED, RM)

+= rm

Post by Vittorio Giovara

Post by Diego Biurrun
-FATE_LAVF-$(call ENCDEC, FLV, SWF)

+= swf

Post by Vittorio Giovara

Post by Diego Biurrun
-FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, MP2, MPEGTS)

+= ts

Post by Vittorio Giovara

Post by Diego Biurrun
FATE_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER)

+= y4m

Post by Vittorio Giovara

Post by Diego Biurrun
+
+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]

Post by Diego Biurrun

Post by Vittorio Giovara

Post by Diego Biurrun

Post by Vittorio Giovara

Post by Diego Biurrun
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
-FATE_LAVF-$(call ENCDEC2, MPEG4, MP2, NUT)

+= nut

Post by Vittorio Giovara

Post by Diego Biurrun
FATE_LAVF-$(call ENCMUX, RV10 AC3_FIXED, RM)

+= rm

Post by Vittorio Giovara

Post by Diego Biurrun
-FATE_LAVF-$(call ENCDEC, FLV, SWF)

+= swf

Post by Vittorio Giovara

Post by Diego Biurrun
-FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, MP2, MPEGTS)

+= ts

Post by Vittorio Giovara

Post by Diego Biurrun
FATE_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER)

+= y4m

Post by Vittorio Giovara

Post by Diego Biurrun
+
+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

Post by Vittorio Giovara

Post by Diego Biurrun
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

[Diego Biurrun]

---
tests/fate/avformat.mak | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/fate/avformat.mak b/tests/fate/avformat.mak
index 026f6e3084..d27de75185 100644
--- a/tests/fate/avformat.mak
+++ b/tests/fate/avformat.mak
@@ -24,17 +24,15 @@ $(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-avi fate-lavf-nut: 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-flv fate-lavf-swf: 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"

[Diego Biurrun]

---
tests/fate-run.sh | 3 ++-
tests/fate/avformat.mak | 4 +++-
tests/lavf-regression.sh | 8 --------
tests/ref/lavf/rm | 4 ++--
4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index d6eb556dae..2626a894a0 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -210,7 +210,8 @@ 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
+ test $3 = "disable_crc" ||
+ do_avconv_crc $file $DEC_OPTS -i $target_path/$file $3
}

streamed_images(){
diff --git a/tests/fate/avformat.mak b/tests/fate/avformat.mak
index d27de75185..4ecbb1d4bf 100644
--- a/tests/fate/avformat.mak
+++ b/tests/fate/avformat.mak
@@ -1,5 +1,4 @@
FATE_LAVF-$(call ENCDEC, GIF, IMAGE2) += gif
-FATE_LAVF-$(call ENCMUX, RV10 AC3_FIXED, RM) += rm
FATE_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER) += y4m


@@ -14,6 +13,7 @@ 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 ENCMUX, RV10 AC3_FIXED, RM) += rm
FATE_LAVF_LAVF-$(call ENCDEC, FLV, SWF) += swf
FATE_LAVF_LAVF-$(call ENCDEC2, MPEG2VIDEO, MP2, MPEGTS) += ts

@@ -33,6 +33,8 @@ 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"
+# The lavf-rm CRC test is broken
+fate-lavf-rm: CMD = lavf "" "-c:a ac3_fixed" disable_crc
fate-lavf-ts: CMD = lavf "" "-mpegts_transport_stream_id 42 -ar 44100"


diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
index 3d8f46d215..a82c23e809 100755
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@ -11,14 +11,6 @@ set -e

eval do_$test=y

-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
-# broken
-#do_avconv_crc $file -i $target_path/$file
-fi
-
-
# streamed images
# mjpeg
#file=${outdir}lavf.mjpeg
diff --git a/tests/ref/lavf/rm b/tests/ref/lavf/rm
index 4793d67e75..d287309f29 100644
--- a/tests/ref/lavf/rm
+++ b/tests/ref/lavf/rm
@@ -1,2 +1,2 @@
-9eeb3b91c0a45f519fd7f2efea882cf4 *./tests/data/fate/lavf.rm
-346414 ./tests/data/fate/lavf.rm
+9eeb3b91c0a45f519fd7f2efea882cf4 *tests/data/fate/lavf.rm
+346414 tests/data/fate/lavf.rm

[Diego Biurrun]

---
tests/fate-run.sh | 7 +++++++
tests/fate/avformat.mak | 20 +++++++++++---------
tests/ref/lavf/gif | 6 +++---
tests/ref/lavf/y4m | 6 +++---
4 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 2626a894a0..cb44b21e0e 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -195,6 +195,13 @@ audio_only(){
do_avconv_crc $file $DEC_OPTS $3 -i $target_path/$file
}

+video_only(){
+ t="${test#lavf-}"
+ file=${outdir}/lavf.$t
+ do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $ENC_OPTS -t 1 -qscale 10 $1
+ do_avconv_crc $file $DEC_OPTS -i $target_path/$file $1
+}
+
image_formats(){
t="${test#lavf-}"
outdir="tests/data/images/$t"
diff --git a/tests/fate/avformat.mak b/tests/fate/avformat.mak
index 4ecbb1d4bf..4c149817bb 100644
--- a/tests/fate/avformat.mak
+++ b/tests/fate/avformat.mak
@@ -1,7 +1,3 @@
-FATE_LAVF-$(call ENCDEC, GIF, IMAGE2) += gif
-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
@@ -96,10 +92,16 @@ $(FATE_LAVF_PIPE): CMD = streamed_images
$(FATE_LAVF_PIPE): REF = $(SRC_PATH)/tests/ref/lavf/$(@:fate-lavf-%=%)
$(FATE_LAVF_PIPE): $(VREF)

-FATE_LAVF += $(FATE_LAVF-yes:%=fate-lavf-%)
+FATE_LAVF_VIDEO_ONLY-$(call ENCDEC, GIF, IMAGE2) += gif
+FATE_LAVF_VIDEO_ONLY-$(CONFIG_YUV4MPEGPIPE_MUXER) += y4m
+
+FATE_LAVF_VIDEO_ONLY = $(FATE_LAVF_VIDEO_ONLY-yes:%=fate-lavf-%)
+
+$(FATE_LAVF_VIDEO_ONLY): CMD = video_only
+$(FATE_LAVF_VIDEO_ONLY): REF = $(SRC_PATH)/tests/ref/lavf/$(@:fate-lavf-%=%)
+$(FATE_LAVF_VIDEO_ONLY): $(VREF)

-$(FATE_LAVF): $(AREF) $(VREF)
-$(FATE_LAVF): CMD = lavftest
+fate-lavf-gif: CMD = video_only "-pix_fmt rgb24"

-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)
+FATE_AVCONV += $(FATE_LAVF_AUDIO_ONLY) $(FATE_LAVF_IMAGES) $(FATE_LAVF_LAVF) $(FATE_LAVF_PIPE) $(FATE_LAVF_VIDEO_ONLY)
+fate-lavf: $(FATE_LAVF_AUDIO_ONLY) $(FATE_LAVF_IMAGES) $(FATE_LAVF_LAVF) $(FATE_LAVF_PIPE) $(FATE_LAVF_VIDEO_ONLY)
diff --git a/tests/ref/lavf/gif b/tests/ref/lavf/gif
index ca6eb1c1fd..fbec091b83 100644
--- a/tests/ref/lavf/gif
+++ b/tests/ref/lavf/gif
@@ -1,3 +1,3 @@
-e6089fd4ef3b9df44090ab3650bdd810 *./tests/data/fate/lavf.gif
-2906401 ./tests/data/fate/lavf.gif
-./tests/data/fate/lavf.gif CRC=0xe5605ff6
+e6089fd4ef3b9df44090ab3650bdd810 *tests/data/fate/lavf.gif
+2906401 tests/data/fate/lavf.gif
+tests/data/fate/lavf.gif CRC=0xe5605ff6
diff --git a/tests/ref/lavf/y4m b/tests/ref/lavf/y4m
index c130e1c7cc..d1b077db3e 100644
--- a/tests/ref/lavf/y4m
+++ b/tests/ref/lavf/y4m
@@ -1,3 +1,3 @@
-ec8178cb152f9cdbfd9cb724d977db2e *./tests/data/fate/lavf.y4m
-3801808 ./tests/data/fate/lavf.y4m
-./tests/data/fate/lavf.y4m CRC=0x0a941f26
+ec8178cb152f9cdbfd9cb724d977db2e *tests/data/fate/lavf.y4m
+3801808 tests/data/fate/lavf.y4m
+tests/data/fate/lavf.y4m CRC=0x0a941f26

[Diego Biurrun]

---
tests/fate-run.sh | 6 -----
tests/lavf-regression.sh | 30 ---------------------
tests/regression-funcs.sh | 67 -----------------------------------------------
3 files changed, 103 deletions(-)
delete mode 100755 tests/lavf-regression.sh
delete mode 100755 tests/regression-funcs.sh

diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index cb44b21e0e..60417a9414 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -229,12 +229,6 @@ streamed_images(){
do_avconv_crc $file $DEC_OPTS -f image2pipe -i $target_path/$file
}

-lavftest(){
- t="${test#lavf-}"
- ref=${base}/ref/lavf/$t
- ${base}/lavf-regression.sh $t lavf tests/vsynth1 "$target_exec" "$target_path" "$threads" "$thread_type" "$cpuflags"
-}
-
pixfmt_conversion(){
t="${test#lavf-}"
conversion="${t#pixfmt-}"
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
deleted file mode 100755
index a82c23e809..0000000000
--- a/tests/lavf-regression.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-#
-# automatic regression test for libavformat
-#
-#
-#set -x
-
-set -e
-
-. $(dirname $0)/regression-funcs.sh
-
-eval do_$test=y
-
-# streamed images
-# mjpeg
-#file=${outdir}lavf.mjpeg
-#do_avconv $file -t 1 -qscale 10 -f image2 -c:v pgmyuv -i $raw_src
-#do_avconv_crc $file -i $target_path/$file
-
-if [ -n "$do_gif" ] ; then
-file=${outdir}lavf.gif
-do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $ENC_OPTS -t 1 -qscale 10 -pix_fmt rgb24
-do_avconv_crc $file $DEC_OPTS -i $target_path/$file -pix_fmt rgb24
-fi
-
-if [ -n "$do_y4m" ] ; then
-file=${outdir}lavf.$test
-do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $ENC_OPTS -t 1 -qscale 10
-do_avconv_crc $file -i $target_path/$file
-fi
diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh
deleted file mode 100755
index 9247139386..0000000000
--- a/tests/regression-funcs.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-#
-# common regression functions for avconv
-#
-#
-
-test="${1#regtest-}"
-test_ref=$2
-raw_src_dir=$3
-target_exec=$4
-target_path=$5
-threads=${6:-1}
-cpuflags=${8:-all}
-
-datadir="./tests/data"
-target_datadir="${target_path}/${datadir}"
-
-this="$test.$test_ref"
-outdir="$datadir/fate/"
-
-# various files
-avconv="$target_exec ${target_path}/avconv"
-raw_src="${target_path}/$raw_src_dir/%02d.pgm"
-raw_dst="$datadir/$this.out.yuv"
-pcm_src="$target_datadir/asynth1.sw"
-crcfile="$datadir/$this.crc"
-target_crcfile="$target_datadir/$this.crc"
-
-cleanfiles="$raw_dst $crcfile"
-trap 'rm -f -- $cleanfiles' EXIT
-
-[ "${V-0}" -gt 0 ] && echov=echov || echov=:
-
-echov(){
- echo "$@" >&3
-}
-
-. $(dirname $0)/md5.sh
-
-AVCONV_OPTS="-nostats -y -cpuflags $cpuflags"
-COMMON_OPTS="-flags +bitexact -idct simple -sws_flags +accurate_rnd+bitexact -fflags +bitexact"
-DEC_OPTS="$COMMON_OPTS -threads $threads"
-ENC_OPTS="$COMMON_OPTS -threads 1 -dct fastint"
-
-run_avconv()
-{
- $echov $avconv $AVCONV_OPTS $*
- $avconv $AVCONV_OPTS $*
-}
-
-do_avconv()
-{
- f="$1"
- shift
- set -- $* ${target_path}/$f
- run_avconv $*
- do_md5sum $f
- echo $(wc -c $f)
-}
-
-do_avconv_crc()
-{
- f="$1"
- shift
- run_avconv $* -f crc "$target_crcfile"
- echo "$f $(cat $crcfile)"
-}

[Luca Barbato]

Post by Diego Biurrun
Hello world!
I got bored/motivated while travelling a few weeks ago and finally
tackled this thing that I had been planning since forever.
The fate-lavf tests still use the legacy staged shellscript infrastructure
and are not properly managed through the Makefiles. This set fixes that
issue and eliminates the old legacy scripts, resulting in a simpler and
more maintainable test infrastructure.
It also splits the huge monolithic lavf-pixfmt test into small pieces,
resulting in more detailed error messages and a huge speedup when using
multiple cores.
This still has some rough edges here and there that show how the set
evolved initially. I could possibly squash some of the patches. For
example, I could drop the elimination of the silly first arguments
of the do_foo() helper functions and drop the argument as part of
the move to fate-run.sh.
It is, however, ripe for a first round of comments.

Overall looks good to me. I'd consider landing it to oracle and see what
happens :)

lu