diff options
Diffstat (limited to 'tests')
73 files changed, 908 insertions, 265 deletions
diff --git a/tests/Makefile b/tests/Makefile index b511a9a118..53a273762d 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,3 +1,5 @@ +FFSERVER_REFFILE = $(SRC_PATH)/tests/ffserver.regression.ref + AREF = fate-acodec-aref VREF = fate-vsynth1-vref fate-vsynth2-vref REFS = $(AREF) $(VREF) @@ -5,6 +7,13 @@ REFS = $(AREF) $(VREF) $(VREF): avconv$(EXESUF) tests/vsynth1/00.pgm tests/vsynth2/00.pgm $(AREF): avconv$(EXESUF) tests/data/asynth1.sw +ffservertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/data/asynth1.sw + @echo + @echo "Unfortunately ffserver is broken and therefore its regression" + @echo "test fails randomly. Treat the results accordingly." + @echo + $(SRC_PATH)/tests/ffserver-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/ffserver.conf + tests/vsynth1/00.pgm: tests/videogen$(HOSTEXESUF) @mkdir -p tests/vsynth1 $(M)./$< 'tests/vsynth1/' @@ -72,7 +81,7 @@ fate-seek: $(FATE_SEEK) ifdef SAMPLES FATE += $(FATE_TESTS) fate-rsync: - rsync -vaLW rsync://fate-suite.libav.org/fate-suite/ $(SAMPLES) + rsync -vaLW rsync://fate.ffmpeg.org/fate-suite/ $(SAMPLES) else fate-rsync: @echo "use 'make fate-rsync SAMPLES=/path/to/samples' to sync the fate suite" @@ -82,11 +91,13 @@ endif FATE_UTILS = base64 tiny_psnr +TOOL = ffmpeg + fate: $(FATE) -$(FATE): avconv$(EXESUF) $(FATE_UTILS:%=tests/%$(HOSTEXESUF)) +$(FATE): $(TOOL)$(EXESUF) $(FATE_UTILS:%=tests/%$(HOSTEXESUF)) @echo "TEST $(@:fate-%=%)" - $(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)' + $(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)' '$(TOOL)' fate-list: @printf '%s\n' $(sort $(FATE)) @@ -94,7 +105,7 @@ fate-list: clean:: testclean testclean: - $(RM) -r tests/vsynth1 tests/vsynth2 tests/data + $(RM) -r tests/vsynth1 tests/vsynth2 tests/data tools/lavfi-showfiltfmts$(EXESUF) $(RM) $(CLEANSUFFIXES:%=tests/%) $(RM) $(TESTTOOLS:%=tests/%$(HOSTEXESUF)) diff --git a/tests/audiogen.c b/tests/audiogen.c index ddd1e18028..852e04268b 100644 --- a/tests/audiogen.c +++ b/tests/audiogen.c @@ -4,20 +4,20 @@ * * Copyright (c) 2002 Fabrice Bellard * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ diff --git a/tests/base64.c b/tests/base64.c index aad7dfb7ea..75ba8bc5d2 100644 --- a/tests/base64.c +++ b/tests/base64.c @@ -1,18 +1,18 @@ /* - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh index 164550bcc3..f7c9d43ee8 100755 --- a/tests/codec-regression.sh +++ b/tests/codec-regression.sh @@ -58,7 +58,7 @@ do_video_decoding # mpeg2 encoding interlaced file=${outfile}mpeg2reuse.mpg -do_avconv $file $DEC_OPTS -me_threshold 256 -i ${target_path}/${outfile}mpeg2thread.mpg $ENC_OPTS -same_quant -me_threshold 256 -mb_threshold 1024 -vcodec mpeg2video -vsync 0 -f mpeg1video -bf 2 -flags +ildct+ilme -threads 4 +do_avconv $file $DEC_OPTS -me_threshold 256 -i ${target_path}/${outfile}mpeg2thread.mpg $ENC_OPTS -same_quant -me_threshold 256 -mb_threshold 1024 -vcodec mpeg2video -f mpeg1video -bf 2 -flags +ildct+ilme -threads 4 do_video_decoding fi @@ -72,6 +72,11 @@ do_video_encoding msmpeg4.avi "-qscale 10 -an -vcodec msmpeg4" do_video_decoding fi +if [ -n "$do_msvideo1" ] ; then +do_video_encoding msvideo1.avi "-an -vcodec msvideo1" +do_video_decoding "" "-pix_fmt yuv420p" +fi + if [ -n "$do_wmv1" ] ; then do_video_encoding wmv1.avi "-qscale 10 -an -vcodec wmv1" do_video_decoding @@ -245,6 +250,11 @@ do_video_encoding flashsv.flv "-an -vcodec flashsv -sws_flags neighbor+full_chro do_video_decoding "" "-pix_fmt yuv420p -sws_flags area+accurate_rnd+bitexact" fi +if [ -n "$do_flashsv2" ] ; then +do_video_encoding flashsv2.flv "-an -vcodec flashsv2 -sws_flags neighbor+full_chroma_int+accurate_rnd+bitexact -strict experimental" +#do_video_decoding "" "-pix_fmt yuv420p -sws_flags area+accurate_rnd+bitexact" +fi + if [ -n "$do_roq" ] ; then do_video_encoding roqav.roq "-vframes 5" do_video_decoding "" "-pix_fmt yuv420p" @@ -255,6 +265,11 @@ do_video_encoding qtrle.mov "-an -vcodec qtrle" do_video_decoding "" "-pix_fmt yuv420p" fi +if [ -n "$do_qtrlegray" ] ; then +do_video_encoding qtrlegray.mov "-an -vcodec qtrle -pix_fmt gray" +do_video_decoding "" "-pix_fmt yuv420p" +fi + if [ -n "$do_rgb" ] ; then do_video_encoding rgb.avi "-an -vcodec rawvideo -pix_fmt bgr24" do_video_decoding "" "-pix_fmt yuv420p" diff --git a/tests/copycooker.sh b/tests/copycooker.sh new file mode 100755 index 0000000000..4b5811dcf6 --- /dev/null +++ b/tests/copycooker.sh @@ -0,0 +1,30 @@ +#!/bin/sh + +LC_ALL=C +export LC_ALL + +datadir="tests/data" + +logfile="$datadir/copy.regression" +reffile="$1" + +list=$(grep -oh ' ./tests/data/.*' tests/ref/{acodec,lavf,vsynth1}/*| sort) +rm -f $logfile +for i in $list ; do + echo ---------------- >> $logfile + echo $i >> $logfile + ./ffmpeg_g -flags +bitexact -i $i -acodec copy -vcodec copy -y first.nut + ./ffmpeg_g -flags +bitexact -i first.nut -acodec copy -vcodec copy -y second.nut + cmp first.nut second.nut >> $logfile + md5sum first.nut >> $logfile +done + +if diff -u -w "$reffile" "$logfile" ; then + echo + echo copy regression test: success + exit 0 +else + echo + echo copy regression test: error + exit 1 +fi diff --git a/tests/fate-run.sh b/tests/fate-run.sh index f623eecae6..3de097e515 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -17,6 +17,7 @@ ref=${7:-"${base}/ref/fate/${test}"} fuzz=$8 threads=${9:-1} thread_type=${10:-3} +tool=${11} outdir="tests/data/fate" outfile="${outdir}/${test}" @@ -50,7 +51,7 @@ run(){ } avconv(){ - run avconv -v 0 -threads $threads -thread_type $thread_type "$@" + run $tool -v 0 -threads $threads -thread_type $thread_type "$@" } framecrc(){ @@ -76,7 +77,7 @@ pcm(){ regtest(){ t="${test#$2-}" ref=${base}/ref/$2/$t - ${base}/${1}-regression.sh $t $2 $3 "$target_exec" "$target_path" "$threads" "$thread_type" + ${base}/${1}-regression.sh $t $2 $3 "$target_exec" "$target_path" "$threads" "$thread_type" "$tool" } codectest(){ diff --git a/tests/fate-update.sh b/tests/fate-update.sh new file mode 100755 index 0000000000..6b4668fc03 --- /dev/null +++ b/tests/fate-update.sh @@ -0,0 +1,55 @@ +#! /bin/sh + +set -e + +base=$(dirname $0) +ref="${base}/ref/fate" + +FATE_DB_URL="http://fate.multimedia.cx/fate-tests.sqlite.bz2" +FATE_DB=$(mktemp fate-db.XXXXXX) +SQL_TESTS='SELECT id,short_name,command FROM test_spec WHERE active=1 ORDER BY short_name' + +do_sql(){ + sqlite3 -noheader -separator ' ' "$FATE_DB" "$@" +} + +wget -q -O - "$FATE_DB_URL" | bunzip2 > "$FATE_DB" +mkdir -p "$ref" +exec 3>"$base/fate.mak" + +do_sql "$SQL_TESTS" | while read id name command; do + case "$name" in + 00-full-regression|ffmpeg-help|binsize-*) continue ;; + esac + case "$command" in + {MD5}*) + command="${command#*ffmpeg}"; command="${command% -}" + command="md5 $command" + ;; + {*}*) continue ;; + *-f\ framecrc\ -) + command="${command#*ffmpeg}"; command="${command% -f *}" + command="framecrc $command" + ;; + *-f\ framemd5\ -) + command="${command#*ffmpeg}"; command="${command% -f *}" + command="framemd5 $command" + ;; + *-f\ crc\ -) + command="${command#*ffmpeg}"; command="${command% -f *}" + command="crc $command" + ;; + *) + echo "Unhandled command '$command'" + exit 1 + ;; + esac + command=$(echo "$command" | sed 's/\$SAMPLES_PATH/$(SAMPLES)/g') + command=$(echo "$command" | sed 's/ *$//') + do_sql "SELECT expected_stdout FROM test_spec WHERE id=$id" | awk '/./{print}' > "$ref/$name" + printf "FATE_TESTS += fate-${name}\n" >&3 + printf "fate-${name}: CMD = %s\n" "$command" >&3 +done + +exec 3<&- +rm -f "$FATE_DB" diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak index 969bf413e4..b0b6a9db4c 100644 --- a/tests/fate/h264.mak +++ b/tests/fate/h264.mak @@ -113,6 +113,10 @@ FATE_H264 = aud_mw_e \ frext-hcafr3_hhi_a \ frext-hcafr4_hhi_a \ frext-hcamff1_hhi_b \ + frext-hi422fr10_sony_b \ + frext-hi422fr13_sony_b \ + frext-hi422fr1_sony_a \ + frext-hi422fr6_sony_a \ frext-hpca_brcm_c \ frext-hpcadq_brcm_b \ frext-hpcafl_bcrm_c \ @@ -134,6 +138,13 @@ FATE_H264 = aud_mw_e \ frext-pph10i5_panasonic_a \ frext-pph10i6_panasonic_a \ frext-pph10i7_panasonic_a \ + frext-pph422i1_panasonic_a \ + frext-pph422i2_panasonic_a \ + frext-pph422i3_panasonic_a \ + frext-pph422i4_panasonic_a \ + frext-pph422i5_panasonic_a \ + frext-pph422i6_panasonic_a \ + frext-pph422i7_panasonic_a \ hcbp2_hhi_a \ hcmp1_hhi_a \ ls_sva_d \ @@ -294,6 +305,10 @@ fate-h264-conformance-frext-hcafr2_hhi_a: CMD = framecrc -vsync 0 -i $(SAMPLES)/ fate-h264-conformance-frext-hcafr3_hhi_a: CMD = framecrc -vsync 0 -i $(SAMPLES)/h264-conformance/FRext/HCAFR3_HHI.264 fate-h264-conformance-frext-hcafr4_hhi_a: CMD = framecrc -vsync 0 -i $(SAMPLES)/h264-conformance/FRext/HCAFR4_HHI.264 fate-h264-conformance-frext-hcamff1_hhi_b: CMD = framecrc -vsync 0 -i $(SAMPLES)/h264-conformance/FRext/HCAMFF1_HHI.264 +fate-h264-conformance-frext-hi422fr10_sony_b: CMD = framecrc -vsync 0 -i $(SAMPLES)/h264-conformance/FRext/Hi422FR10_SONY_B.264 +fate-h264-conformance-frext-hi422fr13_sony_b: CMD = framecrc -vsync 0 -i $(SAMPLES)/h264-conformance/FRext/Hi422FR13_SONY_B.264 -pix_fmt yuv422p10le +fate-h264-conformance-frext-hi422fr1_sony_a: CMD = framecrc -vsync 0 -i $(SAMPLES)/h264-conformance/FRext/Hi422FR1_SONY_A.jsv +fate-h264-conformance-frext-hi422fr6_sony_a: CMD = framecrc -vsync 0 -i $(SAMPLES)/h264-conformance/FRext/Hi422FR6_SONY_A.jsv -pix_fmt yuv422p10le fate-h264-conformance-frext-hpca_brcm_c: CMD = framecrc -vsync 0 -i $(SAMPLES)/h264-conformance/FRext/HPCA_BRCM_C.264 fate-h264-conformance-frext-hpcadq_brcm_b: CMD = framecrc -vsync 0 -i $(SAMPLES)/h264-conformance/FRext/HPCADQ_BRCM_B.264 fate-h264-conformance-frext-hpcafl_bcrm_c: CMD = framecrc -vsync 0 -i $(SAMPLES)/h264-conformance/FRext/HPCAFL_BRCM_C.264 -vsync 0 @@ -315,6 +330,13 @@ fate-h264-conformance-frext-pph10i4_panasonic_a: CMD = framecrc -vsync 0 -i $(SA fate-h264-conformance-frext-pph10i5_panasonic_a: CMD = framecrc -vsync 0 -i $(SAMPLES)/h264-conformance/FRext/PPH10I5_Panasonic_A.264 -pix_fmt yuv420p10le fate-h264-conformance-frext-pph10i6_panasonic_a: CMD = framecrc -vsync 0 -i $(SAMPLES)/h264-conformance/FRext/PPH10I6_Panasonic_A.264 -pix_fmt yuv420p10le fate-h264-conformance-frext-pph10i7_panasonic_a: CMD = framecrc -vsync 0 -i $(SAMPLES)/h264-conformance/FRext/PPH10I7_Panasonic_A.264 -pix_fmt yuv420p10le +fate-h264-conformance-frext-pph422i1_panasonic_a: CMD = framecrc -vsync 0 -i $(SAMPLES)/h264-conformance/FRext/PPH422I1_Panasonic_A.264 -pix_fmt yuv422p10le +fate-h264-conformance-frext-pph422i2_panasonic_a: CMD = framecrc -vsync 0 -i $(SAMPLES)/h264-conformance/FRext/PPH422I2_Panasonic_A.264 -pix_fmt yuv422p10le +fate-h264-conformance-frext-pph422i3_panasonic_a: CMD = framecrc -vsync 0 -i $(SAMPLES)/h264-conformance/FRext/PPH422I3_Panasonic_A.264 -pix_fmt yuv422p10le +fate-h264-conformance-frext-pph422i4_panasonic_a: CMD = framecrc -vsync 0 -i $(SAMPLES)/h264-conformance/FRext/PPH422I4_Panasonic_A.264 -pix_fmt yuv422p10le +fate-h264-conformance-frext-pph422i5_panasonic_a: CMD = framecrc -vsync 0 -i $(SAMPLES)/h264-conformance/FRext/PPH422I5_Panasonic_A.264 -pix_fmt yuv422p10le +fate-h264-conformance-frext-pph422i6_panasonic_a: CMD = framecrc -vsync 0 -i $(SAMPLES)/h264-conformance/FRext/PPH422I6_Panasonic_A.264 -pix_fmt yuv422p10le +fate-h264-conformance-frext-pph422i7_panasonic_a: CMD = framecrc -vsync 0 -i $(SAMPLES)/h264-conformance/FRext/PPH422I7_Panasonic_A.264 -pix_fmt yuv422p10le fate-h264-conformance-hcbp2_hhi_a: CMD = framecrc -vsync 0 -strict 1 -i $(SAMPLES)/h264-conformance/HCBP2_HHI_A.264 fate-h264-conformance-hcmp1_hhi_a: CMD = framecrc -vsync 0 -strict 1 -i $(SAMPLES)/h264-conformance/HCMP1_HHI_A.264 fate-h264-conformance-ls_sva_d: CMD = framecrc -vsync 0 -i $(SAMPLES)/h264-conformance/LS_SVA_D.264 diff --git a/tests/ffserver-regression.sh b/tests/ffserver-regression.sh new file mode 100755 index 0000000000..11e4a5419e --- /dev/null +++ b/tests/ffserver-regression.sh @@ -0,0 +1,39 @@ +#!/bin/sh + +#perl -e 'chomp($wd = `pwd`); print map { s!tests/data/!!; "<Stream $_>\nFile $wd/tests/data/$_\n</Stream>\n\n" } @ARGV' tests/data/a* >> tests/data/ffserver.conf +#perl -e 'chomp($wd = `pwd`); print map { s!tests/data/!!; "<Stream $_.asf>\nFile $wd/tests/data/$_\n</Stream>\n\n" } @ARGV' tests/data/a* >> tests/data/ffserver.conf + +. $(dirname $0)/md5.sh + +FILES=$(sed -n 's/^[^#]*<Stream \(.*\)>.*/\1/p' $2 | grep -v html) + +rm -f tests/feed1.ffm +./ffserver -d -f "$2" 2> /dev/null & +FFSERVER_PID=$! +echo "Waiting for feeds to startup..." +sleep 2 +( + cd tests/data || exit $? + rm -f ff-* ffserver.regression + WGET_OPTIONS="--user-agent=NSPlayer -q --proxy=off -e verbose=off -e server_response=off" + for file in $FILES; do + if [ $(expr $file : "a-*") != 0 ]; then + wget $WGET_OPTIONS -O - http://localhost:9999/$file > ff-$file + else + wget $WGET_OPTIONS -O - http://localhost:9999/$file?date=19700101T000000Z | dd bs=1 count=20000 > ff-$file 2>/dev/null + fi + do_md5sum ff-$file >>ffserver.regression + done +) +kill $FFSERVER_PID +wait > /dev/null 2>&1 +rm -f tests/feed1.ffm +if diff -u "$1" tests/data/ffserver.regression; then + echo + echo Server regression test succeeded. + exit 0 +else + echo + echo Server regression test: Error. + exit 1 +fi diff --git a/tests/ffserver.conf b/tests/ffserver.conf new file mode 100644 index 0000000000..1e6994aa1c --- /dev/null +++ b/tests/ffserver.conf @@ -0,0 +1,307 @@ +# +# This is a test configuration file. You can invoke it with +# ../ffserver -f ffserver.conf +# when in the tests directory and once the vsynth1 subdirectory +# has been populated. Then point your browser at http://whatever:9999/teststat.html +# and you can look at the streams +# + +# +# Port on which the server is listening. You must select a different +# port from your standard http web server if it is running on the same +# computer. + +Port 9999 +RTSPPort 9990 + +# Address on which the server is bound. Only useful if you have +# several network interfaces. + +BindAddress 0.0.0.0 + +# Number of simultaneous requests that can be handled. Since FFServer +# is very fast, this limit is determined mainly by your Internet +# connection speed. + +MaxClients 1000 + +MaxBandwidth 100000 + +# Access Log file (uses standard Apache log file format) +# '-' is the standard output + +CustomLog - + +################################################################## +# Definition of the live feeds. Each live feed contains one video +# and/or audio sequence coming from an ffmpeg encoder or another +# ffserver. This sequence may be encoded simultaneously with several +# codecs at several resolutions. + +<Feed feed1.ffm> + +# You must use 'ffmpeg' to send a live feed to ffserver. In this +# example, you can type: +# +# ffmpeg http://localhost:8090/feed1.ffm + +# ffserver can also do time shifting. It means that it can stream any +# previously recorded live stream. The request should contain: +# "http://xxxx?date=[YYYY-MM-DDT][[HH:]MM:]SS[.m...]".You must specify +# a path where the feed is stored on disk. You also specify the +# maximum size of the feed (100M bytes here). Default: +# File=/tmp/feed_name.ffm FileMaxSize=5M + +File tests/feed1.ffm +FileMaxSize 100M + +# Fire up ffmpeg pointing at this stream + +Launch ./ffmpeg -v 0 -y -f pgmyuv -i tests/vsynth1/%02d.pgm + +ACL allow localhost +</Feed> + +################################################################## +# Now you can define each stream which will be generated from the +# original audio and video stream. Each format has a filename (here +# 'test128.mpg'). FFServer will send this stream when answering a +# request containing this filename. + +<Stream test_h.avi> +Feed feed1.ffm +Format avi +# +BitExact +DctFastint +IdctSimple +VideoFrameRate 10 +VideoSize 352x288 +VideoBitRate 100 +VideoGopSize 30 +NoAudio + +PreRoll 10 +StartSendOnKey +MaxTime 100 + +</Stream> + +<Stream test_l.avi> +Feed feed1.ffm +Format avi +# +BitExact +DctFastint +IdctSimple +VideoFrameRate 2 +VideoSize 320x240 +VideoBitRate 40 +VideoGopSize 20 +NoAudio + +PreRoll 20 +StartSendOnKey +MaxTime 100 + +</Stream> + +#<Stream test_h.mpg> +#Feed feed1.ffm +# +#VideoFrameRate 10 +#VideoSize 352x288 +#VideoBitRate 100 +#VideoGopSize 30 +#NoAudio + +#PreRoll 10 +#StartSendOnKey +#MaxTime 100 +# +#</Stream> +# +#<Stream test_l.mpg> +#Feed feed1.ffm +## +#VideoFrameRate 2 +#VideoSize 320x240 +#VideoBitRate 40 +#VideoGopSize 20 +#NoAudio +# +#PreRoll 20 +#StartSendOnKey +#MaxTime 100 +# +#</Stream> +# +<Stream test.swf> +Feed feed1.ffm +# +BitExact +DctFastint +IdctSimple +Qscale 10 +VideoFrameRate 10 +VideoSize 352x288 +VideoBitRate 100 +VideoGopSize 30 +NoAudio + +PreRoll 10 +StartSendOnKey +MaxTime 100 + +</Stream> + +<Stream test_h.asf> +Feed feed1.ffm +Format asf +# +BitExact +DctFastint +IdctSimple +Qscale 10 +VideoFrameRate 10 +VideoSize 320x240 +VideoBitRate 100 +VideoGopSize 30 +NoAudio + +PreRoll 10 +StartSendOnKey +MaxTime 100 + +Title "Test data stream" + +</Stream> + +<Stream test_l.asf> +Feed feed1.ffm +Format asf +# +BitExact +DctFastint +IdctSimple +Qscale 10 +VideoFrameRate 2 +VideoSize 320x240 +VideoBitRate 40 +VideoGopSize 20 +NoAudio + +PreRoll 20 +StartSendOnKey +MaxTime 100 + +Title "Test data stream" + +</Stream> + +<Stream test_h.rm> + +Feed feed1.ffm +Format rm + +BitExact +DctFastint +IdctSimple +Qscale 10 +VideoBitRate 100 +VideoFrameRate 10 +VideoGopSize 30 +VideoSize 320x240 +NoAudio + +PreRoll 10 +StartSendOnKey +MaxTime 100 + +</Stream> + +<Stream test_l.rm> + +Feed feed1.ffm +Format rm + +BitExact +DctFastint +IdctSimple +Qscale 10 +VideoBitRate 40 +VideoFrameRate 2 +VideoGopSize 20 +VideoSize 320x240 +NoAudio + +PreRoll 20 +StartSendOnKey +MaxTime 100 + +</Stream> + + +<Stream test.jpg> + +Feed feed1.ffm +Format jpeg +Strict -1 + +BitExact +DctFastint +IdctSimple +VideoFrameRate 1 +VideoSize 352x288 +NoAudio + +PreRoll 2 + +</Stream> + +<Stream test_small.jpg> + +Feed feed1.ffm +Format jpeg +Strict -1 + +BitExact +DctFastint +IdctSimple +VideoFrameRate 1 +VideoSize 160x128 +NoAudio + +PreRoll 2 + +</Stream> + +<Stream test.mjpg> + +Feed feed1.ffm +Format mpjpeg +Strict -1 + +BitExact +DctFastint +IdctSimple +VideoFrameRate 1 +VideoSize 320x240 +NoAudio +StartSendOnKey + +PreRoll 1 +MaxTime 100 + +</Stream> + + +################################################################## +# Special stream : server status + +<Stream teststat.html> + +Format status + +</Stream> + diff --git a/tests/ffserver.regression.ref b/tests/ffserver.regression.ref new file mode 100644 index 0000000000..9fc749763b --- /dev/null +++ b/tests/ffserver.regression.ref @@ -0,0 +1,10 @@ +18c4ba0e8e7adb781216e38de61c2e39 ff-test_h.avi +f84767c7af61f360f4b443c2c73f322f ff-test_l.avi +d976848a9e4d5d8fc2659e4841cdece5 ff-test.swf +28fd87d5075b9b011aad57292f271a04 ff-test_h.asf +a31ccd3aba2551e60b9fb1c156fca2f8 ff-test_l.asf +3279d3ed0ef2d1347b5eda84db2cf3e6 ff-test_h.rm +440231fe3cf0849887390b4d67d6894a ff-test_l.rm +e0dc91430660c619e97b5c82e0f398fc ff-test.jpg +0d6c98fc8a4f00560fe34e94e26880a9 ff-test_small.jpg +e2a315d7ac0576279f8b4d917999615a ff-test.mjpg diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh index 303e7bd1ac..ba5388eeab 100755 --- a/tests/lavf-regression.sh +++ b/tests/lavf-regression.sh @@ -44,26 +44,26 @@ do_audio_only() } if [ -n "$do_avi" ] ; then -do_lavf avi "-acodec mp2" +do_lavf avi "-acodec mp2 -ab 64k" fi if [ -n "$do_asf" ] ; then -do_lavf asf "-acodec mp2" "-r 25" +do_lavf asf "-acodec mp2 -ab 64k" "-r 25" fi if [ -n "$do_rm" ] ; then file=${outfile}lavf.rm -do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $DEC_OPTS -ar 44100 -f s16le -i $pcm_src $ENC_OPTS -t 1 -qscale 10 -acodec ac3_fixed -b:a 64k +do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $DEC_OPTS -ar 44100 -f s16le -i $pcm_src $ENC_OPTS -t 1 -qscale 10 -acodec ac3_fixed -ab 64k # broken #do_avconv_crc $file -i $target_path/$file fi if [ -n "$do_mpg" ] ; then -do_lavf mpg +do_lavf mpg "-ab 64k" fi if [ -n "$do_mxf" ] ; then -do_lavf mxf "-ar 48000 -bf 2 -timecode_frame_start 264363" +do_lavf mxf "-ar 48000 -bf 2 -timecode 02:56:14:13" fi if [ -n "$do_mxf_d10" ]; then @@ -71,7 +71,7 @@ do_lavf mxf_d10 "-ar 48000 -ac 2 -r 25 -s 720x576 -vf pad=720:608:0:32 -vcodec m fi if [ -n "$do_ts" ] ; then -do_lavf ts +do_lavf ts "-ab 64k" fi if [ -n "$do_swf" ] ; then @@ -79,7 +79,7 @@ do_lavf swf -an fi if [ -n "$do_ffm" ] ; then -do_lavf ffm +do_lavf ffm "-ab 64k" fi if [ -n "$do_flv_fmt" ] ; then @@ -87,7 +87,7 @@ do_lavf flv -an fi if [ -n "$do_mov" ] ; then -do_lavf mov "-acodec pcm_alaw -c:v mpeg4" +do_lavf mov "-acodec pcm_alaw -vcodec mpeg4" fi if [ -n "$do_dv_fmt" ] ; then @@ -99,11 +99,11 @@ do_lavf gxf "-ar 48000 -r 25 -s pal -ac 1" fi if [ -n "$do_nut" ] ; then -do_lavf nut "-acodec mp2" +do_lavf nut "-acodec mp2 -ab 64k" fi if [ -n "$do_mkv" ] ; then -do_lavf mkv "-c:a mp2 -c:v mpeg4" +do_lavf mkv "-acodec mp2 -ab 64k -vcodec mpeg4" fi diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh index f8c0c4e75b..74e53739ca 100755 --- a/tests/lavfi-regression.sh +++ b/tests/lavfi-regression.sh @@ -50,9 +50,9 @@ do_lavfi_pixfmts(){ # exclude pixel formats which are not supported as input $avconv -pix_fmts list 2>/dev/null | sed -ne '9,$p' | grep '^\..\.' | cut -d' ' -f2 | sort >$exclude_fmts - $showfiltfmts scale | awk -F '[ \r]' '/^OUTPUT/{ print $3 }' | sort | comm -23 - $exclude_fmts >$out_fmts + $showfiltfmts scale | awk -F '[ \r]' '/^OUTPUT/{ fmt=substr($3, 5); print fmt }' | sort | comm -23 - $exclude_fmts >$out_fmts - pix_fmts=$($showfiltfmts $filter | awk -F '[ \r]' '/^INPUT/{ print $3 }' | sort | comm -12 - $out_fmts) + pix_fmts=$($showfiltfmts $filter $filter_args | awk -F '[ \r]' '/^INPUT/{ fmt=substr($3, 5); print fmt }' | sort | comm -12 - $out_fmts) for pix_fmt in $pix_fmts; do do_video_filter $pix_fmt "slicify=random,format=$pix_fmt,$filter=$filter_args" -pix_fmt $pix_fmt done diff --git a/tests/ref/acodec/adpcm_ima_qt b/tests/ref/acodec/adpcm_ima_qt index 6e4415660e..cdd60e06b9 100644 --- a/tests/ref/acodec/adpcm_ima_qt +++ b/tests/ref/acodec/adpcm_ima_qt @@ -1,4 +1,4 @@ -3c06fd2f7831e3e8735b936e23ca220c *./tests/data/acodec/adpcm_qt.aiff +057d27978b35888776512e4e9669a63b *./tests/data/acodec/adpcm_qt.aiff 281252 ./tests/data/acodec/adpcm_qt.aiff -9580492803ba1c1a3746367b24b751c8 *./tests/data/adpcm_ima_qt.acodec.out.wav -stddev: 914.65 PSNR: 37.10 MAXDIFF:34026 bytes: 1058560/ 1058400 +3890343c0c20934e014d7ac93f5d65bd *./tests/data/adpcm_ima_qt.acodec.out.wav +stddev: 918.61 PSNR: 37.07 MAXDIFF:34029 bytes: 1058560/ 1058400 diff --git a/tests/ref/fate/eval b/tests/ref/fate/eval index ad01891d9c..3bc35db633 100644 --- a/tests/ref/fate/eval +++ b/tests/ref/fate/eval @@ -133,5 +133,32 @@ Evaluating 'ceil(123.123)' Evaluating 'ceil(-123.123)' 'ceil(-123.123)' -> -123.000000 +Evaluating 'sqrt(1764)' +'sqrt(1764)' -> 42.000000 + +Evaluating 'sqrt(-1)' +'sqrt(-1)' -> nan + +Evaluating 'not(1)' +'not(1)' -> 0.000000 + +Evaluating 'not(NAN)' +'not(NAN)' -> 0.000000 + +Evaluating 'not(0)' +'not(0)' -> 1.000000 + +Evaluating 'pow(0,1.23)' +'pow(0,1.23)' -> 0.000000 + +Evaluating 'pow(PI,1.23)' +'pow(PI,1.23)' -> 4.087844 + +Evaluating 'PI^1.23' +'PI^1.23' -> 4.087844 + +Evaluating 'pow(-1,1.23)' +'pow(-1,1.23)' -> nan + 12.700000 == 12.7 0.931323 == 0.931322575 diff --git a/tests/ref/fate/h264-conformance-frext-hi422fr10_sony_b b/tests/ref/fate/h264-conformance-frext-hi422fr10_sony_b new file mode 100644 index 0000000000..60c65e8da4 --- /dev/null +++ b/tests/ref/fate/h264-conformance-frext-hi422fr10_sony_b @@ -0,0 +1,5 @@ +0, 0, 202752, 0xffa1c502 +0, 3600, 202752, 0x51752f3c +0, 7200, 202752, 0xe683991d +0, 10800, 202752, 0xf70200a4 +0, 14400, 202752, 0x1a4d63ef diff --git a/tests/ref/fate/h264-conformance-frext-hi422fr13_sony_b b/tests/ref/fate/h264-conformance-frext-hi422fr13_sony_b new file mode 100644 index 0000000000..befd8f476d --- /dev/null +++ b/tests/ref/fate/h264-conformance-frext-hi422fr13_sony_b @@ -0,0 +1,5 @@ +0, 0, 405504, 0xe0f40e71 +0, 3600, 405504, 0x9bdb5900 +0, 7200, 405504, 0x527003ca +0, 10800, 405504, 0x1fbf8ba6 +0, 14400, 405504, 0x455e2a4e diff --git a/tests/ref/fate/h264-conformance-frext-hi422fr1_sony_a b/tests/ref/fate/h264-conformance-frext-hi422fr1_sony_a new file mode 100644 index 0000000000..b454a07f61 --- /dev/null +++ b/tests/ref/fate/h264-conformance-frext-hi422fr1_sony_a @@ -0,0 +1,5 @@ +0, 0, 202752, 0xd5a1e49f +0, 3600, 202752, 0x08352d61 +0, 7200, 202752, 0x43f78f47 +0, 10800, 202752, 0xfb5910f4 +0, 14400, 202752, 0xd98e8739 diff --git a/tests/ref/fate/h264-conformance-frext-hi422fr6_sony_a b/tests/ref/fate/h264-conformance-frext-hi422fr6_sony_a new file mode 100644 index 0000000000..453e7598c3 --- /dev/null +++ b/tests/ref/fate/h264-conformance-frext-hi422fr6_sony_a @@ -0,0 +1,5 @@ +0, 0, 405504, 0x049ab58e +0, 3600, 405504, 0x4f6226cb +0, 7200, 405504, 0xaa5fcb44 +0, 10800, 405504, 0xbfc09965 +0, 14400, 405504, 0xa30acb90 diff --git a/tests/ref/fate/h264-conformance-frext-pph422i1_panasonic_a b/tests/ref/fate/h264-conformance-frext-pph422i1_panasonic_a new file mode 100644 index 0000000000..3b8a839507 --- /dev/null +++ b/tests/ref/fate/h264-conformance-frext-pph422i1_panasonic_a @@ -0,0 +1,10 @@ +0, 0, 3686400, 0x1f9b5bee +0, 3600, 3686400, 0x657c3609 +0, 7200, 3686400, 0x75753934 +0, 10800, 3686400, 0xf434d8e1 +0, 14400, 3686400, 0x40679c77 +0, 18000, 3686400, 0x5734d8db +0, 21600, 3686400, 0x4a3d8269 +0, 25200, 3686400, 0xd20b6cf6 +0, 28800, 3686400, 0x31956bca +0, 32400, 3686400, 0xd28d9758 diff --git a/tests/ref/fate/h264-conformance-frext-pph422i2_panasonic_a b/tests/ref/fate/h264-conformance-frext-pph422i2_panasonic_a new file mode 100644 index 0000000000..012250ef3d --- /dev/null +++ b/tests/ref/fate/h264-conformance-frext-pph422i2_panasonic_a @@ -0,0 +1,10 @@ +0, 0, 3686400, 0x8b3ff360 +0, 3600, 3686400, 0x422dead1 +0, 7200, 3686400, 0xbdd0e431 +0, 10800, 3686400, 0x1e3cc216 +0, 14400, 3686400, 0x1a80b718 +0, 18000, 3686400, 0xc7e3c0a2 +0, 21600, 3686400, 0xffc99142 +0, 25200, 3686400, 0x8b3bdf1e +0, 28800, 3686400, 0xff1bccfb +0, 32400, 3686400, 0x781fc45b diff --git a/tests/ref/fate/h264-conformance-frext-pph422i3_panasonic_a b/tests/ref/fate/h264-conformance-frext-pph422i3_panasonic_a new file mode 100644 index 0000000000..253c9920ab --- /dev/null +++ b/tests/ref/fate/h264-conformance-frext-pph422i3_panasonic_a @@ -0,0 +1,10 @@ +0, 0, 3686400, 0x97c36ae3 +0, 3600, 3686400, 0x6a0aa629 +0, 7200, 3686400, 0xc658d722 +0, 10800, 3686400, 0x713bc774 +0, 14400, 3686400, 0x8d0b3afe +0, 18000, 3686400, 0x62bf24cd +0, 21600, 3686400, 0x77e80436 +0, 25200, 3686400, 0x4f258e07 +0, 28800, 3686400, 0x8426bc53 +0, 32400, 3686400, 0xd33b58c8 diff --git a/tests/ref/fate/h264-conformance-frext-pph422i4_panasonic_a b/tests/ref/fate/h264-conformance-frext-pph422i4_panasonic_a new file mode 100644 index 0000000000..97e36e74a9 --- /dev/null +++ b/tests/ref/fate/h264-conformance-frext-pph422i4_panasonic_a @@ -0,0 +1,10 @@ +0, 0, 8294400, 0xf50992f3 +0, 3600, 8294400, 0xd34cdf98 +0, 7200, 8294400, 0x76bced00 +0, 10800, 8294400, 0xf9ffd9b1 +0, 14400, 8294400, 0x303231aa +0, 18000, 8294400, 0x0ca57c6a +0, 21600, 8294400, 0xaa056bd5 +0, 25200, 8294400, 0x785c9a12 +0, 28800, 8294400, 0xe535750e +0, 32400, 8294400, 0x78fd76bb diff --git a/tests/ref/fate/h264-conformance-frext-pph422i5_panasonic_a b/tests/ref/fate/h264-conformance-frext-pph422i5_panasonic_a new file mode 100644 index 0000000000..c9c557e24c --- /dev/null +++ b/tests/ref/fate/h264-conformance-frext-pph422i5_panasonic_a @@ -0,0 +1,10 @@ +0, 0, 8294400, 0x96d051a1 +0, 3600, 8294400, 0xf3c2974e +0, 7200, 8294400, 0xb18f3ed0 +0, 10800, 8294400, 0xb5ba9998 +0, 14400, 8294400, 0x96327a34 +0, 18000, 8294400, 0xe24d7b61 +0, 21600, 8294400, 0xc45d5a16 +0, 25200, 8294400, 0x13b4a537 +0, 28800, 8294400, 0xa81dae90 +0, 32400, 8294400, 0x2820bbe9 diff --git a/tests/ref/fate/h264-conformance-frext-pph422i6_panasonic_a b/tests/ref/fate/h264-conformance-frext-pph422i6_panasonic_a new file mode 100644 index 0000000000..ecbcdc5fe9 --- /dev/null +++ b/tests/ref/fate/h264-conformance-frext-pph422i6_panasonic_a @@ -0,0 +1,10 @@ +0, 0, 8294400, 0x1b2f1079 +0, 3600, 8294400, 0x6646f91c +0, 7200, 8294400, 0x17dc9f51 +0, 10800, 8294400, 0x4aad9b3a +0, 14400, 8294400, 0x8a422d34 +0, 18000, 8294400, 0x8fd76d87 +0, 21600, 8294400, 0xc7c75f18 +0, 25200, 8294400, 0x4a1c2643 +0, 28800, 8294400, 0xfe225709 +0, 32400, 8294400, 0x032ad2e5 diff --git a/tests/ref/fate/h264-conformance-frext-pph422i7_panasonic_a b/tests/ref/fate/h264-conformance-frext-pph422i7_panasonic_a new file mode 100644 index 0000000000..76177764bd --- /dev/null +++ b/tests/ref/fate/h264-conformance-frext-pph422i7_panasonic_a @@ -0,0 +1,10 @@ +0, 0, 8294400, 0xaa37ceea +0, 3600, 8294400, 0xa7546d5c +0, 7200, 8294400, 0xf2abaace +0, 10800, 8294400, 0x36f4d47e +0, 14400, 8294400, 0x1cdf917d +0, 18000, 8294400, 0xa9377ba3 +0, 21600, 8294400, 0x21c9db51 +0, 25200, 8294400, 0x07d7936e +0, 28800, 8294400, 0x7878ab94 +0, 32400, 8294400, 0x77e40921 diff --git a/tests/ref/fate/iff-fibonacci b/tests/ref/fate/iff-fibonacci index e452f31e6c..947f78e964 100644 --- a/tests/ref/fate/iff-fibonacci +++ b/tests/ref/fate/iff-fibonacci @@ -1 +1 @@ -e968a853779bb6438339e3b8d69d8d24 +e76b025238a6a27968f8644f4ccc3207 diff --git a/tests/ref/fate/qt-ima4-mono b/tests/ref/fate/qt-ima4-mono index 66767d5d30..b8fc5f99de 100644 --- a/tests/ref/fate/qt-ima4-mono +++ b/tests/ref/fate/qt-ima4-mono @@ -1 +1 @@ -721b51fd66c3bb3dc49dd88d404188eb +e178ed520edf2f46492ae740d88f5815 diff --git a/tests/ref/fate/qt-ima4-stereo b/tests/ref/fate/qt-ima4-stereo index 5e6b1237d5..84c9f46d02 100644 --- a/tests/ref/fate/qt-ima4-stereo +++ b/tests/ref/fate/qt-ima4-stereo @@ -1 +1 @@ -c9e4c21fb62eca34a533f3a9ad2e394a +d22be0e193dcbba1068a1ca6ab04cf77 diff --git a/tests/ref/lavf/dv_fmt b/tests/ref/lavf/dv_fmt index 7406dff532..f39ff39bf0 100644 --- a/tests/ref/lavf/dv_fmt +++ b/tests/ref/lavf/dv_fmt @@ -1,3 +1,3 @@ -522e5e5a46b99f8ad8aabdaf3d2f1869 *./tests/data/lavf/lavf.dv +188f804bd2d10cd436c8a7b111bdcd2a *./tests/data/lavf/lavf.dv 3600000 ./tests/data/lavf/lavf.dv ./tests/data/lavf/lavf.dv CRC=0x02c0af30 diff --git a/tests/ref/lavf/mov b/tests/ref/lavf/mov index 22aac3600e..940e518b5f 100644 --- a/tests/ref/lavf/mov +++ b/tests/ref/lavf/mov @@ -1,3 +1,3 @@ -439684b82ccc1fdd24a23392c238ae53 *./tests/data/lavf/lavf.mov +a901cd05609080e8f5c09ca5da7290f0 *./tests/data/lavf/lavf.mov 357681 ./tests/data/lavf/lavf.mov ./tests/data/lavf/lavf.mov CRC=0x2f6a9b26 diff --git a/tests/ref/lavf/mxf b/tests/ref/lavf/mxf index b5aea3c17e..73eb307081 100644 --- a/tests/ref/lavf/mxf +++ b/tests/ref/lavf/mxf @@ -1,3 +1,3 @@ -6e9bd63c5cadd7550ad313553ebf665f *./tests/data/lavf/lavf.mxf +785e38ddd2466046f30aa36399b8f8fa *./tests/data/lavf/lavf.mxf 525881 ./tests/data/lavf/lavf.mxf -./tests/data/lavf/lavf.mxf CRC=0x4ace0849 +./tests/data/lavf/lavf.mxf CRC=0x4ace0849
\ No newline at end of file diff --git a/tests/ref/lavf/mxf_d10 b/tests/ref/lavf/mxf_d10 index f59a99ee0f..2582022d17 100644 --- a/tests/ref/lavf/mxf_d10 +++ b/tests/ref/lavf/mxf_d10 @@ -1,3 +1,3 @@ -e7168856f2b54c6272685967e707fb21 *./tests/data/lavf/lavf.mxf_d10 +b3174e2db508564c1cce0b5e3c1bc1bd *./tests/data/lavf/lavf.mxf_d10 5330989 ./tests/data/lavf/lavf.mxf_d10 ./tests/data/lavf/lavf.mxf_d10 CRC=0xc3f4f92e diff --git a/tests/ref/lavf/pixfmt b/tests/ref/lavf/pixfmt index 186dde5ed3..bf62d9059b 100644 --- a/tests/ref/lavf/pixfmt +++ b/tests/ref/lavf/pixfmt @@ -16,21 +16,21 @@ e176bd14185788110e055f945de7f95f *./tests/data/pixfmt/yuvj420p.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 +6bb61113e7b70eb09dbcec356122a0e2 *./tests/data/pixfmt/rgb24.yuv 304128 ./tests/data/pixfmt/rgb24.yuv -c6e0f9b5817f484b175c1ec4ffb4e9c9 *./tests/data/pixfmt/bgr24.yuv +6bb61113e7b70eb09dbcec356122a0e2 *./tests/data/pixfmt/bgr24.yuv 304128 ./tests/data/pixfmt/bgr24.yuv -c6e0f9b5817f484b175c1ec4ffb4e9c9 *./tests/data/pixfmt/rgb32.yuv +6bb61113e7b70eb09dbcec356122a0e2 *./tests/data/pixfmt/rgb32.yuv 304128 ./tests/data/pixfmt/rgb32.yuv -66d39d464bd89ded2a124897f0a75ade *./tests/data/pixfmt/rgb565.yuv +efa7c0337cc00c796c6df615223716f1 *./tests/data/pixfmt/rgb565.yuv 304128 ./tests/data/pixfmt/rgb565.yuv -c894c3bd8d2631ed1964500b90a0c350 *./tests/data/pixfmt/rgb555.yuv +0df2a477af1415a1b8fbf2a3e552bc39 *./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 +6c719671e39f1bcf67b47eab98fa529b *./tests/data/pixfmt/monow.yuv 304128 ./tests/data/pixfmt/monow.yuv -31398104d2349dd48328a6862bc6711f *./tests/data/pixfmt/monob.yuv +6c719671e39f1bcf67b47eab98fa529b *./tests/data/pixfmt/monob.yuv 304128 ./tests/data/pixfmt/monob.yuv 00b85790df5740bab95e2559d81603a7 *./tests/data/pixfmt/yuv440p.yuv 304128 ./tests/data/pixfmt/yuv440p.yuv diff --git a/tests/ref/lavf/ts b/tests/ref/lavf/ts index 325112cebc..3b2dad1b5e 100644 --- a/tests/ref/lavf/ts +++ b/tests/ref/lavf/ts @@ -1,3 +1,3 @@ -9708011dd80212a0041a96da878122c2 *./tests/data/lavf/lavf.ts +151774afed45b19da9b7e83613a1e72b *./tests/data/lavf/lavf.ts 406644 ./tests/data/lavf/lavf.ts ./tests/data/lavf/lavf.ts CRC=0x133216c1 diff --git a/tests/ref/lavfi/pixdesc b/tests/ref/lavfi/pixdesc index 879314f23d..c864df2216 100644 --- a/tests/ref/lavfi/pixdesc +++ b/tests/ref/lavfi/pixdesc @@ -11,8 +11,8 @@ bgr565le 1dfdd03995c287e3c754b164bf26a355 bgr8 24bd566170343d06fec6fccfff5abc54 bgra 76a18a5151242fa137133f604cd624d2 gray db08f7f0751900347e6b8649e4164d21 -gray16be 7becf34ae825a3df3969bf4c6bfeb5e2 -gray16le 10bd87059b5c189f3caef2837f4f2b5c +gray16be b44458c2254aa7a3d7b8dbf53be91979 +gray16le ecda5143f8a55fca1f6c7dfb238ddcba monob 668ebe8b8103b9046b251b2fa8a1d88f monow 9251497f3b0634f1165d12d5a289d943 nv12 e0af357888584d36eec5aa0f673793ef @@ -31,12 +31,12 @@ uyvy422 adcf64516a19fce44df77082bdb16291 yuv410p 2d9225153c83ee1132397d619d94d1b3 yuv411p 8b298af3e43348ca1b11eb8a3252ac6c yuv420p eba2f135a08829387e2f698ff72a2939 -yuv420p10be 7605e266c088d0fcf68c7b27c3ceff5f -yuv420p10le 4228ee628c6deec123a13b9784516cc7 -yuv420p16be 16c009a235cd52b74791a895423152a3 -yuv420p16le 2d59c4f1d0314a5a957a7cfc4b6fabcc -yuv420p9be ce880fa07830e5297c22acf6e20555ce -yuv420p9le 16543fda8f87d94a6cf857d2e8d4461a +yuv420p10be ea2aee509286fa3d07a6c68fec9967a5 +yuv420p10le 645ef73e06de41c83a7bc724179d2ce3 +yuv420p16be ba858ff4246368c28f03152487f57ef3 +yuv420p16le de239729a4fe1d4cfa3743e006654e78 +yuv420p9be 64e36fd90573f67ac2006d103972a79b +yuv420p9le 9ed4b1dfabc53fd9e586ff6c4c43af80 yuv422p c9bba4529821d796a6ab09f6a5fd355a yuv422p10be bdc13b630fd668b34c6fe1aae28dfc71 yuv422p10le d0607c260a45c973e6639f4e449730ad diff --git a/tests/ref/lavfi/pixfmts_copy b/tests/ref/lavfi/pixfmts_copy index 879314f23d..c864df2216 100644 --- a/tests/ref/lavfi/pixfmts_copy +++ b/tests/ref/lavfi/pixfmts_copy @@ -11,8 +11,8 @@ bgr565le 1dfdd03995c287e3c754b164bf26a355 bgr8 24bd566170343d06fec6fccfff5abc54 bgra 76a18a5151242fa137133f604cd624d2 gray db08f7f0751900347e6b8649e4164d21 -gray16be 7becf34ae825a3df3969bf4c6bfeb5e2 -gray16le 10bd87059b5c189f3caef2837f4f2b5c +gray16be b44458c2254aa7a3d7b8dbf53be91979 +gray16le ecda5143f8a55fca1f6c7dfb238ddcba monob 668ebe8b8103b9046b251b2fa8a1d88f monow 9251497f3b0634f1165d12d5a289d943 nv12 e0af357888584d36eec5aa0f673793ef @@ -31,12 +31,12 @@ uyvy422 adcf64516a19fce44df77082bdb16291 yuv410p 2d9225153c83ee1132397d619d94d1b3 yuv411p 8b298af3e43348ca1b11eb8a3252ac6c yuv420p eba2f135a08829387e2f698ff72a2939 -yuv420p10be 7605e266c088d0fcf68c7b27c3ceff5f -yuv420p10le 4228ee628c6deec123a13b9784516cc7 -yuv420p16be 16c009a235cd52b74791a895423152a3 -yuv420p16le 2d59c4f1d0314a5a957a7cfc4b6fabcc -yuv420p9be ce880fa07830e5297c22acf6e20555ce -yuv420p9le 16543fda8f87d94a6cf857d2e8d4461a +yuv420p10be ea2aee509286fa3d07a6c68fec9967a5 +yuv420p10le 645ef73e06de41c83a7bc724179d2ce3 +yuv420p16be ba858ff4246368c28f03152487f57ef3 +yuv420p16le de239729a4fe1d4cfa3743e006654e78 +yuv420p9be 64e36fd90573f67ac2006d103972a79b +yuv420p9le 9ed4b1dfabc53fd9e586ff6c4c43af80 yuv422p c9bba4529821d796a6ab09f6a5fd355a yuv422p10be bdc13b630fd668b34c6fe1aae28dfc71 yuv422p10le d0607c260a45c973e6639f4e449730ad diff --git a/tests/ref/lavfi/pixfmts_crop b/tests/ref/lavfi/pixfmts_crop index d11720f83c..f0b88110e6 100644 --- a/tests/ref/lavfi/pixfmts_crop +++ b/tests/ref/lavfi/pixfmts_crop @@ -11,8 +11,8 @@ bgr565le 891664e5a54ae5968901347da92bc5e9 bgr8 4b7159e05765bd4703180072d86423c8 bgra 395c9f706fccda721471acaa5c96c16c gray 8c4850e66562a587a292dc728a65ea4a -gray16be daa5a6b98fb4a280c57c57bff1a2ab5a -gray16le 84f5ea7259073edcb893113b42213c8e +gray16be 257b4339925b0e672f552d8c9511f2c3 +gray16le 67cf7b26cda55356cc25e0f4e42cc136 rgb24 3b90ed64b687d3dc186c6ef521dc71a8 rgb48be e6fd353c0eb9bea889423954414bea35 rgb48le 68a1723da11ce08b502d42e204376503 @@ -26,8 +26,8 @@ rgba fd00b24c7597268c32759a84a1de2de4 yuv410p a9f2eaa747bf988b7bebe4f442b9c67a yuv411p 3334d3aef8dba238658090ac172375d1 yuv420p bfea0188ddd4889787c403caae119cc7 -yuv420p16be 8365eff38b8c329aeb95fc605fa229bb -yuv420p16le 5e8dd38d973d5854abe1ad4efad20cc1 +yuv420p16be eb2f96b638a174377f5fc42cfc849ff5 +yuv420p16le 3eae4c172d620b6d4ef2aeca403c4f54 yuv422p f2f930a91fe00d4252c4720b5ecd8961 yuv422p16be 167e4338811a7d272925a4c6417d60da yuv422p16le 3359395d5875d581fa1e975013d30114 diff --git a/tests/ref/lavfi/pixfmts_hflip b/tests/ref/lavfi/pixfmts_hflip index 5eb1b31140..baaf9add77 100644 --- a/tests/ref/lavfi/pixfmts_hflip +++ b/tests/ref/lavfi/pixfmts_hflip @@ -11,8 +11,8 @@ bgr565le 3703466e19e1b52e03a34fd244a8e8e4 bgr8 50b505a889f0428242305acb642da107 bgra 01ca21e7e6a8d1281b4553bde8e8a404 gray 03efcb4ab52a24c0af0e03cfd26c9377 -gray16be 9bcbca979601ddc4869f846f08f3d1dd -gray16le c1b8965adcc7f847ee343149ff507073 +gray16be 632535b46edec78a6534ef18d37f2b71 +gray16le 5c24e6f847bf9a41a40760c0d15df161 rgb24 754f1722fc738590cc407ac65749bfe8 rgb48be d690412ca5fada031b5da47b87096248 rgb48le c901feb564232f5d0bc0eabd66dae3e7 @@ -26,8 +26,8 @@ rgba d3d0dc1ecef3ed72f26a2986d0efc204 yuv410p acb543ebbbf63eefe533e6faffc006da yuv411p c626cf6d191139b4ca7efc0155f957f1 yuv420p 2d5c80f9ba2ddd85b2aeda3564cc7d64 -yuv420p16be 758b0c1e2113b15e7afde48da4e4d024 -yuv420p16le 480ccd951dcb806bc875d307e02e50a0 +yuv420p16be 1c4fa93d0744de3cdc6d34ab55db3fb4 +yuv420p16le 92c74f5759068c381e4a066fe7faf2e0 yuv422p 6e728f4eb9eae287c224f396d84be6ea yuv422p16be 69cf0605496c321546899a8442ee64fb yuv422p16le f0b443fea72f4b6f462859a73b159664 diff --git a/tests/ref/lavfi/pixfmts_null b/tests/ref/lavfi/pixfmts_null index 879314f23d..c864df2216 100644 --- a/tests/ref/lavfi/pixfmts_null +++ b/tests/ref/lavfi/pixfmts_null @@ -11,8 +11,8 @@ bgr565le 1dfdd03995c287e3c754b164bf26a355 bgr8 24bd566170343d06fec6fccfff5abc54 bgra 76a18a5151242fa137133f604cd624d2 gray db08f7f0751900347e6b8649e4164d21 -gray16be 7becf34ae825a3df3969bf4c6bfeb5e2 -gray16le 10bd87059b5c189f3caef2837f4f2b5c +gray16be b44458c2254aa7a3d7b8dbf53be91979 +gray16le ecda5143f8a55fca1f6c7dfb238ddcba monob 668ebe8b8103b9046b251b2fa8a1d88f monow 9251497f3b0634f1165d12d5a289d943 nv12 e0af357888584d36eec5aa0f673793ef @@ -31,12 +31,12 @@ uyvy422 adcf64516a19fce44df77082bdb16291 yuv410p 2d9225153c83ee1132397d619d94d1b3 yuv411p 8b298af3e43348ca1b11eb8a3252ac6c yuv420p eba2f135a08829387e2f698ff72a2939 -yuv420p10be 7605e266c088d0fcf68c7b27c3ceff5f -yuv420p10le 4228ee628c6deec123a13b9784516cc7 -yuv420p16be 16c009a235cd52b74791a895423152a3 -yuv420p16le 2d59c4f1d0314a5a957a7cfc4b6fabcc -yuv420p9be ce880fa07830e5297c22acf6e20555ce -yuv420p9le 16543fda8f87d94a6cf857d2e8d4461a +yuv420p10be ea2aee509286fa3d07a6c68fec9967a5 +yuv420p10le 645ef73e06de41c83a7bc724179d2ce3 +yuv420p16be ba858ff4246368c28f03152487f57ef3 +yuv420p16le de239729a4fe1d4cfa3743e006654e78 +yuv420p9be 64e36fd90573f67ac2006d103972a79b +yuv420p9le 9ed4b1dfabc53fd9e586ff6c4c43af80 yuv422p c9bba4529821d796a6ab09f6a5fd355a yuv422p10be bdc13b630fd668b34c6fe1aae28dfc71 yuv422p10le d0607c260a45c973e6639f4e449730ad diff --git a/tests/ref/lavfi/pixfmts_scale b/tests/ref/lavfi/pixfmts_scale index 4787614bd2..281c8eb7ca 100644 --- a/tests/ref/lavfi/pixfmts_scale +++ b/tests/ref/lavfi/pixfmts_scale @@ -1,42 +1,42 @@ -abgr d894cb97f6c80eb21bdbe8a4eea62d86 -argb 54346f2b2eef10919e0f247241df3b24 -bgr24 570f8d6b51a838aed022ef67535f6bdc +abgr cff82561a074874027ac1cc896fd2730 +argb 756dd1eaa5baca2238ce23dbdc452684 +bgr24 e44192347a45586c6c157e3059610cd1 bgr48be 390d3058a12a99c2b153ed7922508bea bgr48le 39fe06feb4ec1d9730dccc04a0cfac4c bgr4_byte ee1d35a7baf8e9016891929a2f565c0b -bgr555be de8901c1358834fddea060fcb3a67beb -bgr555le 36b745067197f9ca8c1731cac51329c9 -bgr565be 922a2503767036ae9536f4f7823c04ee -bgr565le 3a514a298c6161a071ddf9963c06509d +bgr555be 6a2d335856db12e3ea72173d71610e21 +bgr555le 41e3e0961478dc634bf68a7bbd670cc9 +bgr565be 21077a3744c889b97032414b11232933 +bgr565le 614897eaeb422bd9a972f8ee51909be5 bgr8 7f007fa6c153a16e808a9c51605a4016 -bgra a5e7040f9a80cccd65e5acf2ca09ace5 +bgra 01cfdda1f72fcabb6c46424e27f8c519 gray d7786a7d9d99ac74230cc045cab5632c -gray16be b554d6c1cc8da23967445be4dd3e4a86 -gray16le 715a33aa1c19cb26b14f5cc000e7a3d1 -monob 88c4c050758e64d120f50c7eff694381 -monow d31772ebaa877fc2a78565937f7f9673 +gray16be a8fc0d7fea36407b5c319e3e736c7127 +gray16le 495c89186178308ef171d385bbd8bd70 +monob cb62f31b701c6e987b574974d1b31e32 +monow fd5d417ab7728acddffc06870661df61 nv12 4676d59db43d657dc12841f6bc3ab452 nv21 69c699510ff1fb777b118ebee1002f14 -rgb24 514692e28e8ff6860e415ce4fcf6eb8c +rgb24 13ff53ebeab74dc05492836f1cfbd2c1 rgb48be 8fac63787a711886030f8e056872b488 rgb48le ab92f2763a2eb264c3870cc758f97149 rgb4_byte d81ffd3add95842a618eec81024f0b5c -rgb555be 4607309f9f217d51cbb53d13b84b4537 -rgb555le a350ef1dc2c9688ed49e7ba018843795 -rgb565be 678ce231c4ea13629c1353b1df4ffbef -rgb565le 6f4bb711238baa762d73305213f8d035 +rgb555be 491dc49ff83258ffe415289bdcfb50b2 +rgb555le bd698d86c03170c4a16607c0fd1f750f +rgb565be 35682c17c85f307147041f23ac8092aa +rgb565le bfa0c639d80c3c03fd0c9e5f34296a5e rgb8 091d0170b354ef0e97312b95feb5483f -rgba a3d362f222098a00e63867f612018659 +rgba 16873e3ac914e76116629a5ff8940ac4 uyvy422 314bd486277111a95d9369b944fa0400 yuv410p 7df8f6d69b56a8dcb6c7ee908e5018b5 yuv411p 1143e7c5cc28fe0922b051b17733bc4c yuv420p fdad2d8df8985e3d17e73c71f713cb14 -yuv420p10be d7695b9117d5b52819c569459e42669b -yuv420p10le 0ac6d448db2df5f3d1346aa81f2b5f50 -yuv420p16be 9688e33e03b8c8275ab2fb1df0f06bee -yuv420p16le cba8b390ad5e7b8678e419b8ce79c008 -yuv420p9be 8fa6e007b1a40f34eaa3e2beb73ea8af -yuv420p9le a7b131a7dd06906a5aef2e36d117b972 +yuv420p10be dfa4d57bbc0e1a81f86a3895ab4feac0 +yuv420p10le af898206e757b0fca844a336f71d0091 +yuv420p16be 2a75942af24fbdc1fdfe189c6e7bf589 +yuv420p16le c4264d92a7c273967a778f4f5daddbe3 +yuv420p9be 046091d96f2a78e224036f203d8c9601 +yuv420p9le c9abfffee99fcf5fcbfc5adcda14e4b4 yuv422p 918e37701ee7377d16a8a6c119c56a40 yuv422p10be 35206fcd7e00ee582a8c366b37d57d1d yuv422p10le 396f930e2da02f149ab9dd5b781cbe8d diff --git a/tests/ref/lavfi/pixfmts_vflip b/tests/ref/lavfi/pixfmts_vflip index 6f51dc7dd7..f36c76e6e1 100644 --- a/tests/ref/lavfi/pixfmts_vflip +++ b/tests/ref/lavfi/pixfmts_vflip @@ -11,8 +11,8 @@ bgr565le fdb617533e1e7ff512ea5b6b6233e738 bgr8 c60f93fd152c6903391d1fe9decd3547 bgra 7f9b799fb48544e49ce93e91d7f9fca8 gray 30d9014a9d43b5f37e7aa64be3a3ecfc -gray16be 6b84b85d3326182fa1217e138249edc5 -gray16le 66bb8faa09dc149734aca3c768a6d4e1 +gray16be 9e8319fa0d4945e587b8c095277be8de +gray16le 790031119f8e874d75ee6f01b4654185 monob d0cf8732677a5360b6160133043590d8 monow ff9869d067ecb94eb9d90c9750c31fea nv12 046f00f598ce14d9854a3534a5c99114 @@ -31,12 +31,12 @@ uyvy422 ffbd36720c77398d9a0d03ce2625928f yuv410p 7bfb39d7afb49d6a6173e6b23ae321eb yuv411p 4a90048cc3a65fac150e53289700efe1 yuv420p 2e6d6062e8cad37fb3ab2c433b55f382 -yuv420p10be df97d20b3b4a10c174d4360552c4160d -yuv420p10le 4b5249208602b941332945c926f80ae9 -yuv420p16be 539076782902664a8acf381bf4f713e8 -yuv420p16le 0f609e588e5a258644ef85170d70e030 -yuv420p9be be40ec975fb2873891643cbbbddbc3b0 -yuv420p9le 7e606310d3f5ff12badf911e8f333471 +yuv420p10be fac8e0ae5a81861cddac97ddc4100b66 +yuv420p10le cb83ed3552113e0292e30adee774359c +yuv420p16be b6d25ba55bc1831d352f379311b42b6d +yuv420p16le 1d7ef427b6f79a02b93948738dab5442 +yuv420p9be 9865bf5c4392b56b1c4eb4f5a3fd32f9 +yuv420p9le 0f1e371a1374d3cba2205b70cc7cac90 yuv422p d7f5cb44d9b0210d66d6a8762640ab34 yuv422p10be 588fe319b96513c32e21d3e32b45447f yuv422p10le 11b57f2bd9661024153f3973b9090cdb diff --git a/tests/ref/seek/dv411_dv b/tests/ref/seek/dv411_dv index baaeefb2cf..d318794157 100644 --- a/tests/ref/seek/dv411_dv +++ b/tests/ref/seek/dv411_dv @@ -1,53 +1,53 @@ -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:144000 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:144000 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos:6768000 size:144000 ret: 0 st: 0 flags:0 ts: 0.800000 -ret: 0 st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:2880000 size:144000 ret: 0 st: 0 flags:1 ts:-0.320000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:144000 ret: 0 st:-1 flags:0 ts: 2.576668 -ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:7056000 size:144000 ret: 0 st:-1 flags:1 ts: 1.470835 -ret: 0 st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos:5328000 size:144000 ret: 0 st: 0 flags:0 ts: 0.360000 -ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:1296000 size:144000 ret: 0 st: 0 flags:1 ts:-0.760000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:144000 ret: 0 st:-1 flags:0 ts: 2.153336 -ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:7056000 size:144000 ret: 0 st:-1 flags:1 ts: 1.047503 -ret: 0 st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos:3744000 size:144000 ret: 0 st: 0 flags:0 ts:-0.040000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:144000 ret: 0 st: 0 flags:1 ts: 2.840000 -ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:7056000 size:144000 ret: 0 st:-1 flags:0 ts: 1.730004 -ret: 0 st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos:6192000 size:144000 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:2304000 size:144000 ret: 0 st: 0 flags:0 ts:-0.480000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:144000 ret: 0 st: 0 flags:1 ts: 2.400000 -ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:7056000 size:144000 ret: 0 st:-1 flags:0 ts: 1.306672 -ret: 0 st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos:4752000 size:144000 ret: 0 st:-1 flags:1 ts: 0.200839 -ret: 0 st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: 720000 size:144000 ret: 0 st: 0 flags:0 ts:-0.920000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:144000 ret: 0 st: 0 flags:1 ts: 2.000000 -ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:7056000 size:144000 ret: 0 st:-1 flags:0 ts: 0.883340 -ret: 0 st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:3168000 size:144000 ret: 0 st:-1 flags:1 ts:-0.222493 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:144000 ret: 0 st: 0 flags:0 ts: 2.680000 -ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:7056000 size:144000 ret: 0 st: 0 flags:1 ts: 1.560000 -ret: 0 st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos:5616000 size:144000 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:1728000 size:144000 ret: 0 st:-1 flags:1 ts:-0.645825 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:144000 diff --git a/tests/ref/seek/dv50_dv b/tests/ref/seek/dv50_dv index 1f07e5b71f..fae6d1b225 100644 --- a/tests/ref/seek/dv50_dv +++ b/tests/ref/seek/dv50_dv @@ -1,53 +1,53 @@ -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:288000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:288000 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:288000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:288000 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos: -1 size:288000 +ret: 0 st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos:13536000 size:288000 ret: 0 st: 0 flags:0 ts: 0.800000 -ret: 0 st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos: -1 size:288000 +ret: 0 st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:5760000 size:288000 ret: 0 st: 0 flags:1 ts:-0.320000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:288000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:288000 ret: 0 st:-1 flags:0 ts: 2.576668 -ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: -1 size:288000 +ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:14112000 size:288000 ret: 0 st:-1 flags:1 ts: 1.470835 -ret: 0 st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos: -1 size:288000 +ret: 0 st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos:10656000 size:288000 ret: 0 st: 0 flags:0 ts: 0.360000 -ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos: -1 size:288000 +ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:2592000 size:288000 ret: 0 st: 0 flags:1 ts:-0.760000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:288000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:288000 ret: 0 st:-1 flags:0 ts: 2.153336 -ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: -1 size:288000 +ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:14112000 size:288000 ret: 0 st:-1 flags:1 ts: 1.047503 -ret: 0 st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos: -1 size:288000 +ret: 0 st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos:7488000 size:288000 ret: 0 st: 0 flags:0 ts:-0.040000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:288000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:288000 ret: 0 st: 0 flags:1 ts: 2.840000 -ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: -1 size:288000 +ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:14112000 size:288000 ret: 0 st:-1 flags:0 ts: 1.730004 -ret: 0 st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos: -1 size:288000 +ret: 0 st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos:12384000 size:288000 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos: -1 size:288000 +ret: 0 st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:4608000 size:288000 ret: 0 st: 0 flags:0 ts:-0.480000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:288000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:288000 ret: 0 st: 0 flags:1 ts: 2.400000 -ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: -1 size:288000 +ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:14112000 size:288000 ret: 0 st:-1 flags:0 ts: 1.306672 -ret: 0 st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos: -1 size:288000 +ret: 0 st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos:9504000 size:288000 ret: 0 st:-1 flags:1 ts: 0.200839 -ret: 0 st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: -1 size:288000 +ret: 0 st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos:1440000 size:288000 ret: 0 st: 0 flags:0 ts:-0.920000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:288000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:288000 ret: 0 st: 0 flags:1 ts: 2.000000 -ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: -1 size:288000 +ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:14112000 size:288000 ret: 0 st:-1 flags:0 ts: 0.883340 -ret: 0 st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos: -1 size:288000 +ret: 0 st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:6336000 size:288000 ret: 0 st:-1 flags:1 ts:-0.222493 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:288000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:288000 ret: 0 st: 0 flags:0 ts: 2.680000 -ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: -1 size:288000 +ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:14112000 size:288000 ret: 0 st: 0 flags:1 ts: 1.560000 -ret: 0 st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos: -1 size:288000 +ret: 0 st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos:11232000 size:288000 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: -1 size:288000 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:3456000 size:288000 ret: 0 st:-1 flags:1 ts:-0.645825 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:288000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:288000 diff --git a/tests/ref/seek/dv_dv b/tests/ref/seek/dv_dv index baaeefb2cf..d318794157 100644 --- a/tests/ref/seek/dv_dv +++ b/tests/ref/seek/dv_dv @@ -1,53 +1,53 @@ -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:144000 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:144000 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos:6768000 size:144000 ret: 0 st: 0 flags:0 ts: 0.800000 -ret: 0 st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:2880000 size:144000 ret: 0 st: 0 flags:1 ts:-0.320000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:144000 ret: 0 st:-1 flags:0 ts: 2.576668 -ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:7056000 size:144000 ret: 0 st:-1 flags:1 ts: 1.470835 -ret: 0 st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos:5328000 size:144000 ret: 0 st: 0 flags:0 ts: 0.360000 -ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:1296000 size:144000 ret: 0 st: 0 flags:1 ts:-0.760000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:144000 ret: 0 st:-1 flags:0 ts: 2.153336 -ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:7056000 size:144000 ret: 0 st:-1 flags:1 ts: 1.047503 -ret: 0 st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos:3744000 size:144000 ret: 0 st: 0 flags:0 ts:-0.040000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:144000 ret: 0 st: 0 flags:1 ts: 2.840000 -ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:7056000 size:144000 ret: 0 st:-1 flags:0 ts: 1.730004 -ret: 0 st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos:6192000 size:144000 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:2304000 size:144000 ret: 0 st: 0 flags:0 ts:-0.480000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:144000 ret: 0 st: 0 flags:1 ts: 2.400000 -ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:7056000 size:144000 ret: 0 st:-1 flags:0 ts: 1.306672 -ret: 0 st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos:4752000 size:144000 ret: 0 st:-1 flags:1 ts: 0.200839 -ret: 0 st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: 720000 size:144000 ret: 0 st: 0 flags:0 ts:-0.920000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:144000 ret: 0 st: 0 flags:1 ts: 2.000000 -ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:7056000 size:144000 ret: 0 st:-1 flags:0 ts: 0.883340 -ret: 0 st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:3168000 size:144000 ret: 0 st:-1 flags:1 ts:-0.222493 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:144000 ret: 0 st: 0 flags:0 ts: 2.680000 -ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:7056000 size:144000 ret: 0 st: 0 flags:1 ts: 1.560000 -ret: 0 st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos:5616000 size:144000 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:1728000 size:144000 ret: 0 st:-1 flags:1 ts:-0.645825 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:144000 diff --git a/tests/ref/seek/lavf_avi b/tests/ref/seek/lavf_avi index 964f0b8b6f..6253960efd 100644 --- a/tests/ref/seek/lavf_avi +++ b/tests/ref/seek/lavf_avi @@ -8,27 +8,27 @@ ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 301466 size: 27864 ret:-1 st: 0 flags:1 ts:-0.320000 ret:-1 st: 1 flags:0 ts: 2.586122 ret: 0 st: 1 flags:1 ts: 1.462857 -ret: 0 st: 1 flags:1 dts: 1.018776 pts: 1.018776 pos: 329774 size: 209 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 301466 size: 27864 ret: 0 st:-1 flags:0 ts: 0.365002 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 156166 size: 27955 +ret: 0 st: 1 flags:1 dts: 0.470204 pts: 0.470204 pos: 155948 size: 209 ret:-1 st:-1 flags:1 ts:-0.740831 ret:-1 st: 0 flags:0 ts: 2.160000 ret: 0 st: 0 flags:1 ts: 1.040000 ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 301466 size: 27864 ret: 0 st: 1 flags:0 ts:-0.052245 -ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 37784 size: 208 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 9908 size: 27867 ret: 0 st: 1 flags:1 ts: 2.847347 -ret: 0 st: 1 flags:1 dts: 1.018776 pts: 1.018776 pos: 329774 size: 209 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 301466 size: 27864 ret:-1 st:-1 flags:0 ts: 1.730004 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 156166 size: 27955 +ret: 0 st: 1 flags:1 dts: 0.470204 pts: 0.470204 pos: 155948 size: 209 ret: 0 st: 0 flags:0 ts:-0.480000 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 9908 size: 27867 ret: 0 st: 0 flags:1 ts: 2.400000 ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 301466 size: 27864 ret:-1 st: 1 flags:0 ts: 1.306122 ret: 0 st: 1 flags:1 ts: 0.208980 -ret: 0 st: 1 flags:1 dts: 0.208980 pts: 0.208980 pos: 92800 size: 209 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 9908 size: 27867 ret: 0 st:-1 flags:0 ts:-0.904994 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 9908 size: 27867 ret: 0 st:-1 flags:1 ts: 1.989173 @@ -38,7 +38,7 @@ ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 301466 size: 27864 ret:-1 st: 0 flags:1 ts:-0.240000 ret:-1 st: 1 flags:0 ts: 2.664490 ret: 0 st: 1 flags:1 ts: 1.567347 -ret: 0 st: 1 flags:1 dts: 1.018776 pts: 1.018776 pos: 329774 size: 209 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 301466 size: 27864 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 156166 size: 27955 +ret: 0 st: 1 flags:1 dts: 0.470204 pts: 0.470204 pos: 155948 size: 209 ret:-1 st:-1 flags:1 ts:-0.645825 diff --git a/tests/ref/seek/lavf_dv b/tests/ref/seek/lavf_dv index 3c49749a6b..0000ff5abe 100644 --- a/tests/ref/seek/lavf_dv +++ b/tests/ref/seek/lavf_dv @@ -1,53 +1,53 @@ -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:144000 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:144000 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3456000 size:144000 ret: 0 st: 0 flags:0 ts: 0.800000 -ret: 0 st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:2880000 size:144000 ret: 0 st: 0 flags:1 ts:-0.320000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:144000 ret: 0 st: 1 flags:0 ts: 2.576667 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3456000 size:144000 ret: 0 st: 1 flags:1 ts: 1.470833 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3456000 size:144000 ret: 0 st:-1 flags:0 ts: 0.365002 -ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:1296000 size:144000 ret: 0 st:-1 flags:1 ts:-0.740831 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:144000 ret: 0 st: 0 flags:0 ts: 2.160000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3456000 size:144000 ret: 0 st: 0 flags:1 ts: 1.040000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3456000 size:144000 ret: 0 st: 1 flags:0 ts:-0.058333 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:144000 ret: 0 st: 1 flags:1 ts: 2.835833 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3456000 size:144000 ret: 0 st:-1 flags:0 ts: 1.730004 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3456000 size:144000 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:2304000 size:144000 ret: 0 st: 0 flags:0 ts:-0.480000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:144000 ret: 0 st: 0 flags:1 ts: 2.400000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3456000 size:144000 ret: 0 st: 1 flags:0 ts: 1.306667 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3456000 size:144000 ret: 0 st: 1 flags:1 ts: 0.200833 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3456000 size:144000 ret: 0 st:-1 flags:0 ts:-0.904994 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:144000 ret: 0 st:-1 flags:1 ts: 1.989173 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3456000 size:144000 ret: 0 st: 0 flags:0 ts: 0.880000 -ret: 0 st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:3168000 size:144000 ret: 0 st: 0 flags:1 ts:-0.240000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:144000 ret: 0 st: 1 flags:0 ts: 2.671667 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3456000 size:144000 ret: 0 st: 1 flags:1 ts: 1.565833 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3456000 size:144000 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:1728000 size:144000 ret: 0 st:-1 flags:1 ts:-0.645825 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:144000 diff --git a/tests/ref/vsynth1/dv b/tests/ref/vsynth1/dv index cb0427c558..5b55c4f357 100644 --- a/tests/ref/vsynth1/dv +++ b/tests/ref/vsynth1/dv @@ -1,8 +1,8 @@ -27ade3031b17214cf81c19cbf70f37d7 *./tests/data/vsynth1/dv.dv +4d572f758b55a1756adf9f54132f3b9e *./tests/data/vsynth1/dv.dv 7200000 ./tests/data/vsynth1/dv.dv 02ac7cdeab91d4d5621e7ce96dddc498 *./tests/data/dv.vsynth1.out.yuv stddev: 6.90 PSNR: 31.34 MAXDIFF: 76 bytes: 7603200/ 7603200 -bd67f2431db160d4bb6dcd791cea6efd *./tests/data/vsynth1/dv411.dv +f179899efba432c6f01149c36c709092 *./tests/data/vsynth1/dv411.dv 7200000 ./tests/data/vsynth1/dv411.dv b6640a3a572353f51284acb746eb00c4 *./tests/data/dv.vsynth1.out.yuv stddev: 30.76 PSNR: 18.37 MAXDIFF: 205 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth1/dv50 b/tests/ref/vsynth1/dv50 index 9ae338527d..461392e288 100644 --- a/tests/ref/vsynth1/dv50 +++ b/tests/ref/vsynth1/dv50 @@ -1,4 +1,4 @@ -26dba84f0ea895b914ef5b333d8394ac *./tests/data/vsynth1/dv50.dv +a193c5f92bf6e74c604e759d5f4f0f94 *./tests/data/vsynth1/dv50.dv 14400000 ./tests/data/vsynth1/dv50.dv a2ff093e93ffed10f730fa21df02fc50 *./tests/data/dv50.vsynth1.out.yuv stddev: 1.72 PSNR: 43.38 MAXDIFF: 29 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth1/error b/tests/ref/vsynth1/error index bc24d5b2af..4d1e9e5b0c 100644 --- a/tests/ref/vsynth1/error +++ b/tests/ref/vsynth1/error @@ -1,4 +1,4 @@ 7416dfd319f04044d4575dc9d1b406e1 *./tests/data/vsynth1/error-mpeg4-adv.avi - 756836 ./tests/data/vsynth1/error-mpeg4-adv.avi +756836 ./tests/data/vsynth1/error-mpeg4-adv.avi 79e94ba32b37759397362cbcb479d4d3 *./tests/data/error.vsynth1.out.yuv stddev: 18.36 PSNR: 22.85 MAXDIFF: 243 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth1/flashsv b/tests/ref/vsynth1/flashsv index 7920193aa7..77fefe0bc0 100644 --- a/tests/ref/vsynth1/flashsv +++ b/tests/ref/vsynth1/flashsv @@ -1,4 +1,4 @@ 97894502b4cb57aca1105b6333f72dae *./tests/data/vsynth1/flashsv.flv 14681925 ./tests/data/vsynth1/flashsv.flv -947cb24ec45a453348ae6fe3fa278071 *./tests/data/flashsv.vsynth1.out.yuv -stddev: 2.85 PSNR: 39.03 MAXDIFF: 49 bytes: 7603200/ 7603200 +791e1fb999deb2e4156e2286d48c4ed1 *./tests/data/flashsv.vsynth1.out.yuv +stddev: 2.84 PSNR: 39.04 MAXDIFF: 49 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth1/flashsv2 b/tests/ref/vsynth1/flashsv2 new file mode 100644 index 0000000000..0df3f47c18 --- /dev/null +++ b/tests/ref/vsynth1/flashsv2 @@ -0,0 +1,2 @@ +ec13d68cbce263f589fe79bcd2e98364 *./tests/data/vsynth1/flashsv2.flv +8406137 ./tests/data/vsynth1/flashsv2.flv diff --git a/tests/ref/vsynth1/jpegls b/tests/ref/vsynth1/jpegls index 636f7fc556..153f9b9c0f 100644 --- a/tests/ref/vsynth1/jpegls +++ b/tests/ref/vsynth1/jpegls @@ -1,4 +1,4 @@ 519e26bb1ac0f3db8f90b36537f2f760 *./tests/data/vsynth1/jpegls.avi 9089812 ./tests/data/vsynth1/jpegls.avi -947cb24ec45a453348ae6fe3fa278071 *./tests/data/jpegls.vsynth1.out.yuv -stddev: 2.85 PSNR: 39.03 MAXDIFF: 49 bytes: 7603200/ 7603200 +791e1fb999deb2e4156e2286d48c4ed1 *./tests/data/jpegls.vsynth1.out.yuv +stddev: 2.84 PSNR: 39.04 MAXDIFF: 49 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth1/mpeg4 b/tests/ref/vsynth1/mpeg4 index ebe2f5a613..93c13bc662 100644 --- a/tests/ref/vsynth1/mpeg4 +++ b/tests/ref/vsynth1/mpeg4 @@ -1,4 +1,4 @@ -080e75117f8142001b096cd977ba287e *./tests/data/vsynth1/odivx.mp4 +d2405fd9e350854a161f48bc63f49253 *./tests/data/vsynth1/odivx.mp4 540156 ./tests/data/vsynth1/odivx.mp4 8828a375448dc5c2215163ba70656f89 *./tests/data/mpeg4.vsynth1.out.yuv stddev: 7.97 PSNR: 30.10 MAXDIFF: 105 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth1/msvideo1 b/tests/ref/vsynth1/msvideo1 new file mode 100644 index 0000000000..7978258c99 --- /dev/null +++ b/tests/ref/vsynth1/msvideo1 @@ -0,0 +1,4 @@ +267a152a73cbc5ac4694a6e3b254be34 *./tests/data/vsynth1/msvideo1.avi +2162264 ./tests/data/vsynth1/msvideo1.avi +c0665fac1bd896b6fe7fe0eead805bd5 *./tests/data/msvideo1.vsynth1.out.yuv +stddev: 11.80 PSNR: 26.69 MAXDIFF: 151 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth1/qtrle b/tests/ref/vsynth1/qtrle index 9988897b91..d25b986184 100644 --- a/tests/ref/vsynth1/qtrle +++ b/tests/ref/vsynth1/qtrle @@ -1,4 +1,4 @@ d14041925ce5ec5001dc519276b1a1ab *./tests/data/vsynth1/qtrle.mov 15263232 ./tests/data/vsynth1/qtrle.mov -243325fb2cae1a9245efd49aff936327 *./tests/data/qtrle.vsynth1.out.yuv -stddev: 3.42 PSNR: 37.43 MAXDIFF: 48 bytes: 7603200/ 7603200 +93695a27c24a61105076ca7b1f010bbd *./tests/data/qtrle.vsynth1.out.yuv +stddev: 3.42 PSNR: 37.44 MAXDIFF: 48 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth1/qtrlegray b/tests/ref/vsynth1/qtrlegray new file mode 100644 index 0000000000..686611394e --- /dev/null +++ b/tests/ref/vsynth1/qtrlegray @@ -0,0 +1,4 @@ +0544350c00f33f21e29b5edd965c3f03 *./tests/data/vsynth1/qtrlegray.mov +5113428 ./tests/data/vsynth1/qtrlegray.mov +29def4aed035ed65d3a89f7d382fccbe *./tests/data/qtrlegray.vsynth1.out.yuv +stddev: 25.95 PSNR: 19.85 MAXDIFF: 122 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth1/rgb b/tests/ref/vsynth1/rgb index 10a0a13329..1c353dae7f 100644 --- a/tests/ref/vsynth1/rgb +++ b/tests/ref/vsynth1/rgb @@ -1,4 +1,4 @@ 05f0719cb52486d9a4beb9cfae3f2571 *./tests/data/vsynth1/rgb.avi 15213260 ./tests/data/vsynth1/rgb.avi -243325fb2cae1a9245efd49aff936327 *./tests/data/rgb.vsynth1.out.yuv -stddev: 3.42 PSNR: 37.43 MAXDIFF: 48 bytes: 7603200/ 7603200 +93695a27c24a61105076ca7b1f010bbd *./tests/data/rgb.vsynth1.out.yuv +stddev: 3.42 PSNR: 37.44 MAXDIFF: 48 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth2/dv b/tests/ref/vsynth2/dv index 676b209c58..b05dc4fffe 100644 --- a/tests/ref/vsynth2/dv +++ b/tests/ref/vsynth2/dv @@ -1,8 +1,8 @@ -bfa766f89bfeabc0ae1044f3954bed52 *./tests/data/vsynth2/dv.dv +85b8d55b0b68bb3fc2e90babb580f9b7 *./tests/data/vsynth2/dv.dv 7200000 ./tests/data/vsynth2/dv.dv 7ec62bd3350a6848364669e6e1e4b9cc *./tests/data/dv.vsynth2.out.yuv stddev: 1.71 PSNR: 43.47 MAXDIFF: 33 bytes: 7603200/ 7603200 -00a9d8683ac6826af41bcf7223fb0389 *./tests/data/vsynth2/dv411.dv +e428508f400327aeb96969c08fb9e1b5 *./tests/data/vsynth2/dv411.dv 7200000 ./tests/data/vsynth2/dv411.dv 7f9fa421028aabb11eaf4c6513a5a843 *./tests/data/dv.vsynth2.out.yuv stddev: 10.09 PSNR: 28.05 MAXDIFF: 60 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth2/dv50 b/tests/ref/vsynth2/dv50 index 7e0083bfc1..cc468b8cd4 100644 --- a/tests/ref/vsynth2/dv50 +++ b/tests/ref/vsynth2/dv50 @@ -1,4 +1,4 @@ -61e31c79e8949b25c849753a0785b0d7 *./tests/data/vsynth2/dv50.dv +0032a07167199e6f49e07fa7ed4d5f62 *./tests/data/vsynth2/dv50.dv 14400000 ./tests/data/vsynth2/dv50.dv af3f2dd5ab62c1a1d98b07d4aeb6852f *./tests/data/dv50.vsynth2.out.yuv stddev: 0.82 PSNR: 49.82 MAXDIFF: 12 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth2/error b/tests/ref/vsynth2/error index 424c54962b..a6bfcd4fe2 100644 --- a/tests/ref/vsynth2/error +++ b/tests/ref/vsynth2/error @@ -1,4 +1,4 @@ 90e65096aa9ebafa3fe3f44a5a47cdc4 *./tests/data/vsynth2/error-mpeg4-adv.avi - 176588 ./tests/data/vsynth2/error-mpeg4-adv.avi +176588 ./tests/data/vsynth2/error-mpeg4-adv.avi 96baa9e4c24c837a3ba5abd8dd2cdd30 *./tests/data/error.vsynth2.out.yuv stddev: 8.98 PSNR: 29.06 MAXDIFF: 184 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth2/flashsv b/tests/ref/vsynth2/flashsv index bfbb9e1c08..0b7b7d925e 100644 --- a/tests/ref/vsynth2/flashsv +++ b/tests/ref/vsynth2/flashsv @@ -1,4 +1,4 @@ 0667077971e0cb63b5f49c580006e90e *./tests/data/vsynth2/flashsv.flv 12368953 ./tests/data/vsynth2/flashsv.flv -592b3321994e26a990deb3a0a1415de9 *./tests/data/flashsv.vsynth2.out.yuv -stddev: 0.65 PSNR: 51.84 MAXDIFF: 14 bytes: 7603200/ 7603200 +3a984506f1ebfc9fb73b6814cab201cc *./tests/data/flashsv.vsynth2.out.yuv +stddev: 0.66 PSNR: 51.73 MAXDIFF: 14 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth2/flashsv2 b/tests/ref/vsynth2/flashsv2 new file mode 100644 index 0000000000..93f429b7d7 --- /dev/null +++ b/tests/ref/vsynth2/flashsv2 @@ -0,0 +1,2 @@ +6fbb1cf84d473a93035047c3a3e344ff *./tests/data/vsynth2/flashsv2.flv +4814443 ./tests/data/vsynth2/flashsv2.flv diff --git a/tests/ref/vsynth2/jpegls b/tests/ref/vsynth2/jpegls index e7fa2df46c..229937ec80 100644 --- a/tests/ref/vsynth2/jpegls +++ b/tests/ref/vsynth2/jpegls @@ -1,4 +1,4 @@ 4fc53937f048c900ae6d50fda9dba206 *./tests/data/vsynth2/jpegls.avi 8334630 ./tests/data/vsynth2/jpegls.avi -592b3321994e26a990deb3a0a1415de9 *./tests/data/jpegls.vsynth2.out.yuv -stddev: 0.65 PSNR: 51.84 MAXDIFF: 14 bytes: 7603200/ 7603200 +3a984506f1ebfc9fb73b6814cab201cc *./tests/data/jpegls.vsynth2.out.yuv +stddev: 0.66 PSNR: 51.73 MAXDIFF: 14 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth2/mpeg4 b/tests/ref/vsynth2/mpeg4 index fe436e88f3..d534ec1ed1 100644 --- a/tests/ref/vsynth2/mpeg4 +++ b/tests/ref/vsynth2/mpeg4 @@ -1,4 +1,4 @@ -8ffbe8ce43fe126b12cf9621717d641b *./tests/data/vsynth2/odivx.mp4 +2e3bf184668d4807ae6df0bdceba487b *./tests/data/vsynth2/odivx.mp4 119809 ./tests/data/vsynth2/odivx.mp4 90a3577850239083a9042bef33c50e85 *./tests/data/mpeg4.vsynth2.out.yuv stddev: 5.34 PSNR: 33.57 MAXDIFF: 83 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth2/msvideo1 b/tests/ref/vsynth2/msvideo1 new file mode 100644 index 0000000000..f71be35278 --- /dev/null +++ b/tests/ref/vsynth2/msvideo1 @@ -0,0 +1,4 @@ +5dddbbd6616d9be4bc0fd0c9650bd9e3 *./tests/data/vsynth2/msvideo1.avi +1259308 ./tests/data/vsynth2/msvideo1.avi +cd83ffcbc73573044e3aead3094229e5 *./tests/data/msvideo1.vsynth2.out.yuv +stddev: 7.42 PSNR: 30.72 MAXDIFF: 123 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth2/qtrle b/tests/ref/vsynth2/qtrle index 6b2a01168e..d87a6b96ac 100644 --- a/tests/ref/vsynth2/qtrle +++ b/tests/ref/vsynth2/qtrle @@ -1,4 +1,4 @@ d8c1604dc46d9aa4ec0385e6722c6989 *./tests/data/vsynth2/qtrle.mov 14798419 ./tests/data/vsynth2/qtrle.mov -b2418e0e3a9a8619b31219cbcf24dc82 *./tests/data/qtrle.vsynth2.out.yuv -stddev: 1.26 PSNR: 46.06 MAXDIFF: 13 bytes: 7603200/ 7603200 +98d0e2854731472c5bf13d8638502d0a *./tests/data/qtrle.vsynth2.out.yuv +stddev: 1.26 PSNR: 46.10 MAXDIFF: 13 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth2/qtrlegray b/tests/ref/vsynth2/qtrlegray new file mode 100644 index 0000000000..8c7b98a4bd --- /dev/null +++ b/tests/ref/vsynth2/qtrlegray @@ -0,0 +1,4 @@ +55c6e5af44ece0621d1d4c91b282a544 *./tests/data/vsynth2/qtrlegray.mov +5111417 ./tests/data/vsynth2/qtrlegray.mov +f63b5ebdfdba750e547c25131b0a3fd1 *./tests/data/qtrlegray.vsynth2.out.yuv +stddev: 19.42 PSNR: 22.36 MAXDIFF: 72 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth2/rgb b/tests/ref/vsynth2/rgb index ea83470814..bcdef36b72 100644 --- a/tests/ref/vsynth2/rgb +++ b/tests/ref/vsynth2/rgb @@ -1,4 +1,4 @@ f2e9c419023c743bf99aa5b2e55ad233 *./tests/data/vsynth2/rgb.avi 15213260 ./tests/data/vsynth2/rgb.avi -b2418e0e3a9a8619b31219cbcf24dc82 *./tests/data/rgb.vsynth2.out.yuv -stddev: 1.26 PSNR: 46.06 MAXDIFF: 13 bytes: 7603200/ 7603200 +98d0e2854731472c5bf13d8638502d0a *./tests/data/rgb.vsynth2.out.yuv +stddev: 1.26 PSNR: 46.10 MAXDIFF: 13 bytes: 7603200/ 7603200 diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh index bba189092b..14d4e29bf9 100755 --- a/tests/regression-funcs.sh +++ b/tests/regression-funcs.sh @@ -10,6 +10,7 @@ raw_src_dir=$3 target_exec=$4 target_path=$5 threads=${6:-1} +tool=$8 datadir="./tests/data" target_datadir="${target_path}/${datadir}" @@ -18,7 +19,7 @@ this="$test.$test_ref" outfile="$datadir/$test_ref/" # various files -avconv="$target_exec ${target_path}/avconv" +avconv="$target_exec ${target_path}/${tool}" tiny_psnr="tests/tiny_psnr" raw_src="${target_path}/$raw_src_dir/%02d.pgm" raw_dst="$datadir/$this.out.yuv" diff --git a/tests/rotozoom.c b/tests/rotozoom.c index ff817acc3b..822c2bce5e 100644 --- a/tests/rotozoom.c +++ b/tests/rotozoom.c @@ -3,20 +3,20 @@ * * copyright (c) Sebastien Bechet <s.bechet@av7.net> * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ diff --git a/tests/tiny_psnr.c b/tests/tiny_psnr.c index 2bdb4391cf..512d47bb8e 100644 --- a/tests/tiny_psnr.c +++ b/tests/tiny_psnr.c @@ -1,20 +1,20 @@ /* * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at> * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -52,6 +52,21 @@ uint64_t exp16_table[21]={ 582360139072LL, }; +#if 0 +// 16.16 fixpoint exp() +static unsigned int exp16(unsigned int a){ + int i; + int out= 1<<16; + + for(i=19;i>=0;i--){ + if(a&(1<<i)) + out= (out*exp16_table[i] + (1<<15))>>16; + } + + return out; +} +#endif + // 16.16 fixpoint log() static int64_t log16(uint64_t a){ int i; diff --git a/tests/videogen.c b/tests/videogen.c index f114801a8a..4238e3f862 100644 --- a/tests/videogen.c +++ b/tests/videogen.c @@ -4,20 +4,20 @@ * * Copyright (c) 2002 Fabrice Bellard * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ |