---
tests/fate/avformat.mak | 1 +
tests/lavf-regression.sh | 8 ++++++++
tests/ref/lavf-fate/crypto | 3 +++
3 files changed, 12 insertions(+)
create mode 100644 tests/ref/lavf-fate/crypto
diff --git a/tests/fate/avformat.mak b/tests/fate/avformat.mak
index 1d13434..21b8f8a 100644
--- a/tests/fate/avformat.mak
+++ b/tests/fate/avformat.mak
@@ -68,6 +68,7 @@ fate-lavf: $(FATE_LAVF)
FATE_LAVF_FATE-$(call ALLYES, MATROSKA_DEMUXER OGG_MUXER) += ogg_vp3
FATE_LAVF_FATE-$(call ALLYES, MOV_DEMUXER LATM_MUXER) += latm
FATE_LAVF_FATE-$(call ALLYES, MP3_DEMUXER MP3_MUXER) += mp3
+FATE_LAVF_FATE-$(call ALLYES, NUT_MUXER CRYPTO_PROTOCOL) += crypto
FATE_LAVF_FATE += $(FATE_LAVF_FATE-yes:%=fate-lavf-fate-%)
$(FATE_LAVF_FATE): CMD = lavffatetest
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
index a37f714..5c90ae8 100755
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@ -168,6 +168,14 @@ 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=${target_path}/${outfile}lavf.crypto.nut
+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:$file
+do_md5sum $file
+echo $(wc -c $file)
+do_avconv_crc crypto $DEC_OPTS $crypto_flags -i crypto:$file
+fi
# streamed images
# mjpeg
diff --git a/tests/ref/lavf-fate/crypto b/tests/ref/lavf-fate/crypto
new file mode 100644
index 0000000..a993a7b
--- /dev/null
+++ b/tests/ref/lavf-fate/crypto
@@ -0,0 +1,3 @@
+a12b1a78ebc04786a694394a4d6d6c41
*/Users/rcombs/source/ffmpeg/./tests/data/lavf-fate/lavf.crypto.nut
+319968 /Users/rcombs/source/ffmpeg/./tests/data/lavf-fate/lavf.crypto.nut
+crypto CRC=0xec6c3c68
--
2.6.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
