---
tests/Makefile | 5 +++++
tests/fate/avformat.mak | 1 +
tests/lavf-regression.sh | 9 +++++++++
tests/ref/lavf/crypto | 3 +++
4 files changed, 18 insertions(+)
create mode 100644 tests/ref/lavf/crypto
diff --git a/tests/Makefile b/tests/Makefile
index 7ee4a46..c501813 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -82,6 +82,11 @@ ENCDEC2 = $(call ALLYES, $(firstword $(1))_ENCODER
$(lastword $(1))_DECODER \
$(firstword $(2))_ENCODER $(lastword $(2))_DECODER \
$(firstword $(3))_MUXER $(lastword $(3))_DEMUXER)
+ENCDEC2PRO = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER
\
+ $(firstword $(2))_ENCODER $(lastword $(2))_DECODER
\
+ $(firstword $(3))_MUXER $(lastword $(3))_DEMUXER
\
+ $(firstword $(4))_PROTOCOL)
+
DEMDEC = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER))
ENCMUX = $(call ALLYES, $(1:%=%_ENCODER) $(2)_MUXER)
diff --git a/tests/fate/avformat.mak b/tests/fate/avformat.mak
index 1d13434..e65c3f9 100644
--- a/tests/fate/avformat.mak
+++ b/tests/fate/avformat.mak
@@ -6,6 +6,7 @@ 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, PCM_S16BE, CAF) += caf
+FATE_LAVF-$(call ENCDEC2PRO, MPEG4, MP2, NUT, CRYPTO) += crypto
FATE_LAVF-$(call ENCDEC, DPX, IMAGE2) += dpx
FATE_LAVF-$(call ENCDEC2, DVVIDEO, PCM_S16LE, AVI) += dv_fmt
FATE_LAVF-$(call ENCDEC2, MPEG1VIDEO, MP2, FFM) += ffm
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
index a37f714..58287ff 100755
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@ -168,6 +168,15 @@ if [ -n "$do_wtv" ] ; then
do_lavf wtv "" "-acodec mp2 -threads 1"
fi
+if [ -n "$do_crypto" ] ; then
+crypto_flags="-key 0123456789abcdef0011223344556677 -iv
aabbccddeeff11335577999876542222"
+file=${outfile}lavf.crypto.nut
+f=${target_path}/$file
+run_avconv $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $DEC_OPTS -ar 44100
-f s16le -i $pcm_src $ENC_OPTS -b:a 64k -t 1 -qscale:v 10 -acodec mp2 -ab 64k
-ar 44100 -threads 1 $crypto_flags crypto:$f
+do_md5sum $file
+echo $(wc -c $file)
+do_avconv_crc crypto $DEC_OPTS $crypto_flags -i crypto:$f
+fi
# streamed images
# mjpeg
diff --git a/tests/ref/lavf/crypto b/tests/ref/lavf/crypto
new file mode 100644
index 0000000..d1dfd66
--- /dev/null
+++ b/tests/ref/lavf/crypto
@@ -0,0 +1,3 @@
+a12b1a78ebc04786a694394a4d6d6c41 *./tests/data/lavf/lavf.crypto.nut
+319968 ./tests/data/lavf/lavf.crypto.nut
+crypto CRC=0xec6c3c68
--
2.6.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
