diff options
Diffstat (limited to 'ffmpeg/tests')
254 files changed, 2373 insertions, 3115 deletions
diff --git a/ffmpeg/tests/Makefile b/ffmpeg/tests/Makefile index 73ee2d9..d474052 100644 --- a/ffmpeg/tests/Makefile +++ b/ffmpeg/tests/Makefile @@ -13,12 +13,12 @@ ffservertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/data/asynth1.sw @echo $(SRC_PATH)/tests/ffserver-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/ffserver.conf -OBJDIRS += tests/data tests/vsynth1 +OBJDIRS += tests/data tests/vsynth1 tests/data/filtergraphs -tests/vsynth1/00.pgm: tests/videogen$(HOSTEXESUF) | tests/vsynth1 +$(VREF): tests/videogen$(HOSTEXESUF) | tests/vsynth1 $(M)./$< 'tests/vsynth1/' -tests/data/asynth1.sw: tests/audiogen$(HOSTEXESUF) | tests/data +$(AREF): tests/audiogen$(HOSTEXESUF) | tests/data $(M)./$< $@ tests/data/asynth-%.wav: tests/audiogen$(HOSTEXESUF) | tests/data @@ -32,7 +32,7 @@ tests/data/vsynth2.yuv: tests/rotozoom$(HOSTEXESUF) | tests/data tests/data/ffprobe-test.nut: ffmpeg$(EXESUF) | tests/data $(M)$(TARGET_EXEC) ./$< \ - -f lavfi -i "aevalsrc=sin(400*PI*2*t)::d=0.125[out0]; testsrc=d=0.125[out1]; testsrc=s=100x100:d=0.125[out2]" \ + -f lavfi -i "aevalsrc=sin(400*PI*2*t):d=0.125[out0]; testsrc=d=0.125[out1]; testsrc=s=100x100:d=0.125[out2]" \ -f ffmetadata -i $(SRC_PATH)/tests/test.ffmeta \ -flags +bitexact -map 0:0 -map 0:1 -map 0:2 -map_metadata 1 \ -map_metadata:s:0 1:s:0 -map_metadata:s:1 1:s:1 \ @@ -41,7 +41,14 @@ tests/data/ffprobe-test.nut: ffmpeg$(EXESUF) | tests/data tests/data/%.sw tests/data/asynth% tests/data/vsynth%.yuv tests/vsynth%/00.pgm tests/data/%.nut: TAG = GEN +tests/data/filtergraphs/%: TAG = COPY +tests/data/filtergraphs/%: $(SRC_PATH)/tests/filtergraphs/% | tests/data/filtergraphs + $(M)cp $< $@ + +# Check sanity of dependencies when running FATE tests. +ifneq (,$(filter check fate%,$(filter-out fate-rsync,$(MAKECMDGOALS)))) CHKCFG = $(if $($(1))$(!$(1)),$($(1)), $(error No such config: $(1))) +endif ALLYES = $(strip $(call XYES, $(1))) XYES = $(if $(strip $(1)), \ @@ -59,10 +66,17 @@ ENCDEC2 = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER \ DEMDEC = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER)) ENCMUX = $(call ALLYES, $(1:%=%_ENCODER) $(2)_MUXER) +DEMMUX = $(call ALLYES, $(1)_DEMUXER $(2)_MUXER) + +FILTERDEMDEC = $(call ALLYES, $(1)_FILTER $(2)_DEMUXER $(3)_DECODER) +FILTERDEMDECMUX = $(call ALLYES, $(1)_FILTER $(2)_DEMUXER $(3)_DECODER $(4)_MUXER) +FILTERDEMDECENCMUX = $(call ALLYES, $(1)_FILTER $(2)_DEMUXER $(3)_DECODER $(4)_ENCODER $(5)_MUXER) + +PARSERDEMDEC = $(call ALLYES, $(1)_PARSER $(2)_DEMUXER $(3)_DECODER) + include $(SRC_PATH)/tests/fate/acodec.mak include $(SRC_PATH)/tests/fate/vcodec.mak include $(SRC_PATH)/tests/fate/avformat.mak -include $(SRC_PATH)/tests/fate/avfilter.mak include $(SRC_PATH)/tests/fate/seek.mak include $(SRC_PATH)/tests/fate/aac.mak @@ -81,21 +95,28 @@ include $(SRC_PATH)/tests/fate/demux.mak include $(SRC_PATH)/tests/fate/dfa.mak include $(SRC_PATH)/tests/fate/dpcm.mak include $(SRC_PATH)/tests/fate/ea.mak +include $(SRC_PATH)/tests/fate/exif.mak include $(SRC_PATH)/tests/fate/ffmpeg.mak include $(SRC_PATH)/tests/fate/ffprobe.mak -include $(SRC_PATH)/tests/fate/filter.mak +include $(SRC_PATH)/tests/fate/filter-audio.mak +include $(SRC_PATH)/tests/fate/filter-video.mak include $(SRC_PATH)/tests/fate/flac.mak include $(SRC_PATH)/tests/fate/fft.mak include $(SRC_PATH)/tests/fate/gif.mak include $(SRC_PATH)/tests/fate/h264.mak +include $(SRC_PATH)/tests/fate/hevc.mak include $(SRC_PATH)/tests/fate/image.mak include $(SRC_PATH)/tests/fate/indeo.mak include $(SRC_PATH)/tests/fate/libavcodec.mak +include $(SRC_PATH)/tests/fate/libavdevice.mak include $(SRC_PATH)/tests/fate/libavformat.mak +include $(SRC_PATH)/tests/fate/libavresample.mak include $(SRC_PATH)/tests/fate/libavutil.mak +include $(SRC_PATH)/tests/fate/libswresample.mak include $(SRC_PATH)/tests/fate/lossless-audio.mak include $(SRC_PATH)/tests/fate/lossless-video.mak include $(SRC_PATH)/tests/fate/microsoft.mak +include $(SRC_PATH)/tests/fate/monkeysaudio.mak include $(SRC_PATH)/tests/fate/mp3.mak include $(SRC_PATH)/tests/fate/mpc.mak include $(SRC_PATH)/tests/fate/pcm.mak @@ -147,7 +168,7 @@ $(FATE_EXTERN): @echo "$@ requires external samples and SAMPLES not specified"; false endif -FATE_UTILS = base64 tiny_psnr +FATE_UTILS = base64 tiny_psnr tiny_ssim TOOL = ffmpeg @@ -155,11 +176,26 @@ fate:: $(FATE) $(FATE) $(FATE_TESTS-no): $(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)' '$(CPUFLAGS)' '$(CMP_SHIFT)' '$(CMP_TARGET)' '$(SIZE_TOLERANCE)' '$(CMP_UNIT)' + $(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)' '$(CPUFLAGS)' '$(CMP_SHIFT)' '$(CMP_TARGET)' '$(SIZE_TOLERANCE)' '$(CMP_UNIT)' '$(GEN)' fate-list: @printf '%s\n' $(sort $(FATE)) +coverage.info: TAG = LCOV +coverage.info: + $(M)lcov -q -d $(CURDIR) -b $(SRC_PATH) --capture | \ + sed "s,$(CURDIR)/\./,$(CURDIR)/," > $@ + $(M)lcov -q --remove $@ "/usr*" -o $@ + +lcov: TAG = GENHTML +lcov: coverage.info + $(M)genhtml -q -o $(CURDIR)/lcov $< + +lcov-reset: TAG = LCOV +lcov-reset: + $(M)lcov -d $(CURDIR) --zerocounters + $(Q)$(RM) -f coverage.info + clean:: testclean testclean: @@ -169,4 +205,5 @@ testclean: -include $(wildcard tests/*.d) -.PHONY: fate* +.PHONY: fate* lcov lcov-reset +.INTERMEDIATE: coverage.info diff --git a/ffmpeg/tests/audiogen.c b/ffmpeg/tests/audiogen.c index 09cf429..e705061 100644 --- a/ffmpeg/tests/audiogen.c +++ b/ffmpeg/tests/audiogen.c @@ -48,7 +48,7 @@ static unsigned int myrnd(unsigned int *seed_ptr, int n) #define COS_TABLE_BITS 7 -/* integer cosinus */ +/* integer cosine */ static const unsigned short cos_table[(1 << COS_TABLE_BITS) + 2] = { 0x8000, 0x7ffe, 0x7ff6, 0x7fea, 0x7fd9, 0x7fc2, 0x7fa7, 0x7f87, 0x7f62, 0x7f38, 0x7f0a, 0x7ed6, 0x7e9d, 0x7e60, 0x7e1e, 0x7dd6, @@ -180,7 +180,7 @@ int main(int argc, char **argv) if ((ext = strrchr(argv[1], '.')) != NULL && !strcmp(ext, ".wav")) put_wav_header(sample_rate, nb_channels, 6 * sample_rate); - /* 1 second of single freq sinus at 1000 Hz */ + /* 1 second of single freq sine at 1000 Hz */ a = 0; for (i = 0; i < 1 * sample_rate; i++) { v = (int_cos(a) * 10000) >> FRAC_BITS; diff --git a/ffmpeg/tests/fate-run.sh b/ffmpeg/tests/fate-run.sh index 0520d62..48e9dd0 100755 --- a/ffmpeg/tests/fate-run.sh +++ b/ffmpeg/tests/fate-run.sh @@ -22,6 +22,7 @@ cmp_shift=${12:-0} cmp_target=${13:-0} size_tolerance=${14:-0} cmp_unit=${15:-2} +gen=${16:-no} outdir="tests/data/fate" outfile="${outdir}/${test}" @@ -74,6 +75,10 @@ probefmt(){ run ffprobe -show_entries format=format_name -print_format default=nw=1:nk=1 -v 0 "$@" } +probeframes(){ + run ffprobe -show_frames -v 0 "$@" +} + ffmpeg(){ dec_opts="-threads $threads -thread_type $thread_type" ffmpeg_args="-nostats -cpuflags $cpuflags" @@ -85,11 +90,11 @@ ffmpeg(){ } framecrc(){ - ffmpeg "$@" -f framecrc - + ffmpeg "$@" -flags +bitexact -f framecrc - } framemd5(){ - ffmpeg "$@" -f framemd5 - + ffmpeg "$@" -flags +bitexact -f framemd5 - } crc(){ @@ -145,23 +150,62 @@ enc_dec(){ tests/tiny_psnr $srcfile $decfile $cmp_unit $cmp_shift } -regtest(){ - t="${test#$2-}" - ref=${base}/ref/$2/$t - ${base}/${1}-regression.sh $t $2 $3 "$target_exec" "$target_path" "$threads" "$thread_type" "$cpuflags" "$samples" -} - lavffatetest(){ - regtest lavf lavf-fate tests/vsynth1 + t="${test#lavf-fate-}" + ref=${base}/ref/lavf-fate/$t + ${base}/lavf-regression.sh $t lavf-fate tests/vsynth1 "$target_exec" "$target_path" "$threads" "$thread_type" "$cpuflags" "$samples" } lavftest(){ - regtest lavf lavf tests/vsynth1 + t="${test#lavf-}" + ref=${base}/ref/lavf/$t + ${base}/lavf-regression.sh $t lavf tests/vsynth1 "$target_exec" "$target_path" "$threads" "$thread_type" "$cpuflags" "$samples" } -lavfitest(){ - cleanfiles="tests/data/lavfi/${test#lavfi-}.nut" - regtest lavfi lavfi tests/vsynth1 +video_filter(){ + filters=$1 + shift + label=${test#filter-} + raw_src="${target_path}/tests/vsynth1/%02d.pgm" + printf '%-20s' $label + ffmpeg $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src \ + $FLAGS $ENC_OPTS -vf "$filters" -vcodec rawvideo $* -f nut md5: +} + +pixdesc(){ + pix_fmts="$(ffmpeg -pix_fmts list 2>/dev/null | awk 'NR > 8 && /^IO/ { print $2 }' | sort)" + for pix_fmt in $pix_fmts; do + test=$pix_fmt + video_filter "format=$pix_fmt,pixdesctest" -pix_fmt $pix_fmt + done +} + +pixfmts(){ + filter=${test#filter-pixfmts-} + filter=${filter%_*} + filter_args=$1 + prefilter_chain=$2 + + showfiltfmts="$target_exec $target_path/libavfilter/filtfmts-test" + scale_exclude_fmts=${outfile}_scale_exclude_fmts + scale_in_fmts=${outfile}_scale_in_fmts + scale_out_fmts=${outfile}_scale_out_fmts + in_fmts=${outfile}_in_fmts + + # exclude pixel formats which are not supported as input + $showfiltfmts scale | awk -F '[ \r]' '/^INPUT/{ fmt=substr($3, 5); print fmt }' | sort >$scale_in_fmts + $showfiltfmts scale | awk -F '[ \r]' '/^OUTPUT/{ fmt=substr($3, 5); print fmt }' | sort >$scale_out_fmts + comm -12 $scale_in_fmts $scale_out_fmts >$scale_exclude_fmts + + $showfiltfmts $filter | awk -F '[ \r]' '/^INPUT/{ fmt=substr($3, 5); print fmt }' | sort >$in_fmts + pix_fmts=$(comm -12 $scale_exclude_fmts $in_fmts) + + for pix_fmt in $pix_fmts; do + test=$pix_fmt + video_filter "${prefilter_chain}format=$pix_fmt,$filter=$filter_args" -pix_fmt $pix_fmt + done + + rm $in_fmts $scale_in_fmts $scale_out_fmts $scale_exclude_fmts } mkdir -p "$outdir" @@ -197,9 +241,17 @@ fi echo "${test}:${sig:-$err}:$($base64 <$cmpfile):$($base64 <$errfile)" >$repfile +if test $err != 0 && test $gen != "no" ; then + echo "GEN $ref" + cp -f "$outfile" "$ref" + err=$? +fi + if test $err = 0; then rm -f $outfile $errfile $cmpfile $cleanfiles -else +elif test $gen = "no"; then echo "Test $test failed. Look at $errfile for details." +else + echo "Updating reference failed, possibly no output file was generated." fi exit $err diff --git a/ffmpeg/tests/fate.sh b/ffmpeg/tests/fate.sh index 1f70e79..f371291 100755 --- a/ffmpeg/tests/fate.sh +++ b/ffmpeg/tests/fate.sh @@ -28,14 +28,14 @@ lock(){ checkout(){ case "$repo" in file:*|/*) src="${repo#file:}" ;; - git:*) git clone "$repo" "$src" ;; + git:*) git clone --quiet "$repo" "$src" ;; esac } update()( cd ${src} || return case "$repo" in - git:*) git pull --quiet ;; + git:*) git fetch --force && git reset --hard FETCH_HEAD ;; esac ) @@ -46,15 +46,18 @@ configure()( --samples="${samples}" \ --enable-gpl \ --enable-memory-poisoning \ + --enable-avresample \ ${arch:+--arch=$arch} \ ${cpu:+--cpu="$cpu"} \ ${cross_prefix:+--cross-prefix="$cross_prefix"} \ + ${as:+--as="$as"} \ ${cc:+--cc="$cc"} \ ${ld:+--ld="$ld"} \ ${target_os:+--target-os="$target_os"} \ ${sysroot:+--sysroot="$sysroot"} \ ${target_exec:+--target-exec="$target_exec"} \ ${target_path:+--target-path="$target_path"} \ + ${target_samples:+--target-samples="$target_samples"} \ ${extra_cflags:+--extra-cflags="$extra_cflags"} \ ${extra_ldflags:+--extra-ldflags="$extra_ldflags"} \ ${extra_libs:+--extra-libs="$extra_libs"} \ @@ -67,6 +70,7 @@ compile()( ) fate()( + test "$build_only" = "yes" && return cd ${build} || return ${make} ${makeopts} -k fate ) diff --git a/ffmpeg/tests/fate/aac.mak b/ffmpeg/tests/fate/aac.mak index 0b3999d..b85a8e8 100644 --- a/ffmpeg/tests/fate/aac.mak +++ b/ffmpeg/tests/fate/aac.mak @@ -1,56 +1,65 @@ FATE_AAC += fate-aac-al04_44 -fate-aac-al04_44: CMD = pcm -i $(SAMPLES)/aac/al04_44.mp4 +fate-aac-al04_44: CMD = pcm -i $(TARGET_SAMPLES)/aac/al04_44.mp4 fate-aac-al04_44: REF = $(SAMPLES)/aac/al04_44.s16 FATE_AAC += fate-aac-al05_44 -fate-aac-al05_44: CMD = pcm -i $(SAMPLES)/aac/al05_44.mp4 +fate-aac-al05_44: CMD = pcm -i $(TARGET_SAMPLES)/aac/al05_44.mp4 fate-aac-al05_44: REF = $(SAMPLES)/aac/al05_44.s16 FATE_AAC += fate-aac-al06_44 -fate-aac-al06_44: CMD = pcm -i $(SAMPLES)/aac/al06_44.mp4 +fate-aac-al06_44: CMD = pcm -i $(TARGET_SAMPLES)/aac/al06_44.mp4 fate-aac-al06_44: REF = $(SAMPLES)/aac/al06_44_reorder.s16 FATE_AAC += fate-aac-al07_96 -fate-aac-al07_96: CMD = pcm -i $(SAMPLES)/aac/al07_96.mp4 +fate-aac-al07_96: CMD = pcm -i $(TARGET_SAMPLES)/aac/al07_96.mp4 fate-aac-al07_96: REF = $(SAMPLES)/aac/al07_96_reorder.s16 FATE_AAC += fate-aac-al15_44 -fate-aac-al15_44: CMD = pcm -i $(SAMPLES)/aac/al15_44.mp4 +fate-aac-al15_44: CMD = pcm -i $(TARGET_SAMPLES)/aac/al15_44.mp4 fate-aac-al15_44: REF = $(SAMPLES)/aac/al15_44_reorder.s16 FATE_AAC += fate-aac-al17_44 -fate-aac-al17_44: CMD = pcm -i $(SAMPLES)/aac/al17_44.mp4 +fate-aac-al17_44: CMD = pcm -i $(TARGET_SAMPLES)/aac/al17_44.mp4 fate-aac-al17_44: REF = $(SAMPLES)/aac/al17_44.s16 FATE_AAC += fate-aac-al18_44 -fate-aac-al18_44: CMD = pcm -i $(SAMPLES)/aac/al18_44.mp4 +fate-aac-al18_44: CMD = pcm -i $(TARGET_SAMPLES)/aac/al18_44.mp4 fate-aac-al18_44: REF = $(SAMPLES)/aac/al18_44.s16 FATE_AAC += fate-aac-am00_88 -fate-aac-am00_88: CMD = pcm -i $(SAMPLES)/aac/am00_88.mp4 +fate-aac-am00_88: CMD = pcm -i $(TARGET_SAMPLES)/aac/am00_88.mp4 fate-aac-am00_88: REF = $(SAMPLES)/aac/am00_88.s16 FATE_AAC += fate-aac-am05_44 -fate-aac-am05_44: CMD = pcm -i $(SAMPLES)/aac/am05_44.mp4 +fate-aac-am05_44: CMD = pcm -i $(TARGET_SAMPLES)/aac/am05_44.mp4 fate-aac-am05_44: REF = $(SAMPLES)/aac/am05_44_reorder.s16 FATE_AAC += fate-aac-al_sbr_hq_cm_48_2 -fate-aac-al_sbr_hq_cm_48_2: CMD = pcm -i $(SAMPLES)/aac/al_sbr_cm_48_2.mp4 +fate-aac-al_sbr_hq_cm_48_2: CMD = pcm -i $(TARGET_SAMPLES)/aac/al_sbr_cm_48_2.mp4 fate-aac-al_sbr_hq_cm_48_2: REF = $(SAMPLES)/aac/al_sbr_hq_cm_48_2.s16 FATE_AAC += fate-aac-al_sbr_hq_cm_48_5.1 -fate-aac-al_sbr_hq_cm_48_5.1: CMD = pcm -i $(SAMPLES)/aac/al_sbr_cm_48_5.1.mp4 +fate-aac-al_sbr_hq_cm_48_5.1: CMD = pcm -i $(TARGET_SAMPLES)/aac/al_sbr_cm_48_5.1.mp4 fate-aac-al_sbr_hq_cm_48_5.1: REF = $(SAMPLES)/aac/al_sbr_hq_cm_48_5.1_reorder.s16 FATE_AAC += fate-aac-al_sbr_ps_06_ur -fate-aac-al_sbr_ps_06_ur: CMD = pcm -i $(SAMPLES)/aac/al_sbr_ps_06_new.mp4 +fate-aac-al_sbr_ps_06_ur: CMD = pcm -i $(TARGET_SAMPLES)/aac/al_sbr_ps_06_new.mp4 fate-aac-al_sbr_ps_06_ur: REF = $(SAMPLES)/aac/al_sbr_ps_06_ur.s16 FATE_AAC += fate-aac-ap05_48 -fate-aac-ap05_48: CMD = pcm -i $(SAMPLES)/aac/ap05_48.mp4 +fate-aac-ap05_48: CMD = pcm -i $(TARGET_SAMPLES)/aac/ap05_48.mp4 fate-aac-ap05_48: REF = $(SAMPLES)/aac/ap05_48.s16 -fate-aac-ct%: CMD = pcm -i $(SAMPLES)/aac/CT_DecoderCheck/$(@:fate-aac-ct-%=%) +FATE_AAC += fate-aac-er_ad6000np_44_ep0 +fate-aac-er_ad6000np_44_ep0: CMD = pcm -i $(TARGET_SAMPLES)/aac/er_ad6000np_44_ep0.mp4 +fate-aac-er_ad6000np_44_ep0: REF = $(SAMPLES)/aac/er_ad6000np_44_ep0.s16 + +FATE_AAC += fate-aac-er_eld2000np_48_ep0 +fate-aac-er_eld2000np_48_ep0: CMD = pcm -i $(TARGET_SAMPLES)/aac/er_eld2000np_48_ep0.mp4 +fate-aac-er_eld2000np_48_ep0: REF = $(SAMPLES)/aac/er_eld2000np_48_ep0.s16 + + +fate-aac-ct%: CMD = pcm -i $(TARGET_SAMPLES)/aac/CT_DecoderCheck/$(@:fate-aac-ct-%=%) fate-aac-ct%: REF = $(SAMPLES)/aac/CT_DecoderCheck/aacPlusv2.wav FATE_AAC_CT_RAW = fate-aac-ct-sbr_i-ps_i.aac @@ -82,11 +91,11 @@ fate-aac-ln-encode: CMP_TARGET = 65 fate-aac-ln-encode: SIZE_TOLERANCE = 3560 FATE_AAC_LATM += fate-aac-latm_000000001180bc60 -fate-aac-latm_000000001180bc60: CMD = pcm -i $(SAMPLES)/aac/latm_000000001180bc60.mpg +fate-aac-latm_000000001180bc60: CMD = pcm -i $(TARGET_SAMPLES)/aac/latm_000000001180bc60.mpg fate-aac-latm_000000001180bc60: REF = $(SAMPLES)/aac/latm_000000001180bc60.s16 FATE_AAC_LATM += fate-aac-latm_stereo_to_51 -fate-aac-latm_stereo_to_51: CMD = pcm -i $(SAMPLES)/aac/latm_stereo_to_51.ts -channel_layout 5.1 +fate-aac-latm_stereo_to_51: CMD = pcm -i $(TARGET_SAMPLES)/aac/latm_stereo_to_51.ts -channel_layout 5.1 fate-aac-latm_stereo_to_51: REF = $(SAMPLES)/aac/latm_stereo_to_51_ref.s16 FATE_AAC-$(call DEMDEC, AAC, AAC) += $(FATE_AAC_CT_RAW) diff --git a/ffmpeg/tests/fate/ac3.mak b/ffmpeg/tests/fate/ac3.mak index 90dfc41..f386499 100644 --- a/ffmpeg/tests/fate/ac3.mak +++ b/ffmpeg/tests/fate/ac3.mak @@ -1,45 +1,45 @@ FATE_AC3 += fate-ac3-2.0 -fate-ac3-2.0: CMD = pcm -i $(SAMPLES)/ac3/monsters_inc_2.0_192_small.ac3 +fate-ac3-2.0: CMD = pcm -i $(TARGET_SAMPLES)/ac3/monsters_inc_2.0_192_small.ac3 fate-ac3-2.0: REF = $(SAMPLES)/ac3/monsters_inc_2.0_192_small_v2.pcm FATE_AC3 += fate-ac3-4.0 -fate-ac3-4.0: CMD = pcm -i $(SAMPLES)/ac3/millers_crossing_4.0.ac3 +fate-ac3-4.0: CMD = pcm -i $(TARGET_SAMPLES)/ac3/millers_crossing_4.0.ac3 fate-ac3-4.0: REF = $(SAMPLES)/ac3/millers_crossing_4.0_v2.pcm FATE_AC3 += fate-ac3-4.0-downmix-mono -fate-ac3-4.0-downmix-mono: CMD = pcm -request_channels 1 -i $(SAMPLES)/ac3/millers_crossing_4.0.ac3 +fate-ac3-4.0-downmix-mono: CMD = pcm -request_channels 1 -i $(TARGET_SAMPLES)/ac3/millers_crossing_4.0.ac3 fate-ac3-4.0-downmix-mono: REF = $(SAMPLES)/ac3/millers_crossing_4.0_mono_v2.pcm FATE_AC3 += fate-ac3-4.0-downmix-stereo -fate-ac3-4.0-downmix-stereo: CMD = pcm -request_channels 2 -i $(SAMPLES)/ac3/millers_crossing_4.0.ac3 +fate-ac3-4.0-downmix-stereo: CMD = pcm -request_channels 2 -i $(TARGET_SAMPLES)/ac3/millers_crossing_4.0.ac3 fate-ac3-4.0-downmix-stereo: REF = $(SAMPLES)/ac3/millers_crossing_4.0_stereo_v2.pcm FATE_AC3 += fate-ac3-5.1 -fate-ac3-5.1: CMD = pcm -i $(SAMPLES)/ac3/monsters_inc_5.1_448_small.ac3 +fate-ac3-5.1: CMD = pcm -i $(TARGET_SAMPLES)/ac3/monsters_inc_5.1_448_small.ac3 fate-ac3-5.1: REF = $(SAMPLES)/ac3/monsters_inc_5.1_448_small_v2.pcm FATE_AC3 += fate-ac3-5.1-downmix-mono -fate-ac3-5.1-downmix-mono: CMD = pcm -request_channels 1 -i $(SAMPLES)/ac3/monsters_inc_5.1_448_small.ac3 +fate-ac3-5.1-downmix-mono: CMD = pcm -request_channels 1 -i $(TARGET_SAMPLES)/ac3/monsters_inc_5.1_448_small.ac3 fate-ac3-5.1-downmix-mono: REF = $(SAMPLES)/ac3/monsters_inc_5.1_448_small_mono_v2.pcm FATE_AC3 += fate-ac3-5.1-downmix-stereo -fate-ac3-5.1-downmix-stereo: CMD = pcm -request_channels 2 -i $(SAMPLES)/ac3/monsters_inc_5.1_448_small.ac3 +fate-ac3-5.1-downmix-stereo: CMD = pcm -request_channels 2 -i $(TARGET_SAMPLES)/ac3/monsters_inc_5.1_448_small.ac3 fate-ac3-5.1-downmix-stereo: REF = $(SAMPLES)/ac3/monsters_inc_5.1_448_small_stereo_v2.pcm FATE_EAC3 += fate-eac3-1 -fate-eac3-1: CMD = pcm -i $(SAMPLES)/eac3/csi_miami_5.1_256_spx_small.eac3 +fate-eac3-1: CMD = pcm -i $(TARGET_SAMPLES)/eac3/csi_miami_5.1_256_spx_small.eac3 fate-eac3-1: REF = $(SAMPLES)/eac3/csi_miami_5.1_256_spx_small_v2.pcm FATE_EAC3 += fate-eac3-2 -fate-eac3-2: CMD = pcm -i $(SAMPLES)/eac3/csi_miami_stereo_128_spx_small.eac3 +fate-eac3-2: CMD = pcm -i $(TARGET_SAMPLES)/eac3/csi_miami_stereo_128_spx_small.eac3 fate-eac3-2: REF = $(SAMPLES)/eac3/csi_miami_stereo_128_spx_small_v2.pcm FATE_EAC3 += fate-eac3-3 -fate-eac3-3: CMD = pcm -i $(SAMPLES)/eac3/matrix2_commentary1_stereo_192_small.eac3 +fate-eac3-3: CMD = pcm -i $(TARGET_SAMPLES)/eac3/matrix2_commentary1_stereo_192_small.eac3 fate-eac3-3: REF = $(SAMPLES)/eac3/matrix2_commentary1_stereo_192_small_v2.pcm FATE_EAC3 += fate-eac3-4 -fate-eac3-4: CMD = pcm -i $(SAMPLES)/eac3/serenity_english_5.1_1536_small.eac3 +fate-eac3-4: CMD = pcm -i $(TARGET_SAMPLES)/eac3/serenity_english_5.1_1536_small.eac3 fate-eac3-4: REF = $(SAMPLES)/eac3/serenity_english_5.1_1536_small_v2.pcm $(FATE_AC3) $(FATE_EAC3): CMP = oneoff @@ -48,18 +48,17 @@ FATE_AC3-$(call DEMDEC, AC3, AC3) += $(FATE_AC3) FATE_EAC3-$(call DEMDEC, EAC3, EAC3) += $(FATE_EAC3) FATE_AC3-$(call ENCDEC, AC3, AC3) += fate-ac3-encode -fate-ac3-encode: CMD = enc_dec_pcm ac3 wav s16le $(REF) -c:a ac3 -b:a 128k +fate-ac3-encode: CMD = enc_dec_pcm ac3 wav s16le $(subst $(SAMPLES),$(TARGET_SAMPLES),$(REF)) -c:a ac3 -b:a 128k fate-ac3-encode: CMP_SHIFT = -1024 fate-ac3-encode: CMP_TARGET = 404.53 fate-ac3-encode: SIZE_TOLERANCE = 488 -fate-ac3-encode: FUZZ = 4 + FATE_EAC3-$(call ENCDEC, EAC3, EAC3) += fate-eac3-encode -fate-eac3-encode: CMD = enc_dec_pcm eac3 wav s16le $(REF) -c:a eac3 -b:a 128k +fate-eac3-encode: CMD = enc_dec_pcm eac3 wav s16le $(subst $(SAMPLES),$(TARGET_SAMPLES),$(REF)) -c:a eac3 -b:a 128k fate-eac3-encode: CMP_SHIFT = -1024 fate-eac3-encode: CMP_TARGET = 516.94 fate-eac3-encode: SIZE_TOLERANCE = 488 -fate-eac3-encode: FUZZ = 3 fate-ac3-encode fate-eac3-encode: CMP = stddev fate-ac3-encode fate-eac3-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav diff --git a/ffmpeg/tests/fate/acodec.mak b/ffmpeg/tests/fate/acodec.mak index 0206486..10d4392 100644 --- a/ffmpeg/tests/fate/acodec.mak +++ b/ffmpeg/tests/fate/acodec.mak @@ -68,6 +68,10 @@ FATE_ACODEC-$(call ENCDEC, MP2, MP2 MP3) += fate-acodec-mp2 fate-acodec-mp2: FMT = mp2 fate-acodec-mp2: CMP_SHIFT = -1924 +FATE_ACODEC-$(call ENCDEC, MP2FIXED MP2 , MP2 MP3) += fate-acodec-mp2fixed +fate-acodec-mp2fixed: FMT = mp2 +fate-acodec-mp2fixed: CMP_SHIFT = -1924 + FATE_ACODEC-$(call ENCDEC, ALAC, MOV) += fate-acodec-alac fate-acodec-alac: FMT = mov fate-acodec-alac: CODEC = alac -compression_level 1 @@ -77,15 +81,15 @@ fate-acodec-dca: tests/data/asynth-44100-2.wav fate-acodec-dca: SRC = tests/data/asynth-44100-2.wav fate-acodec-dca: CMD = md5 -i $(TARGET_PATH)/$(SRC) -c:a dca -strict -2 -f dts -flags +bitexact fate-acodec-dca: CMP = oneline -fate-acodec-dca: REF = 66bd0e602be7fb97dc19151554c0ee29 +fate-acodec-dca: REF = fe28cef432ed88de4ee01b87537fd2bd FATE_ACODEC-$(call ENCDEC, DCA, WAV) += fate-acodec-dca2 fate-acodec-dca2: CMD = enc_dec_pcm dts wav s16le $(SRC) -c:a dca -strict -2 -flags +bitexact fate-acodec-dca2: REF = $(SRC) fate-acodec-dca2: CMP = stddev -fate-acodec-dca2: CMP_SHIFT = -1920 -fate-acodec-dca2: CMP_TARGET = 2424 -fate-acodec-dca2: SIZE_TOLERANCE = 544 +fate-acodec-dca2: CMP_SHIFT = -2048 +fate-acodec-dca2: CMP_TARGET = 527 +fate-acodec-dca2: SIZE_TOLERANCE = 1632 FATE_ACODEC-$(call ENCDEC, FLAC, FLAC) += fate-acodec-flac fate-acodec-flac: FMT = flac diff --git a/ffmpeg/tests/fate/adpcm.mak b/ffmpeg/tests/fate/adpcm.mak index 71764cc..6b1dd3c 100644 --- a/ffmpeg/tests/fate/adpcm.mak +++ b/ffmpeg/tests/fate/adpcm.mak @@ -1,83 +1,89 @@ FATE_ADPCM-$(call DEMDEC, FOURXM, ADPCM_4XM) += fate-adpcm-4xm -fate-adpcm-4xm: CMD = framecrc -i $(SAMPLES)/4xm/dracula.4xm -vn -map 0:6 +fate-adpcm-4xm: CMD = framecrc -i $(TARGET_SAMPLES)/4xm/dracula.4xm -vn -map 0:6 FATE_ADPCM-$(call DEMDEC, AST, ADPCM_AFC) += fate-adpcm-afc -fate-adpcm-afc: CMD = framecrc -i $(SAMPLES)/ast/demo11_02_partial.ast +fate-adpcm-afc: CMD = framecrc -i $(TARGET_SAMPLES)/ast/demo11_02_partial.ast FATE_ADPCM-$(call DEMDEC, WAV, ADPCM_CT) += fate-adpcm-creative -fate-adpcm-creative: CMD = md5 -i $(SAMPLES)/creative/intro-partial.wav -f s16le +fate-adpcm-creative: CMD = md5 -i $(TARGET_SAMPLES)/creative/intro-partial.wav -f s16le FATE_ADPCM-$(call DEMDEC, VOC, ADPCM_SBPRO_2) += fate-adpcm-creative-8-2bit -fate-adpcm-creative-8-2bit: CMD = md5 -i $(SAMPLES)/creative/BBC_2BIT.VOC -f s16le +fate-adpcm-creative-8-2bit: CMD = md5 -i $(TARGET_SAMPLES)/creative/BBC_2BIT.VOC -f s16le FATE_ADPCM-$(call DEMDEC, VOC, ADPCM_SBPRO_3) += fate-adpcm-creative-8-2.6bit -fate-adpcm-creative-8-2.6bit: CMD = md5 -i $(SAMPLES)/creative/BBC_3BIT.VOC -f s16le +fate-adpcm-creative-8-2.6bit: CMD = md5 -i $(TARGET_SAMPLES)/creative/BBC_3BIT.VOC -f s16le FATE_ADPCM-$(call DEMDEC, VOC, ADPCM_SBPRO_4) += fate-adpcm-creative-8-4bit -fate-adpcm-creative-8-4bit: CMD = md5 -i $(SAMPLES)/creative/BBC_4BIT.VOC -f s16le +fate-adpcm-creative-8-4bit: CMD = md5 -i $(TARGET_SAMPLES)/creative/BBC_4BIT.VOC -f s16le + +FATE_ADPCM-$(call DEMDEC, ADP, ADPCM_DTK) += fate-adpcm-dtk +fate-adpcm-dtk: CMD = framecrc -i $(TARGET_SAMPLES)/adp/shakespr_partial.adp -f s16le FATE_ADPCM-$(call DEMDEC, EA, ADPCM_EA) += fate-adpcm-ea-1 -fate-adpcm-ea-1: CMD = framecrc -i $(SAMPLES)/ea-wve/networkBackbone-partial.wve -frames:a 26 -vn +fate-adpcm-ea-1: CMD = framecrc -i $(TARGET_SAMPLES)/ea-wve/networkBackbone-partial.wve -frames:a 26 -vn FATE_ADPCM-$(call DEMDEC, EA, ADPCM_EA) += fate-adpcm-ea-2 -fate-adpcm-ea-2: CMD = framecrc -i $(SAMPLES)/ea-dct/NFS2Esprit-partial.dct -vn +fate-adpcm-ea-2: CMD = framecrc -i $(TARGET_SAMPLES)/ea-dct/NFS2Esprit-partial.dct -vn FATE_ADPCM-$(call DEMDEC, XA, ADPCM_EA_MAXIS_XA) += fate-adpcm-ea-maxis-xa -fate-adpcm-ea-maxis-xa: CMD = framecrc -i $(SAMPLES)/maxis-xa/SC2KBUG.XA -frames:a 30 +fate-adpcm-ea-maxis-xa: CMD = framecrc -i $(TARGET_SAMPLES)/maxis-xa/SC2KBUG.XA -frames:a 30 FATE_ADPCM-$(call DEMDEC, EA, ADPCM_EA_R1) += fate-adpcm-ea-r1 -fate-adpcm-ea-r1: CMD = framecrc -i $(SAMPLES)/ea-mad/NFS6LogoE.mad -vn +fate-adpcm-ea-r1: CMD = framecrc -i $(TARGET_SAMPLES)/ea-mad/NFS6LogoE.mad -vn FATE_ADPCM-$(call DEMDEC, EA, ADPCM_EA_R2) += fate-adpcm-ea-r2 -fate-adpcm-ea-r2: CMD = crc -i $(SAMPLES)/ea-mpc/THX_logo.mpc -vn +fate-adpcm-ea-r2: CMD = crc -i $(TARGET_SAMPLES)/ea-mpc/THX_logo.mpc -vn FATE_ADPCM-$(call DEMDEC, EA, ADPCM_EA_R3) += fate-adpcm-ea-r3 -fate-adpcm-ea-r3: CMD = crc -i $(SAMPLES)/ea-vp6/THX_logo.vp6 -vn +fate-adpcm-ea-r3: CMD = crc -i $(TARGET_SAMPLES)/ea-vp6/THX_logo.vp6 -vn FATE_ADPCM-$(call DEMDEC, AVI, ADPCM_IMA_AMV) += fate-adpcm-ima-amv -fate-adpcm-ima-amv: CMD = framecrc -i $(SAMPLES)/amv/MTV_high_res_320x240_sample_Penguin_Joke_MTV_from_WMV.amv -t 10 -vn +fate-adpcm-ima-amv: CMD = framecrc -i $(TARGET_SAMPLES)/amv/MTV_high_res_320x240_sample_Penguin_Joke_MTV_from_WMV.amv -t 10 -vn FATE_ADPCM-$(call DEMDEC, APC, ADPCM_IMA_APC) += fate-adpcm-ima-apc -fate-adpcm-ima-apc: CMD = md5 -i $(SAMPLES)/cryo-apc/cine007.APC -f s16le +fate-adpcm-ima-apc: CMD = md5 -i $(TARGET_SAMPLES)/cryo-apc/cine007.APC -f s16le FATE_ADPCM-$(call DEMDEC, AVI, ADPCM_IMA_DK3) += fate-adpcm-ima-dk3 -fate-adpcm-ima-dk3: CMD = md5 -i $(SAMPLES)/duck/sop-audio-only.avi -f s16le +fate-adpcm-ima-dk3: CMD = md5 -i $(TARGET_SAMPLES)/duck/sop-audio-only.avi -f s16le FATE_ADPCM-$(call DEMDEC, AVI, ADPCM_IMA_DK4) += fate-adpcm-ima-dk4 -fate-adpcm-ima-dk4: CMD = md5 -i $(SAMPLES)/duck/salsa-audio-only.avi -f s16le +fate-adpcm-ima-dk4: CMD = md5 -i $(TARGET_SAMPLES)/duck/salsa-audio-only.avi -f s16le FATE_ADPCM-$(call DEMDEC, EA, ADPCM_IMA_EA_EACS) += fate-adpcm-ima-ea-eacs -fate-adpcm-ima-ea-eacs: CMD = framecrc -i $(SAMPLES)/ea-tgv/INTRO8K-partial.TGV -vn +fate-adpcm-ima-ea-eacs: CMD = framecrc -i $(TARGET_SAMPLES)/ea-tgv/INTRO8K-partial.TGV -vn FATE_ADPCM-$(call DEMDEC, EA, ADPCM_IMA_EA_SEAD) += fate-adpcm-ima-ea-sead -fate-adpcm-ima-ea-sead: CMD = framecrc -i $(SAMPLES)/ea-tgv/INTEL_S.TGV -vn +fate-adpcm-ima-ea-sead: CMD = framecrc -i $(TARGET_SAMPLES)/ea-tgv/INTEL_S.TGV -vn FATE_ADPCM-$(call DEMDEC, ISS, ADPCM_IMA_ISS) += fate-adpcm-ima-iss -fate-adpcm-ima-iss: CMD = md5 -i $(SAMPLES)/funcom-iss/0004010100.iss -f s16le +fate-adpcm-ima-iss: CMD = md5 -i $(TARGET_SAMPLES)/funcom-iss/0004010100.iss -f s16le FATE_ADPCM-$(call DEMDEC, WAV, ADPCM_IMA_OKI) += fate-adpcm-ima-oki -fate-adpcm-ima-oki: CMD = md5 -i $(SAMPLES)/oki/test.wav -f s16le +fate-adpcm-ima-oki: CMD = md5 -i $(TARGET_SAMPLES)/oki/test.wav -f s16le + +FATE_ADPCM-$(call DEMDEC, RSD, ADPCM_IMA_RAD) += fate-adpcm-ima-rad +fate-adpcm-ima-rad: CMD = md5 -i $(TARGET_SAMPLES)/rsd/hit_run_partial.rsd -f s16le FATE_ADPCM-$(call DEMDEC, SMJPEG, ADPCM_IMA_SMJPEG) += fate-adpcm-ima-smjpeg -fate-adpcm-ima-smjpeg: CMD = framecrc -i $(SAMPLES)/smjpeg/scenwin.mjpg -vn +fate-adpcm-ima-smjpeg: CMD = framecrc -i $(TARGET_SAMPLES)/smjpeg/scenwin.mjpg -vn FATE_ADPCM-$(call DEMDEC, MOV, ADPCM_IMA_WAV) += fate-adpcm-ima_wav-stereo -fate-adpcm-ima_wav-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-L-ms11.mov -f s16le +fate-adpcm-ima_wav-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-L-ms11.mov -f s16le FATE_ADPCM-$(call DEMDEC, WSVQA, ADPCM_IMA_WS) += fate-adpcm-ima-ws -fate-adpcm-ima-ws: CMD = framecrc -i $(SAMPLES)/vqa/cc-demo1-partial.vqa -vn +fate-adpcm-ima-ws: CMD = framecrc -i $(TARGET_SAMPLES)/vqa/cc-demo1-partial.vqa -vn FATE_ADPCM-$(call DEMDEC, DXA, ADPCM_MS) += fate-adpcm-ms-mono -fate-adpcm-ms-mono: CMD = framecrc -i $(SAMPLES)/dxa/meetsquid.dxa -t 2 -vn +fate-adpcm-ms-mono: CMD = framecrc -i $(TARGET_SAMPLES)/dxa/meetsquid.dxa -t 2 -vn FATE_ADPCM-$(call DEMDEC, MOV, ADPCM_MS) += fate-adpcm_ms-stereo -fate-adpcm_ms-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-L-ms02.mov -f s16le +fate-adpcm_ms-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-L-ms02.mov -f s16le FATE_ADPCM-$(call DEMDEC, THP, ADPCM_THP) += fate-adpcm-thp -fate-adpcm-thp: CMD = framecrc -i $(SAMPLES)/thp/pikmin2-opening1-partial.thp -vn +fate-adpcm-thp: CMD = framecrc -i $(TARGET_SAMPLES)/thp/pikmin2-opening1-partial.thp -vn FATE_ADPCM-$(call DEMDEC, STR, ADPCM_XA) += fate-adpcm-xa -fate-adpcm-xa: CMD = framecrc -i $(SAMPLES)/psx-str/abc000_cut.str -vn +fate-adpcm-xa: CMD = framecrc -i $(TARGET_SAMPLES)/psx-str/abc000_cut.str -vn FATE_SAMPLES_AVCONV += $(FATE_ADPCM-yes) fate-adpcm: $(FATE_ADPCM-yes) diff --git a/ffmpeg/tests/fate/alac.mak b/ffmpeg/tests/fate/alac.mak index d724837..5e29e90 100644 --- a/ffmpeg/tests/fate/alac.mak +++ b/ffmpeg/tests/fate/alac.mak @@ -12,10 +12,10 @@ fate-alac-24-level-%: OPTS = -compression_level $(@:fate-alac-24-level-%=%) fate-alac-%-lpc-orders: OPTS = -min_prediction_order 1 -max_prediction_order 30 fate-alac-16-%: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav -fate-alac-16-%: CMD = enc_dec_pcm mov wav s16le $(REF) -c alac $(OPTS) +fate-alac-16-%: CMD = enc_dec_pcm mov wav s16le $(subst $(SAMPLES),$(TARGET_SAMPLES),$(REF)) -c alac $(OPTS) fate-alac-24-%: REF = $(SAMPLES)/audio-reference/divertimenti_2ch_96kHz_s24.wav -fate-alac-24-%: CMD = enc_dec_pcm mov wav s24le $(REF) -c alac $(OPTS) +fate-alac-24-%: CMD = enc_dec_pcm mov wav s24le $(subst $(SAMPLES),$(TARGET_SAMPLES),$(REF)) -c alac $(OPTS) fate-alac-%: CMP = oneoff fate-alac-%: FUZZ = 0 diff --git a/ffmpeg/tests/fate/als.mak b/ffmpeg/tests/fate/als.mak index 5ec1189..ff2badf 100644 --- a/ffmpeg/tests/fate/als.mak +++ b/ffmpeg/tests/fate/als.mak @@ -2,7 +2,7 @@ ALS_SUITE = 00 01 02 03 04 05 define FATE_ALS_SUITE FATE_ALS += fate-mpeg4-als-conformance-$(1) -fate-mpeg4-als-conformance-$(1): CMD = crc -i $(SAMPLES)/lossless-audio/als_$(1)_2ch48k16b.mp4 +fate-mpeg4-als-conformance-$(1): CMD = crc -i $(TARGET_SAMPLES)/lossless-audio/als_$(1)_2ch48k16b.mp4 endef $(foreach N,$(ALS_SUITE),$(eval $(call FATE_ALS_SUITE,$(N)))) diff --git a/ffmpeg/tests/fate/amrnb.mak b/ffmpeg/tests/fate/amrnb.mak index 6dbba58..c0feec2 100644 --- a/ffmpeg/tests/fate/amrnb.mak +++ b/ffmpeg/tests/fate/amrnb.mak @@ -1,33 +1,33 @@ FATE_AMRNB += fate-amrnb-4k75 -fate-amrnb-4k75: CMD = pcm -i $(SAMPLES)/amrnb/4.75k.amr +fate-amrnb-4k75: CMD = pcm -i $(TARGET_SAMPLES)/amrnb/4.75k.amr fate-amrnb-4k75: REF = $(SAMPLES)/amrnb/4.75k.pcm FATE_AMRNB += fate-amrnb-5k15 -fate-amrnb-5k15: CMD = pcm -i $(SAMPLES)/amrnb/5.15k.amr +fate-amrnb-5k15: CMD = pcm -i $(TARGET_SAMPLES)/amrnb/5.15k.amr fate-amrnb-5k15: REF = $(SAMPLES)/amrnb/5.15k.pcm FATE_AMRNB += fate-amrnb-5k9 -fate-amrnb-5k9: CMD = pcm -i $(SAMPLES)/amrnb/5.9k.amr +fate-amrnb-5k9: CMD = pcm -i $(TARGET_SAMPLES)/amrnb/5.9k.amr fate-amrnb-5k9: REF = $(SAMPLES)/amrnb/5.9k.pcm FATE_AMRNB += fate-amrnb-6k7 -fate-amrnb-6k7: CMD = pcm -i $(SAMPLES)/amrnb/6.7k.amr +fate-amrnb-6k7: CMD = pcm -i $(TARGET_SAMPLES)/amrnb/6.7k.amr fate-amrnb-6k7: REF = $(SAMPLES)/amrnb/6.7k.pcm FATE_AMRNB += fate-amrnb-7k4 -fate-amrnb-7k4: CMD = pcm -i $(SAMPLES)/amrnb/7.4k.amr +fate-amrnb-7k4: CMD = pcm -i $(TARGET_SAMPLES)/amrnb/7.4k.amr fate-amrnb-7k4: REF = $(SAMPLES)/amrnb/7.4k.pcm FATE_AMRNB += fate-amrnb-7k95 -fate-amrnb-7k95: CMD = pcm -i $(SAMPLES)/amrnb/7.95k.amr +fate-amrnb-7k95: CMD = pcm -i $(TARGET_SAMPLES)/amrnb/7.95k.amr fate-amrnb-7k95: REF = $(SAMPLES)/amrnb/7.95k.pcm FATE_AMRNB += fate-amrnb-10k2 -fate-amrnb-10k2: CMD = pcm -i $(SAMPLES)/amrnb/10.2k.amr +fate-amrnb-10k2: CMD = pcm -i $(TARGET_SAMPLES)/amrnb/10.2k.amr fate-amrnb-10k2: REF = $(SAMPLES)/amrnb/10.2k.pcm FATE_AMRNB += fate-amrnb-12k2 -fate-amrnb-12k2: CMD = pcm -i $(SAMPLES)/amrnb/12.2k.amr +fate-amrnb-12k2: CMD = pcm -i $(TARGET_SAMPLES)/amrnb/12.2k.amr fate-amrnb-12k2: REF = $(SAMPLES)/amrnb/12.2k.pcm $(FATE_AMRNB): CMP = stddev diff --git a/ffmpeg/tests/fate/amrwb.mak b/ffmpeg/tests/fate/amrwb.mak index 99c2737..b93835d 100644 --- a/ffmpeg/tests/fate/amrwb.mak +++ b/ffmpeg/tests/fate/amrwb.mak @@ -1,44 +1,44 @@ FATE_AMRWB += fate-amrwb-6k60 -fate-amrwb-6k60: CMD = pcm -i $(SAMPLES)/amrwb/seed-6k60.awb +fate-amrwb-6k60: CMD = pcm -i $(TARGET_SAMPLES)/amrwb/seed-6k60.awb fate-amrwb-6k60: REF = $(SAMPLES)/amrwb/seed-6k60.pcm FATE_AMRWB += fate-amrwb-8k85 -fate-amrwb-8k85: CMD = pcm -i $(SAMPLES)/amrwb/seed-8k85.awb +fate-amrwb-8k85: CMD = pcm -i $(TARGET_SAMPLES)/amrwb/seed-8k85.awb fate-amrwb-8k85: REF = $(SAMPLES)/amrwb/seed-8k85.pcm FATE_AMRWB += fate-amrwb-12k65 -fate-amrwb-12k65: CMD = pcm -i $(SAMPLES)/amrwb/seed-12k65.awb +fate-amrwb-12k65: CMD = pcm -i $(TARGET_SAMPLES)/amrwb/seed-12k65.awb fate-amrwb-12k65: REF = $(SAMPLES)/amrwb/seed-12k65.pcm FATE_AMRWB += fate-amrwb-14k25 -fate-amrwb-14k25: CMD = pcm -i $(SAMPLES)/amrwb/seed-14k25.awb +fate-amrwb-14k25: CMD = pcm -i $(TARGET_SAMPLES)/amrwb/seed-14k25.awb fate-amrwb-14k25: REF = $(SAMPLES)/amrwb/seed-14k25.pcm fate-amrwb-14k25: FUZZ = 2.6 FATE_AMRWB += fate-amrwb-15k85 -fate-amrwb-15k85: CMD = pcm -i $(SAMPLES)/amrwb/seed-15k85.awb +fate-amrwb-15k85: CMD = pcm -i $(TARGET_SAMPLES)/amrwb/seed-15k85.awb fate-amrwb-15k85: REF = $(SAMPLES)/amrwb/seed-15k85.pcm FATE_AMRWB += fate-amrwb-18k25 -fate-amrwb-18k25: CMD = pcm -i $(SAMPLES)/amrwb/seed-18k25.awb +fate-amrwb-18k25: CMD = pcm -i $(TARGET_SAMPLES)/amrwb/seed-18k25.awb fate-amrwb-18k25: REF = $(SAMPLES)/amrwb/seed-18k25.pcm FATE_AMRWB += fate-amrwb-19k85 -fate-amrwb-19k85: CMD = pcm -i $(SAMPLES)/amrwb/seed-19k85.awb +fate-amrwb-19k85: CMD = pcm -i $(TARGET_SAMPLES)/amrwb/seed-19k85.awb fate-amrwb-19k85: REF = $(SAMPLES)/amrwb/seed-19k85.pcm FATE_AMRWB += fate-amrwb-23k05 -fate-amrwb-23k05: CMD = pcm -i $(SAMPLES)/amrwb/seed-23k05.awb +fate-amrwb-23k05: CMD = pcm -i $(TARGET_SAMPLES)/amrwb/seed-23k05.awb fate-amrwb-23k05: REF = $(SAMPLES)/amrwb/seed-23k05.pcm fate-amrwb-23k05: FUZZ = 2 FATE_AMRWB += fate-amrwb-23k85 -fate-amrwb-23k85: CMD = pcm -i $(SAMPLES)/amrwb/seed-23k85.awb +fate-amrwb-23k85: CMD = pcm -i $(TARGET_SAMPLES)/amrwb/seed-23k85.awb fate-amrwb-23k85: REF = $(SAMPLES)/amrwb/seed-23k85.pcm fate-amrwb-23k85: FUZZ = 2 FATE_AMRWB += fate-amrwb-23k85-2 -fate-amrwb-23k85-2: CMD = pcm -i $(SAMPLES)/amrwb/deus-23k85.awb +fate-amrwb-23k85-2: CMD = pcm -i $(TARGET_SAMPLES)/amrwb/deus-23k85.awb fate-amrwb-23k85-2: REF = $(SAMPLES)/amrwb/deus-23k85.pcm $(FATE_AMRWB): CMP = stddev diff --git a/ffmpeg/tests/fate/atrac.mak b/ffmpeg/tests/fate/atrac.mak index 3ac5553..94dbe38 100644 --- a/ffmpeg/tests/fate/atrac.mak +++ b/ffmpeg/tests/fate/atrac.mak @@ -1,17 +1,17 @@ FATE_ATRAC1-$(call DEMDEC, AEA, ATRAC1) += fate-atrac1 -fate-atrac1: CMD = pcm -i $(SAMPLES)/atrac1/test_tones_small.aea +fate-atrac1: CMD = pcm -i $(TARGET_SAMPLES)/atrac1/test_tones_small.aea fate-atrac1: REF = $(SAMPLES)/atrac1/test_tones_small.pcm FATE_ATRAC3 += fate-atrac3-1 -fate-atrac3-1: CMD = pcm -i $(SAMPLES)/atrac3/mc_sich_at3_066_small.wav +fate-atrac3-1: CMD = pcm -i $(TARGET_SAMPLES)/atrac3/mc_sich_at3_066_small.wav fate-atrac3-1: REF = $(SAMPLES)/atrac3/mc_sich_at3_066_small.pcm FATE_ATRAC3 += fate-atrac3-2 -fate-atrac3-2: CMD = pcm -i $(SAMPLES)/atrac3/mc_sich_at3_105_small.wav +fate-atrac3-2: CMD = pcm -i $(TARGET_SAMPLES)/atrac3/mc_sich_at3_105_small.wav fate-atrac3-2: REF = $(SAMPLES)/atrac3/mc_sich_at3_105_small.pcm FATE_ATRAC3 += fate-atrac3-3 -fate-atrac3-3: CMD = pcm -i $(SAMPLES)/atrac3/mc_sich_at3_132_small.wav +fate-atrac3-3: CMD = pcm -i $(TARGET_SAMPLES)/atrac3/mc_sich_at3_132_small.wav fate-atrac3-3: REF = $(SAMPLES)/atrac3/mc_sich_at3_132_small.pcm FATE_ATRAC3-$(call DEMDEC, WAV, ATRAC3) += $(FATE_ATRAC3) diff --git a/ffmpeg/tests/fate/audio.mak b/ffmpeg/tests/fate/audio.mak index 65bb146..6b5d1a9 100644 --- a/ffmpeg/tests/fate/audio.mak +++ b/ffmpeg/tests/fate/audio.mak @@ -1,10 +1,10 @@ FATE_BINKAUDIO-$(call DEMDEC, BINK, BINKAUDIO_DCT) += fate-binkaudio-dct -fate-binkaudio-dct: CMD = pcm -i $(SAMPLES)/bink/binkaudio_dct.bik +fate-binkaudio-dct: CMD = pcm -i $(TARGET_SAMPLES)/bink/binkaudio_dct.bik fate-binkaudio-dct: REF = $(SAMPLES)/bink/binkaudio_dct.pcm fate-binkaudio-dct: FUZZ = 2 FATE_BINKAUDIO-$(call DEMDEC, BINK, BINKAUDIO_RDFT) += fate-binkaudio-rdft -fate-binkaudio-rdft: CMD = pcm -i $(SAMPLES)/bink/binkaudio_rdft.bik +fate-binkaudio-rdft: CMD = pcm -i $(TARGET_SAMPLES)/bink/binkaudio_rdft.bik fate-binkaudio-rdft: REF = $(SAMPLES)/bink/binkaudio_rdft.pcm fate-binkaudio-rdft: FUZZ = 2 @@ -14,23 +14,23 @@ FATE_SAMPLES_AUDIO += $(FATE_BINKAUDIO-yes) fate-binkaudio: $(FATE_BINKAUDIO-yes) FATE_SAMPLES_AUDIO-$(call DEMDEC, BMV, BMV_AUDIO) += fate-bmv-audio -fate-bmv-audio: CMD = framecrc -i $(SAMPLES)/bmv/SURFING-partial.BMV -vn +fate-bmv-audio: CMD = framecrc -i $(TARGET_SAMPLES)/bmv/SURFING-partial.BMV -vn FATE_SAMPLES_AUDIO-$(call DEMDEC, DSICIN, DSICINAUDIO) += fate-delphine-cin-audio -fate-delphine-cin-audio: CMD = framecrc -i $(SAMPLES)/delphine-cin/LOGO-partial.CIN -vn +fate-delphine-cin-audio: CMD = framecrc -i $(TARGET_SAMPLES)/delphine-cin/LOGO-partial.CIN -vn FATE_SAMPLES_AUDIO-$(call DEMDEC, MPEGTS, DCA) += fate-dts -fate-dts: CMD = pcm -i $(SAMPLES)/dts/dts.ts +fate-dts: CMD = pcm -i $(TARGET_SAMPLES)/dts/dts.ts fate-dts: CMP = oneoff fate-dts: REF = $(SAMPLES)/dts/dts.pcm FATE_SAMPLES_AUDIO-$(call DEMDEC, AVI, IMC) += fate-imc -fate-imc: CMD = pcm -i $(SAMPLES)/imc/imc.avi +fate-imc: CMD = pcm -i $(TARGET_SAMPLES)/imc/imc.avi fate-imc: CMP = oneoff fate-imc: REF = $(SAMPLES)/imc/imc.pcm FATE_SAMPLES_AUDIO-$(call DEMDEC, FLV, NELLYMOSER) += fate-nellymoser -fate-nellymoser: CMD = pcm -i $(SAMPLES)/nellymoser/nellymoser.flv +fate-nellymoser: CMD = pcm -i $(TARGET_SAMPLES)/nellymoser/nellymoser.flv fate-nellymoser: CMP = oneoff fate-nellymoser: REF = $(SAMPLES)/nellymoser/nellymoser.pcm @@ -44,19 +44,19 @@ fate-nellymoser-aref-encode: CMP_TARGET = 9612 fate-nellymoser-aref-encode: SIZE_TOLERANCE = 268 FATE_SAMPLES_AUDIO-$(call DEMDEC, PAF, PAF_AUDIO) += fate-paf-audio -fate-paf-audio: CMD = framecrc -i $(SAMPLES)/paf/hod1-partial.paf -vn +fate-paf-audio: CMD = framecrc -i $(TARGET_SAMPLES)/paf/hod1-partial.paf -vn FATE_SAMPLES_AUDIO-$(call DEMDEC, VMD, VMDAUDIO) += fate-sierra-vmd-audio -fate-sierra-vmd-audio: CMD = framecrc -i $(SAMPLES)/vmd/12.vmd -vn +fate-sierra-vmd-audio: CMD = framecrc -i $(TARGET_SAMPLES)/vmd/12.vmd -vn FATE_SAMPLES_AUDIO-$(call DEMDEC, SMACKER, SMACKAUD) += fate-smacker-audio -fate-smacker-audio: CMD = framecrc -i $(SAMPLES)/smacker/wetlogo.smk -vn +fate-smacker-audio: CMD = framecrc -i $(TARGET_SAMPLES)/smacker/wetlogo.smk -vn FATE_SAMPLES_AUDIO-$(call DEMDEC, SMUSH, VIMA) += fate-vima -fate-vima: CMD = framecrc -i $(SAMPLES)/smush/ronin_part.znm -vn +fate-vima: CMD = framecrc -i $(TARGET_SAMPLES)/smush/ronin_part.znm -vn FATE_SAMPLES_AUDIO-$(call DEMDEC, WSVQA, WS_SND1) += fate-ws_snd -fate-ws_snd: CMD = md5 -i $(SAMPLES)/vqa/ws_snd.vqa -f s16le +fate-ws_snd: CMD = md5 -i $(TARGET_SAMPLES)/vqa/ws_snd.vqa -f s16le FATE_SAMPLES_AUDIO += $(FATE_SAMPLES_AUDIO-yes) diff --git a/ffmpeg/tests/fate/avfilter.mak b/ffmpeg/tests/fate/avfilter.mak deleted file mode 100644 index d68757d..0000000 --- a/ffmpeg/tests/fate/avfilter.mak +++ /dev/null @@ -1,66 +0,0 @@ -FATE_LAVFI = fate-lavfi-alphaextract_rgb \ - fate-lavfi-alphaextract_yuv \ - fate-lavfi-alphamerge_rgb \ - fate-lavfi-alphamerge_yuv \ - fate-lavfi-crop \ - fate-lavfi-crop_scale \ - fate-lavfi-crop_scale_vflip \ - fate-lavfi-crop_vflip \ - fate-lavfi-drawbox \ - fate-lavfi-edgedetect \ - fate-lavfi-fade \ - fate-lavfi-field \ - fate-lavfi-idet \ - fate-lavfi-il \ - fate-lavfi-null \ - fate-lavfi-overlay_rgb \ - fate-lavfi-overlay_yuv420 \ - fate-lavfi-overlay_yuv444 \ - fate-lavfi-pad \ - fate-lavfi-pixfmts_copy \ - fate-lavfi-pixfmts_crop \ - fate-lavfi-pixfmts_hflip \ - fate-lavfi-pixfmts_null \ - fate-lavfi-pixfmts_pad \ - fate-lavfi-pixfmts_pixdesctest \ - fate-lavfi-pixfmts_scale \ - fate-lavfi-pixfmts_vflip \ - fate-lavfi-scale200 \ - fate-lavfi-scale500 \ - fate-lavfi-select \ - fate-lavfi-setdar \ - fate-lavfi-setsar \ - fate-lavfi-thumbnail \ - fate-lavfi-tile \ - fate-lavfi-transpose \ - fate-lavfi-unsharp \ - fate-lavfi-vflip \ - fate-lavfi-vflip_crop \ - fate-lavfi-vflip_vflip \ - -FATE_LAVFI-$(CONFIG_AVDEVICE) += fate-lavfi-life \ - fate-lavfi-scalenorm \ - fate-lavfi-testsrc \ - -FATE_LAVFI-$(CONFIG_GPL) += fate-lavfi-colormatrix1 \ - fate-lavfi-colormatrix2 \ - fate-lavfi-hue \ - fate-lavfi-kerndeint \ - fate-lavfi-pixfmts_super2xsai \ - fate-lavfi-pp \ - fate-lavfi-pp2 \ - fate-lavfi-pp3 \ - fate-lavfi-pp4 \ - fate-lavfi-pp5 \ - fate-lavfi-pp6 \ - fate-lavfi-tinterlace_merge \ - fate-lavfi-tinterlace_pad \ - -FATE_LAVFI += $(FATE_LAVFI-yes) - -$(FATE_LAVFI): $(VREF) libavfilter/filtfmts-test$(EXESUF) -$(FATE_LAVFI): CMD = lavfitest - -FATE_AVCONV += $(FATE_LAVFI) -fate-lavfi: $(FATE_LAVFI) - diff --git a/ffmpeg/tests/fate/bmp.mak b/ffmpeg/tests/fate/bmp.mak index 9e52ac0..923c70d 100644 --- a/ffmpeg/tests/fate/bmp.mak +++ b/ffmpeg/tests/fate/bmp.mak @@ -1,41 +1,41 @@ FATE_BMP += fate-bmp-1bit -fate-bmp-1bit: CMD = framecrc -i $(SAMPLES)/bmp/test1.bmp -pix_fmt rgb24 +fate-bmp-1bit: CMD = framecrc -i $(TARGET_SAMPLES)/bmp/test1.bmp -pix_fmt rgb24 FATE_BMP += fate-bmp-4bit -fate-bmp-4bit: CMD = framecrc -i $(SAMPLES)/bmp/test4.bmp -pix_fmt rgb24 +fate-bmp-4bit: CMD = framecrc -i $(TARGET_SAMPLES)/bmp/test4.bmp -pix_fmt rgb24 FATE_BMP += fate-bmp-4bit-os2 -fate-bmp-4bit-os2: CMD = framecrc -i $(SAMPLES)/bmp/test4os2v2.bmp -pix_fmt rgb24 +fate-bmp-4bit-os2: CMD = framecrc -i $(TARGET_SAMPLES)/bmp/test4os2v2.bmp -pix_fmt rgb24 FATE_BMP += fate-bmp-8bit -fate-bmp-8bit: CMD = framecrc -i $(SAMPLES)/bmp/test8.bmp -pix_fmt rgb24 +fate-bmp-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/bmp/test8.bmp -pix_fmt rgb24 FATE_BMP += fate-bmp-8bit-os2 -fate-bmp-8bit-os2: CMD = framecrc -i $(SAMPLES)/bmp/test8os2.bmp -pix_fmt rgb24 +fate-bmp-8bit-os2: CMD = framecrc -i $(TARGET_SAMPLES)/bmp/test8os2.bmp -pix_fmt rgb24 FATE_BMP += fate-bmp-15bit -fate-bmp-15bit: CMD = framecrc -i $(SAMPLES)/bmp/test16.bmp -pix_fmt rgb555le +fate-bmp-15bit: CMD = framecrc -i $(TARGET_SAMPLES)/bmp/test16.bmp -pix_fmt rgb555le FATE_BMP += fate-bmp-15bit-mask -fate-bmp-15bit-mask: CMD = framecrc -i $(SAMPLES)/bmp/test16bf555.bmp -pix_fmt rgb555le +fate-bmp-15bit-mask: CMD = framecrc -i $(TARGET_SAMPLES)/bmp/test16bf555.bmp -pix_fmt rgb555le FATE_BMP += fate-bmp-16bit-mask -fate-bmp-16bit-mask: CMD = framecrc -i $(SAMPLES)/bmp/test16bf565.bmp -pix_fmt rgb565le +fate-bmp-16bit-mask: CMD = framecrc -i $(TARGET_SAMPLES)/bmp/test16bf565.bmp -pix_fmt rgb565le FATE_BMP += fate-bmp-24bit -fate-bmp-24bit: CMD = framecrc -i $(SAMPLES)/bmp/test24.bmp +fate-bmp-24bit: CMD = framecrc -i $(TARGET_SAMPLES)/bmp/test24.bmp FATE_BMP += fate-bmp-32bit -fate-bmp-32bit: CMD = framecrc -i $(SAMPLES)/bmp/test32.bmp -pix_fmt bgr24 +fate-bmp-32bit: CMD = framecrc -i $(TARGET_SAMPLES)/bmp/test32.bmp -pix_fmt bgr24 FATE_BMP += fate-bmp-32bit-mask -fate-bmp-32bit-mask: CMD = framecrc -i $(SAMPLES)/bmp/test32bf.bmp -pix_fmt bgr24 +fate-bmp-32bit-mask: CMD = framecrc -i $(TARGET_SAMPLES)/bmp/test32bf.bmp -pix_fmt bgr24 FATE_BMP += fate-bmp-rle4 -fate-bmp-rle4: CMD = framecrc -i $(SAMPLES)/bmp/testcompress4.bmp -pix_fmt rgb24 +fate-bmp-rle4: CMD = framecrc -i $(TARGET_SAMPLES)/bmp/testcompress4.bmp -pix_fmt rgb24 FATE_BMP += fate-bmp-rle8 -fate-bmp-rle8: CMD = framecrc -i $(SAMPLES)/bmp/testcompress8.bmp -pix_fmt rgb24 +fate-bmp-rle8: CMD = framecrc -i $(TARGET_SAMPLES)/bmp/testcompress8.bmp -pix_fmt rgb24 FATE_BMP-$(call DEMDEC, IMAGE2, BMP) += $(FATE_BMP) diff --git a/ffmpeg/tests/fate/cdxl.mak b/ffmpeg/tests/fate/cdxl.mak index 11ff902..8144f96 100644 --- a/ffmpeg/tests/fate/cdxl.mak +++ b/ffmpeg/tests/fate/cdxl.mak @@ -1,17 +1,17 @@ FATE_CDXL += fate-cdxl-bitline-ham6 -fate-cdxl-bitline-ham6: CMD = framecrc -i $(SAMPLES)/cdxl/bitline.cdxl -frames:v 10 +fate-cdxl-bitline-ham6: CMD = framecrc -i $(TARGET_SAMPLES)/cdxl/bitline.cdxl -frames:v 10 FATE_CDXL += fate-cdxl-ham6 -fate-cdxl-ham6: CMD = framecrc -i $(SAMPLES)/cdxl/cat.cdxl -an -frames:v 16 +fate-cdxl-ham6: CMD = framecrc -i $(TARGET_SAMPLES)/cdxl/cat.cdxl -an -frames:v 16 FATE_CDXL += fate-cdxl-ham8 -fate-cdxl-ham8: CMD = framecrc -i $(SAMPLES)/cdxl/mirage.cdxl -an -frames:v 1 +fate-cdxl-ham8: CMD = framecrc -i $(TARGET_SAMPLES)/cdxl/mirage.cdxl -an -frames:v 1 FATE_CDXL += fate-cdxl-pal8 -fate-cdxl-pal8: CMD = framecrc -i $(SAMPLES)/cdxl/maku.cdxl -pix_fmt rgb24 -frames:v 11 +fate-cdxl-pal8: CMD = framecrc -i $(TARGET_SAMPLES)/cdxl/maku.cdxl -pix_fmt rgb24 -frames:v 11 FATE_CDXL += fate-cdxl-pal8-small -fate-cdxl-pal8-small: CMD = framecrc -i $(SAMPLES)/cdxl/fruit.cdxl -an -pix_fmt rgb24 -frames:v 46 +fate-cdxl-pal8-small: CMD = framecrc -i $(TARGET_SAMPLES)/cdxl/fruit.cdxl -an -pix_fmt rgb24 -frames:v 46 FATE_CDXL-$(call DEMDEC, CDXL, CDXL) += $(FATE_CDXL) diff --git a/ffmpeg/tests/fate/cover-art.mak b/ffmpeg/tests/fate/cover-art.mak index b175c3e..721c650 100644 --- a/ffmpeg/tests/fate/cover-art.mak +++ b/ffmpeg/tests/fate/cover-art.mak @@ -1,32 +1,37 @@ FATE_COVER_ART-$(CONFIG_APE_DEMUXER) += fate-cover-art-ape -fate-cover-art-ape: CMD = md5 -i $(SAMPLES)/cover_art/luckynight_cover.ape -an -c:v copy -f rawvideo +fate-cover-art-ape: CMD = md5 -i $(TARGET_SAMPLES)/cover_art/luckynight_cover.ape -an -c:v copy -f rawvideo fate-cover-art-ape: REF = 45333c983c45af54449dff10af144317 FATE_COVER_ART-$(CONFIG_FLAC_DEMUXER) += fate-cover-art-flac -fate-cover-art-flac: CMD = md5 -i $(SAMPLES)/cover_art/cover_art.flac -an -c:v copy -f rawvideo +fate-cover-art-flac: CMD = md5 -i $(TARGET_SAMPLES)/cover_art/cover_art.flac -an -c:v copy -f rawvideo fate-cover-art-flac: REF = 0de1fc6200596fa32b8f7300a14c0261 FATE_COVER_ART-$(CONFIG_MOV_DEMUXER) += fate-cover-art-m4a -fate-cover-art-m4a: CMD = md5 -i $(SAMPLES)/cover_art/Owner-iTunes_9.0.3.15.m4a -an -c:v copy -f rawvideo +fate-cover-art-m4a: CMD = md5 -i $(TARGET_SAMPLES)/cover_art/Owner-iTunes_9.0.3.15.m4a -an -c:v copy -f rawvideo fate-cover-art-m4a: REF = 08ba70a3b594ff6345a93965e96a9d3e +FATE_COVER_ART-$(CONFIG_OGG_DEMUXER) += fate-cover-art-ogg +fate-cover-art-ogg: CMD = md5 -i $(TARGET_SAMPLES)/cover_art/ogg_vorbiscomment_cover.opus -map 0:v -c:v copy -f rawvideo +fate-cover-art-ogg: REF = 7f117e073620eabb4ed02680cf70af41 + FATE_COVER_ART-$(CONFIG_ASF_DEMUXER) += fate-cover-art-wma -fate-cover-art-wma: CMD = md5 -i $(SAMPLES)/cover_art/Californication_cover.wma -an -c:v copy -f rawvideo +fate-cover-art-wma: CMD = md5 -i $(TARGET_SAMPLES)/cover_art/Californication_cover.wma -an -c:v copy -f rawvideo fate-cover-art-wma: REF = 0808bd0e1b61542a16e1906812dd924b FATE_COVER_ART-$(CONFIG_ASF_DEMUXER) += fate-cover-art-wma-id3 -fate-cover-art-wma-id3: CMD = md5 -i $(SAMPLES)/cover_art/wma_with_ID3_APIC_trimmed.wma -an -c:v copy -f rawvideo +fate-cover-art-wma-id3: CMD = md5 -i $(TARGET_SAMPLES)/cover_art/wma_with_ID3_APIC_trimmed.wma -an -c:v copy -f rawvideo fate-cover-art-wma-id3: REF = e6a8dd03687d5178bc13fc7d3316696e FATE_COVER_ART-$(CONFIG_ASF_DEMUXER) += fate-cover-art-wma-metadatalib -fate-cover-art-wma-metadatalib: CMD = md5 -i $(SAMPLES)/cover_art/wma_with_metadata_library_object_tag_trimmed.wma -map 0:v -c:v copy -f rawvideo +fate-cover-art-wma-metadatalib: CMD = md5 -i $(TARGET_SAMPLES)/cover_art/wma_with_metadata_library_object_tag_trimmed.wma -map 0:v -c:v copy -f rawvideo fate-cover-art-wma-metadatalib: REF = 32e8bd4fad546f63d881a0256f083aea FATE_COVER_ART-$(CONFIG_WV_DEMUXER) += fate-cover-art-wv -fate-cover-art-wv: CMD = md5 -i $(SAMPLES)/cover_art/luckynight_cover.wv -an -c:v copy -f rawvideo +fate-cover-art-wv: CMD = md5 -i $(TARGET_SAMPLES)/cover_art/luckynight_cover.wv -an -c:v copy -f rawvideo fate-cover-art-wv: REF = 45333c983c45af54449dff10af144317 -FATE_COVER_ART = $(FATE_COVER_ART-yes) +FCA_TEMP-$(call ALLYES, RAWVIDEO_MUXER FILE_PROTOCOL) = $(FATE_COVER_ART-yes) +FATE_COVER_ART = $(FCA_TEMP-yes) $(FATE_COVER_ART): CMP = oneline FATE_SAMPLES_AVCONV += $(FATE_COVER_ART) diff --git a/ffmpeg/tests/fate/demux.mak b/ffmpeg/tests/fate/demux.mak index 3b5f954..743274d 100644 --- a/ffmpeg/tests/fate/demux.mak +++ b/ffmpeg/tests/fate/demux.mak @@ -1,98 +1,107 @@ FATE_SAMPLES_DEMUX-$(call DEMDEC, AVI, FRAPS) += fate-avio-direct -fate-avio-direct: CMD = framecrc -avioflags direct -i $(SAMPLES)/fraps/fraps-v5-bouncing-balls-partial.avi -avioflags direct +fate-avio-direct: CMD = framecrc -avioflags direct -i $(TARGET_SAMPLES)/fraps/fraps-v5-bouncing-balls-partial.avi -avioflags direct FATE_SAMPLES_DEMUX-$(CONFIG_AAC_DEMUXER) += fate-adts-demux -fate-adts-demux: CMD = crc -i $(SAMPLES)/aac/ct_faac-adts.aac -acodec copy +fate-adts-demux: CMD = crc -i $(TARGET_SAMPLES)/aac/ct_faac-adts.aac -acodec copy FATE_SAMPLES_DEMUX-$(CONFIG_AEA_DEMUXER) += fate-aea-demux -fate-aea-demux: CMD = crc -i $(SAMPLES)/aea/chirp.aea -acodec copy +fate-aea-demux: CMD = crc -i $(TARGET_SAMPLES)/aea/chirp.aea -acodec copy FATE_SAMPLES_DEMUX-$(CONFIG_AST_DEMUXER) += fate-ast -fate-ast: CMD = crc -i $(SAMPLES)/ast/demo11_02_partial.ast -c copy +fate-ast: CMD = crc -i $(TARGET_SAMPLES)/ast/demo11_02_partial.ast -c copy FATE_SAMPLES_DEMUX-$(CONFIG_BINK_DEMUXER) += fate-bink-demux -fate-bink-demux: CMD = crc -i $(SAMPLES)/bink/Snd0a7d9b58.dee -vn -acodec copy +fate-bink-demux: CMD = crc -i $(TARGET_SAMPLES)/bink/Snd0a7d9b58.dee -vn -acodec copy FATE_SAMPLES_DEMUX-$(CONFIG_BRSTM_DEMUXER) += fate-brstm -fate-brstm: CMD = crc -i $(SAMPLES)/brstm/lozswd_partial.brstm -acodec copy +fate-brstm: CMD = crc -i $(TARGET_SAMPLES)/brstm/lozswd_partial.brstm -acodec copy FATE_SAMPLES_DEMUX-$(CONFIG_CAF_DEMUXER) += fate-caf -fate-caf: CMD = crc -i $(SAMPLES)/caf/caf-pcm16.caf -c copy +fate-caf: CMD = crc -i $(TARGET_SAMPLES)/caf/caf-pcm16.caf -c copy FATE_SAMPLES_DEMUX-$(CONFIG_CDXL_DEMUXER) += fate-cdxl-demux -fate-cdxl-demux: CMD = framecrc -i $(SAMPLES)/cdxl/mirage.cdxl -vcodec copy -acodec copy +fate-cdxl-demux: CMD = framecrc -i $(TARGET_SAMPLES)/cdxl/mirage.cdxl -vcodec copy -acodec copy FATE_SAMPLES_DEMUX-$(CONFIG_DAUD_DEMUXER) += fate-d-cinema-demux -fate-d-cinema-demux: CMD = framecrc -i $(SAMPLES)/d-cinema/THX_Science_FLT_1920-partial.302 -acodec copy +fate-d-cinema-demux: CMD = framecrc -i $(TARGET_SAMPLES)/d-cinema/THX_Science_FLT_1920-partial.302 -acodec copy FATE_SAMPLES_DEMUX-$(CONFIG_GIF_DEMUXER) += fate-gif-demux -fate-gif-demux: CMD = framecrc -i $(SAMPLES)/gif/Newtons_cradle_animation_book_2.gif -vcodec copy +fate-gif-demux: CMD = framecrc -i $(TARGET_SAMPLES)/gif/Newtons_cradle_animation_book_2.gif -vcodec copy FATE_SAMPLES_DEMUX-$(CONFIG_IV8_DEMUXER) += fate-iv8-demux -fate-iv8-demux: CMD = framecrc -i $(SAMPLES)/iv8/zzz-partial.mpg -vcodec copy +fate-iv8-demux: CMD = framecrc -i $(TARGET_SAMPLES)/iv8/zzz-partial.mpg -vcodec copy FATE_SAMPLES_DEMUX-$(CONFIG_JV_DEMUXER) += fate-jv-demux -fate-jv-demux: CMD = framecrc -i $(SAMPLES)/jv/intro.jv -vcodec copy -acodec copy +fate-jv-demux: CMD = framecrc -i $(TARGET_SAMPLES)/jv/intro.jv -vcodec copy -acodec copy FATE_SAMPLES_DEMUX-$(CONFIG_LMLM4_DEMUXER) += fate-lmlm4-demux -fate-lmlm4-demux: CMD = framecrc -i $(SAMPLES)/lmlm4/LMLM4_CIFat30fps.divx -t 3 -acodec copy -vcodec copy +fate-lmlm4-demux: CMD = framecrc -i $(TARGET_SAMPLES)/lmlm4/LMLM4_CIFat30fps.divx -t 3 -acodec copy -vcodec copy FATE_SAMPLES_DEMUX-$(CONFIG_XA_DEMUXER) += fate-maxis-xa -fate-maxis-xa: CMD = framecrc -i $(SAMPLES)/maxis-xa/SC2KBUG.XA -frames:a 30 -c:a copy +fate-maxis-xa: CMD = framecrc -i $(TARGET_SAMPLES)/maxis-xa/SC2KBUG.XA -frames:a 30 -c:a copy + +FATE_SAMPLES_DEMUX-$(CONFIG_MATROSKA_DEMUXER) += fate-mkv +fate-mkv: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/test7_cut.mkv -c copy FATE_SAMPLES_DEMUX-$(CONFIG_MTV_DEMUXER) += fate-mtv -fate-mtv: CMD = framecrc -i $(SAMPLES)/mtv/comedian_auto-partial.mtv -c copy +fate-mtv: CMD = framecrc -i $(TARGET_SAMPLES)/mtv/comedian_auto-partial.mtv -c copy FATE_SAMPLES_DEMUX-$(CONFIG_MXF_DEMUXER) += fate-mxf-demux -fate-mxf-demux: CMD = framecrc -i $(SAMPLES)/mxf/C0023S01.mxf -acodec copy -vcodec copy +fate-mxf-demux: CMD = framecrc -i $(TARGET_SAMPLES)/mxf/C0023S01.mxf -acodec copy -vcodec copy FATE_SAMPLES_DEMUX-$(CONFIG_NC_DEMUXER) += fate-nc-demux -fate-nc-demux: CMD = framecrc -i $(SAMPLES)/nc-camera/nc-sample-partial -vcodec copy +fate-nc-demux: CMD = framecrc -i $(TARGET_SAMPLES)/nc-camera/nc-sample-partial -vcodec copy FATE_SAMPLES_DEMUX-$(CONFIG_NISTSPHERE_DEMUXER) += fate-nistsphere-demux -fate-nistsphere-demux: CMD = crc -i $(SAMPLES)/nistsphere/nist-ulaw.nist -acodec copy +fate-nistsphere-demux: CMD = crc -i $(TARGET_SAMPLES)/nistsphere/nist-ulaw.nist -acodec copy FATE_SAMPLES_DEMUX-$(CONFIG_NSV_DEMUXER) += fate-nsv-demux -fate-nsv-demux: CMD = framecrc -i $(SAMPLES)/nsv/witchblade-51kbps.nsv -t 6 -vcodec copy -acodec copy +fate-nsv-demux: CMD = framecrc -i $(TARGET_SAMPLES)/nsv/witchblade-51kbps.nsv -t 6 -vcodec copy -acodec copy FATE_SAMPLES_DEMUX-$(CONFIG_OMA_DEMUXER) += fate-oma-demux -fate-oma-demux: CMD = crc -i $(SAMPLES)/oma/01-Untitled-partial.oma -acodec copy +fate-oma-demux: CMD = crc -i $(TARGET_SAMPLES)/oma/01-Untitled-partial.oma -acodec copy FATE_SAMPLES_DEMUX-$(CONFIG_PAF_DEMUXER) += fate-paf-demux -fate-paf-demux: CMD = framecrc -i $(SAMPLES)/paf/hod1-partial.paf -vcodec copy -acodec copy +fate-paf-demux: CMD = framecrc -i $(TARGET_SAMPLES)/paf/hod1-partial.paf -vcodec copy -acodec copy FATE_SAMPLES_DEMUX-$(CONFIG_PMP_DEMUXER) += fate-pmp-demux -fate-pmp-demux: CMD = framecrc -i $(SAMPLES)/pmp/demo.pmp -vn -c:a copy +fate-pmp-demux: CMD = framecrc -i $(TARGET_SAMPLES)/pmp/demo.pmp -vn -c:a copy + +FATE_SAMPLES_DEMUX-$(CONFIG_RSD_DEMUXER) += fate-rsd-demux +fate-rsd-demux: CMD = crc -i $(TARGET_SAMPLES)/rsd/hum01_partial.rsd -c:a copy + +FATE_SAMPLES_DEMUX-$(CONFIG_REDSPARK_DEMUXER) += fate-redspark-demux +fate-redspark-demux: CMD = crc -i $(TARGET_SAMPLES)/redspark/jingle04_partial.rsd -c:a copy FATE_SAMPLES_DEMUX-$(CONFIG_STR_DEMUXER) += fate-psx-str-demux -fate-psx-str-demux: CMD = framecrc -i $(SAMPLES)/psx-str/descent-partial.str -c copy +fate-psx-str-demux: CMD = framecrc -i $(TARGET_SAMPLES)/psx-str/descent-partial.str -c copy FATE_SAMPLES_DEMUX-$(CONFIG_PVA_DEMUXER) += fate-pva-demux -fate-pva-demux: CMD = framecrc -idct simple -i $(SAMPLES)/pva/PVA_test-partial.pva -t 0.6 -acodec copy +fate-pva-demux: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/pva/PVA_test-partial.pva -t 0.6 -acodec copy FATE_SAMPLES_DEMUX-$(CONFIG_QCP_DEMUXER) += fate-qcp-demux -fate-qcp-demux: CMD = crc -i $(SAMPLES)/qcp/0036580847.QCP -acodec copy +fate-qcp-demux: CMD = crc -i $(TARGET_SAMPLES)/qcp/0036580847.QCP -acodec copy FATE_SAMPLES_DEMUX-$(CONFIG_R3D_DEMUXER) += fate-redcode-demux -fate-redcode-demux: CMD = framecrc -i $(SAMPLES)/r3d/4MB-sample.r3d -vcodec copy -acodec copy +fate-redcode-demux: CMD = framecrc -i $(TARGET_SAMPLES)/r3d/4MB-sample.r3d -vcodec copy -acodec copy FATE_SAMPLES_DEMUX-$(CONFIG_SIFF_DEMUXER) += fate-siff-demux -fate-siff-demux: CMD = framecrc -i $(SAMPLES)/SIFF/INTRO_B.VB -c copy +fate-siff-demux: CMD = framecrc -i $(TARGET_SAMPLES)/SIFF/INTRO_B.VB -c copy FATE_SAMPLES_DEMUX-$(CONFIG_SMJPEG_DEMUXER) += fate-smjpeg-demux -fate-smjpeg-demux: CMD = framecrc -i $(SAMPLES)/smjpeg/scenwin.mjpg -c copy +fate-smjpeg-demux: CMD = framecrc -i $(TARGET_SAMPLES)/smjpeg/scenwin.mjpg -c copy FATE_SAMPLES_DEMUX-$(CONFIG_WSAUD_DEMUXER) += fate-westwood-aud -fate-westwood-aud: CMD = framecrc -i $(SAMPLES)/westwood-aud/excellent.aud -c copy +fate-westwood-aud: CMD = framecrc -i $(TARGET_SAMPLES)/westwood-aud/excellent.aud -c copy FATE_SAMPLES_DEMUX-$(CONFIG_WTV_DEMUXER) += fate-wtv-demux -fate-wtv-demux: CMD = framecrc -i $(SAMPLES)/wtv/law-and-order-partial.wtv -vcodec copy -acodec copy +fate-wtv-demux: CMD = framecrc -i $(TARGET_SAMPLES)/wtv/law-and-order-partial.wtv -vcodec copy -acodec copy FATE_SAMPLES_DEMUX-$(CONFIG_XMV_DEMUXER) += fate-xmv-demux -fate-xmv-demux: CMD = framecrc -i $(SAMPLES)/xmv/logos1p.fmv -vcodec copy -acodec copy +fate-xmv-demux: CMD = framecrc -i $(TARGET_SAMPLES)/xmv/logos1p.fmv -vcodec copy -acodec copy FATE_SAMPLES_DEMUX-$(CONFIG_XWMA_DEMUXER) += fate-xwma-demux -fate-xwma-demux: CMD = crc -i $(SAMPLES)/xwma/ergon.xwma -acodec copy +fate-xwma-demux: CMD = crc -i $(TARGET_SAMPLES)/xwma/ergon.xwma -acodec copy FATE_SAMPLES_DEMUX += $(FATE_SAMPLES_DEMUX-yes) FATE_SAMPLES_FFMPEG += $(FATE_SAMPLES_DEMUX) diff --git a/ffmpeg/tests/fate/dfa.mak b/ffmpeg/tests/fate/dfa.mak index 4800d8a..f4b6057 100644 --- a/ffmpeg/tests/fate/dfa.mak +++ b/ffmpeg/tests/fate/dfa.mak @@ -1,35 +1,35 @@ FATE_DFA += fate-dfa1 -fate-dfa1: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0000.dfa -pix_fmt rgb24 +fate-dfa1: CMD = framecrc -i $(TARGET_SAMPLES)/chronomaster-dfa/0000.dfa -pix_fmt rgb24 FATE_DFA += fate-dfa2 -fate-dfa2: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0001.dfa -pix_fmt rgb24 +fate-dfa2: CMD = framecrc -i $(TARGET_SAMPLES)/chronomaster-dfa/0001.dfa -pix_fmt rgb24 FATE_DFA += fate-dfa3 -fate-dfa3: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0002.dfa -pix_fmt rgb24 +fate-dfa3: CMD = framecrc -i $(TARGET_SAMPLES)/chronomaster-dfa/0002.dfa -pix_fmt rgb24 FATE_DFA += fate-dfa4 -fate-dfa4: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0003.dfa -pix_fmt rgb24 +fate-dfa4: CMD = framecrc -i $(TARGET_SAMPLES)/chronomaster-dfa/0003.dfa -pix_fmt rgb24 FATE_DFA += fate-dfa5 -fate-dfa5: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0004.dfa -pix_fmt rgb24 +fate-dfa5: CMD = framecrc -i $(TARGET_SAMPLES)/chronomaster-dfa/0004.dfa -pix_fmt rgb24 FATE_DFA += fate-dfa6 -fate-dfa6: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0005.dfa -pix_fmt rgb24 +fate-dfa6: CMD = framecrc -i $(TARGET_SAMPLES)/chronomaster-dfa/0005.dfa -pix_fmt rgb24 FATE_DFA += fate-dfa7 -fate-dfa7: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0006.dfa -pix_fmt rgb24 +fate-dfa7: CMD = framecrc -i $(TARGET_SAMPLES)/chronomaster-dfa/0006.dfa -pix_fmt rgb24 FATE_DFA += fate-dfa8 -fate-dfa8: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0007.dfa -pix_fmt rgb24 +fate-dfa8: CMD = framecrc -i $(TARGET_SAMPLES)/chronomaster-dfa/0007.dfa -pix_fmt rgb24 FATE_DFA += fate-dfa9 -fate-dfa9: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0008.dfa -pix_fmt rgb24 +fate-dfa9: CMD = framecrc -i $(TARGET_SAMPLES)/chronomaster-dfa/0008.dfa -pix_fmt rgb24 FATE_DFA += fate-dfa10 -fate-dfa10: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0009.dfa -pix_fmt rgb24 +fate-dfa10: CMD = framecrc -i $(TARGET_SAMPLES)/chronomaster-dfa/0009.dfa -pix_fmt rgb24 FATE_DFA += fate-dfa11 -fate-dfa11: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0010.dfa -pix_fmt rgb24 +fate-dfa11: CMD = framecrc -i $(TARGET_SAMPLES)/chronomaster-dfa/0010.dfa -pix_fmt rgb24 FATE_DFA-$(call DEMDEC, DFA, DFA) += $(FATE_DFA) diff --git a/ffmpeg/tests/fate/dpcm.mak b/ffmpeg/tests/fate/dpcm.mak index abc25ed..dd27246 100644 --- a/ffmpeg/tests/fate/dpcm.mak +++ b/ffmpeg/tests/fate/dpcm.mak @@ -1,14 +1,14 @@ FATE_DPCM-$(call DEMDEC, ROQ, ROQ_DPCM) += fate-dpcm-idroq -fate-dpcm-idroq: CMD = framecrc -i $(SAMPLES)/idroq/idlogo.roq -vn +fate-dpcm-idroq: CMD = framecrc -i $(TARGET_SAMPLES)/idroq/idlogo.roq -vn FATE_DPCM-$(call DEMDEC, IPMOVIE, INTERPLAY_DPCM) += fate-dpcm-interplay -fate-dpcm-interplay: CMD = framecrc -i $(SAMPLES)/interplay-mve/interplay-logo-2MB.mve -vn +fate-dpcm-interplay: CMD = framecrc -i $(TARGET_SAMPLES)/interplay-mve/interplay-logo-2MB.mve -vn FATE_DPCM-$(call DEMDEC, SOL, SOL_DPCM) += fate-dpcm-sierra -fate-dpcm-sierra: CMD = md5 -i $(SAMPLES)/sol/lsl7sample.sol -f s16le +fate-dpcm-sierra: CMD = md5 -i $(TARGET_SAMPLES)/sol/lsl7sample.sol -f s16le FATE_DPCM-$(call DEMDEC, AVI, XAN_DPCM) += fate-dpcm-xan -fate-dpcm-xan: CMD = md5 -i $(SAMPLES)/wc4-xan/wc4_2.avi -vn -f s16le +fate-dpcm-xan: CMD = md5 -i $(TARGET_SAMPLES)/wc4-xan/wc4_2.avi -vn -f s16le FATE_SAMPLES_AVCONV += $(FATE_DPCM-yes) fate-dpcm: $(FATE_DPCM-yes) diff --git a/ffmpeg/tests/fate/ea.mak b/ffmpeg/tests/fate/ea.mak index 81e14b8..9de671c 100644 --- a/ffmpeg/tests/fate/ea.mak +++ b/ffmpeg/tests/fate/ea.mak @@ -1,26 +1,26 @@ FATE_SAMPLES_EA-$(call DEMDEC, EA_CDATA, ADPCM_EA_XAS) += fate-ea-cdata -fate-ea-cdata: CMD = md5 -i $(SAMPLES)/ea-cdata/166b084d.46410f77.0009b440.24be960c.cdata -f s16le +fate-ea-cdata: CMD = md5 -i $(TARGET_SAMPLES)/ea-cdata/166b084d.46410f77.0009b440.24be960c.cdata -f s16le FATE_SAMPLES_EA-$(call DEMDEC, EA, EACMV) += fate-ea-cmv -fate-ea-cmv: CMD = framecrc -i $(SAMPLES)/ea-cmv/TITLE.CMV -pix_fmt rgb24 +fate-ea-cmv: CMD = framecrc -i $(TARGET_SAMPLES)/ea-cmv/TITLE.CMV -pix_fmt rgb24 FATE_SAMPLES_EA-$(call DEMDEC, EA, EAMAD) += fate-ea-mad -fate-ea-mad: CMD = framecrc -i $(SAMPLES)/ea-mad/NFS6LogoE.mad -an +fate-ea-mad: CMD = framecrc -i $(TARGET_SAMPLES)/ea-mad/NFS6LogoE.mad -an FATE_SAMPLES_EA-$(call DEMDEC, EA, EATGQ) += fate-ea-tgq -fate-ea-tgq: CMD = framecrc -i $(SAMPLES)/ea-tgq/v27.tgq -an +fate-ea-tgq: CMD = framecrc -i $(TARGET_SAMPLES)/ea-tgq/v27.tgq -an FATE_EA_TGV += fate-ea-tgv-1 -fate-ea-tgv-1: CMD = framecrc -i $(SAMPLES)/ea-tgv/INTRO8K-partial.TGV -pix_fmt rgb24 -an +fate-ea-tgv-1: CMD = framecrc -i $(TARGET_SAMPLES)/ea-tgv/INTRO8K-partial.TGV -pix_fmt rgb24 -an FATE_EA_TGV += fate-ea-tgv-2 -fate-ea-tgv-2: CMD = framecrc -i $(SAMPLES)/ea-tgv/INTEL_S.TGV -pix_fmt rgb24 -an +fate-ea-tgv-2: CMD = framecrc -i $(TARGET_SAMPLES)/ea-tgv/INTEL_S.TGV -pix_fmt rgb24 -an FATE_SAMPLES_EA-$(call DEMDEC, EA, EATGV) += $(FATE_EA_TGV) fate-ea-tgv: $(FATE_EA_TGV) FATE_SAMPLES_EA-$(call DEMDEC, EA, EATQI) += fate-ea-tqi -fate-ea-tqi: CMD = framecrc -i $(SAMPLES)/ea-wve/networkBackbone-partial.wve -frames:v 26 -an +fate-ea-tqi: CMD = framecrc -i $(TARGET_SAMPLES)/ea-wve/networkBackbone-partial.wve -frames:v 26 -an FATE_SAMPLES_FFMPEG += $(FATE_SAMPLES_EA-yes) fate-ea: $(FATE_SAMPLES_EA-yes) diff --git a/ffmpeg/tests/fate/ffmpeg.mak b/ffmpeg/tests/fate/ffmpeg.mak index b96bfb3..21cdd5f 100644 --- a/ffmpeg/tests/fate/ffmpeg.mak +++ b/ffmpeg/tests/fate/ffmpeg.mak @@ -35,3 +35,14 @@ fate-sub2video: CMD = framecrc \ -ss 132 -i $(SAMPLES)/sub/vobsub.idx \ -filter_complex "sws_flags=+accurate_rnd+bitexact;[0:0]scale=720:480[v];[v][1:0]overlay[v2]" \ -map "[v2]" -c:v rawvideo -map 1:s -c:s dvdsub + +FATE_FFMPEG-$(call ALLYES, PCM_S16LE_DEMUXER PCM_S16LE_MUXER PCM_S16LE_DECODER PCM_S16LE_ENCODER) += fate-unknown_layout-pcm +fate-unknown_layout-pcm: $(AREF) +fate-unknown_layout-pcm: CMD = md5 \ + -guess_layout_max 0 -f s16le -ac 1 -ar 44100 -i $(AREF) -f s16le + +FATE_FFMPEG-$(call ALLYES, PCM_S16LE_DEMUXER AC3_MUXER PCM_S16LE_DECODER AC3_FIXED_ENCODER) += fate-unknown_layout-ac3 +fate-unknown_layout-ac3: $(AREF) +fate-unknown_layout-ac3: CMD = md5 \ + -guess_layout_max 0 -f s16le -ac 1 -ar 44100 -i $(AREF) \ + -f ac3 -flags +bitexact -c ac3_fixed diff --git a/ffmpeg/tests/fate/fft.mak b/ffmpeg/tests/fate/fft.mak index 20d5638..1f3a262 100644 --- a/ffmpeg/tests/fate/fft.mak +++ b/ffmpeg/tests/fate/fft.mak @@ -38,5 +38,22 @@ $(FATE_FFT_FIXED): libavcodec/fft-fixed-test$(EXESUF) $(FATE_FFT_FIXED): CMD = run libavcodec/fft-fixed-test $(CPUFLAGS:%=-c%) $(ARGS) $(FATE_FFT_FIXED): REF = /dev/null -FATE-$(call ALLYES, AVCODEC FFT) += $(FATE_FFT) $(FATE_FFT_FIXED) -fate-fft: $(FATE_FFT) $(FATE_FFT_FIXED) +define DEF_FFT_FIXED32 +FATE_FFT_FIXED32 += fate-fft-fixed32-$(1) fate-ifft-fixed32-$(1) \ + fate-mdct-fixed32-$(1) fate-imdct-fixed32-$(1) + +fate-fft-fixed32-$(1): ARGS = -n$(1) +fate-ifft-fixed32-$(1): ARGS = -n$(1) -i +#fate-mdct-fixed32-$(1): ARGS = -n$(1) -m +fate-imdct-fixed32-$(1): ARGS = -n$(1) -m -i +endef + +$(foreach N, 4 5 6 7 8 9 10 11 12, $(eval $(call DEF_FFT_FIXED32,$(N)))) + +fate-fft-fixed32-test: $(FATE_FFT_FIXED32) +$(FATE_FFT_FIXED32): libavcodec/fft-fixed32-test$(EXESUF) +$(FATE_FFT_FIXED32): CMD = run libavcodec/fft-fixed32-test $(CPUFLAGS:%=-c%) $(ARGS) +$(FATE_FFT_FIXED32): REF = /dev/null + +FATE-$(call ALLYES, AVCODEC FFT MDCT) += $(FATE_FFT) $(FATE_FFT_FIXED) $(FATE_FFT_FIXED32) +fate-fft: $(FATE_FFT) $(FATE_FFT_FIXED) $(FATE_FFT_FIXED32) diff --git a/ffmpeg/tests/fate/filter.mak b/ffmpeg/tests/fate/filter.mak deleted file mode 100644 index bf41503..0000000 --- a/ffmpeg/tests/fate/filter.mak +++ /dev/null @@ -1,83 +0,0 @@ -FATE_AMIX += fate-filter-amix-simple -fate-filter-amix-simple: CMD = ffmpeg -filter_complex amix -i $(SRC) -ss 3 -i $(SRC1) -f f32le - -fate-filter-amix-simple: REF = $(SAMPLES)/filter/amix_simple.pcm - -FATE_AMIX += fate-filter-amix-first -fate-filter-amix-first: CMD = ffmpeg -filter_complex amix=duration=first -ss 4 -i $(SRC) -i $(SRC1) -f f32le - -fate-filter-amix-first: REF = $(SAMPLES)/filter/amix_first.pcm - -FATE_AMIX += fate-filter-amix-transition -fate-filter-amix-transition: tests/data/asynth-44100-2-3.wav -fate-filter-amix-transition: SRC2 = $(TARGET_PATH)/tests/data/asynth-44100-2-3.wav -fate-filter-amix-transition: CMD = ffmpeg -filter_complex amix=inputs=3:dropout_transition=0.5 -i $(SRC) -ss 2 -i $(SRC1) -ss 4 -i $(SRC2) -f f32le - -fate-filter-amix-transition: REF = $(SAMPLES)/filter/amix_transition.pcm - -$(FATE_AMIX): tests/data/asynth-44100-2.wav tests/data/asynth-44100-2-2.wav -$(FATE_AMIX): SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav -$(FATE_AMIX): SRC1 = $(TARGET_PATH)/tests/data/asynth-44100-2-2.wav -$(FATE_AMIX): CMP = oneoff -$(FATE_AMIX): CMP_UNIT = f32 - -FATE_FILTER-$(CONFIG_AMIX_FILTER) += $(FATE_AMIX) - -FATE_FILTER-$(CONFIG_ASYNCTS_FILTER) += fate-filter-asyncts -fate-filter-asyncts: SRC = $(SAMPLES)/nellymoser/nellymoser-discont.flv -fate-filter-asyncts: CMD = pcm -analyzeduration 10000000 -i $(SRC) -af asyncts -fate-filter-asyncts: CMP = oneoff -fate-filter-asyncts: REF = $(SAMPLES)/nellymoser/nellymoser-discont-async-v2.pcm - -FATE_FILTER-$(CONFIG_ARESAMPLE_FILTER) += fate-filter-aresample -fate-filter-aresample: SRC = $(SAMPLES)/nellymoser/nellymoser-discont.flv -fate-filter-aresample: CMD = pcm -i $(SRC) -af aresample=min_comp=0.001:min_hard_comp=0.1:first_pts=0 -fate-filter-aresample: CMP = oneoff -fate-filter-aresample: REF = $(SAMPLES)/nellymoser/nellymoser-discont.pcm - -fate-filter-delogo: CMD = framecrc -i $(SAMPLES)/real/rv30.rm -vf perms=random,delogo=show=0:x=290:y=25:w=26:h=16 -an - -FATE_FILTER-$(call ALLYES, PERMS_FILTER DELOGO_FILTER) += fate-filter-delogo - -FATE_YADIF += fate-filter-yadif-mode0 -fate-filter-yadif-mode0: CMD = framecrc -flags bitexact -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -vf yadif=0 - -FATE_YADIF += fate-filter-yadif-mode1 -fate-filter-yadif-mode1: CMD = framecrc -flags bitexact -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -vf yadif=1 - -FATE_FILTER-$(CONFIG_YADIF_FILTER) += $(FATE_YADIF) - -FATE_HQDN3D += fate-filter-hqdn3d -fate-filter-hqdn3d: CMD = framecrc -idct simple -i $(SAMPLES)/smjpeg/scenwin.mjpg -vf perms=random,hqdn3d -an -FATE_FILTER-$(call ALLYES, SMJPEG_DEMUXER MJPEG_DECODER PERMS_FILTER HQDN3D_FILTER) += $(FATE_HQDN3D) - -fate-filter-curves: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_rgb_median.avi -vf "perms=random,curves=r=0/0.11@.42/.51@1/0.95:g=0.50/0.48:b=0/0.22@.49/.44@1/0.8" -FATE_FILTER-$(call ALLYES, UTVIDEO_DECODER AVI_DEMUXER PERMS_FILTER CURVES_FILTER) += fate-filter-curves - -FATE_GRADFUN += fate-filter-gradfun -fate-filter-gradfun: CMD = framecrc -i $(SAMPLES)/vmd/12.vmd -vf "sws_flags=+accurate_rnd+bitexact;format=gray,perms=random,gradfun=10:8" -an -frames:v 20 -FATE_FILTER-$(call ALLYES, VMD_DEMUXER VMDVIDEO_DECODER FORMAT_FILTER PERMS_FILTER GRADFUN_FILTER) += $(FATE_GRADFUN) - -FATE_SAMPLES_AVCONV += $(FATE_FILTER-yes) - -# -# Metadata tests -# -FILTER_METADATA_COMMAND = ffprobe$(EXESUF) -of compact=p=0 -show_entries frame=pkt_pts:frame_tags -bitexact -f lavfi - -SCENEDETECT_DEPS = FFPROBE LAVFI_INDEV MOVIE_FILTER SELECT_FILTER SCALE_FILTER \ - AVCODEC AVDEVICE MOV_DEMUXER SVQ3_DECODER ZLIB -FATE_METADATA_FILTER-$(call ALLYES, $(SCENEDETECT_DEPS)) += fate-filter-metadata-scenedetect -fate-filter-metadata-scenedetect: SRC = $(SAMPLES)/svq3/Vertical400kbit.sorenson3.mov -fate-filter-metadata-scenedetect: CMD = run $(FILTER_METADATA_COMMAND) "sws_flags=+accurate_rnd+bitexact;movie='$(SRC)',select=gt(scene\,.4)" - -SILENCEDETECT_DEPS = FFPROBE AVDEVICE LAVFI_INDEV AMOVIE_FILTER AMR_DEMUXER AMRWB_DECODER SILENCEDETECT_FILTER -FATE_METADATA_FILTER-$(call ALLYES, $(SILENCEDETECT_DEPS)) += fate-filter-metadata-silencedetect -fate-filter-metadata-silencedetect: SRC = $(SAMPLES)/amrwb/seed-12k65.awb -fate-filter-metadata-silencedetect: CMD = run $(FILTER_METADATA_COMMAND) "amovie='$(SRC)',silencedetect=d=-20dB" - -EBUR128_METADATA_DEPS = FFPROBE AVDEVICE LAVFI_INDEV AMOVIE_FILTER FLAC_DEMUXER FLAC_DECODER EBUR128_FILTER -FATE_METADATA_FILTER-$(call ALLYES, $(EBUR128_METADATA_DEPS)) += fate-filter-metadata-ebur128 -fate-filter-metadata-ebur128: SRC = $(SAMPLES)/filter/seq-3341-7_seq-3342-5-24bit.flac -fate-filter-metadata-ebur128: CMD = run $(FILTER_METADATA_COMMAND) "amovie='$(SRC)',ebur128=metadata=1" - -FATE_SAMPLES_FFPROBE += $(FATE_METADATA_FILTER-yes) - -fate-filter: $(FATE_FILTER-yes) $(FATE_METADATA_FILTER-yes) diff --git a/ffmpeg/tests/fate/flac.mak b/ffmpeg/tests/fate/flac.mak index 172f661..4a13404 100644 --- a/ffmpeg/tests/fate/flac.mak +++ b/ffmpeg/tests/fate/flac.mak @@ -12,12 +12,12 @@ fate-flac-16-fixed: OPTS = -lpc_type fixed fate-flac-16-lpc-%: OPTS = -lpc_type $(@:fate-flac-16-lpc-%=%) fate-flac-16-%: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav -fate-flac-16-%: CMD = enc_dec_pcm flac wav s16le $(REF) -c flac $(OPTS) +fate-flac-16-%: CMD = enc_dec_pcm flac wav s16le $(subst $(SAMPLES),$(TARGET_SAMPLES),$(REF)) -c flac $(OPTS) fate-flac-24-comp-%: OPTS = -compression_level $(@:fate-flac-24-comp-%=%) fate-flac-24-%: REF = $(SAMPLES)/audio-reference/divertimenti_2ch_96kHz_s24.wav -fate-flac-24-%: CMD = enc_dec_pcm flac wav s24le $(REF) -c flac $(OPTS) +fate-flac-24-%: CMD = enc_dec_pcm flac wav s24le $(subst $(SAMPLES),$(TARGET_SAMPLES),$(REF)) -c flac $(OPTS) fate-flac-%: CMP = oneoff fate-flac-%: FUZZ = 0 diff --git a/ffmpeg/tests/fate/gif.mak b/ffmpeg/tests/fate/gif.mak index 97b0545..feda240 100644 --- a/ffmpeg/tests/fate/gif.mak +++ b/ffmpeg/tests/fate/gif.mak @@ -1,11 +1,25 @@ FATE_GIF += fate-gif-color -fate-gif-color: CMD = framecrc -i $(SAMPLES)/gif/tc217.gif -pix_fmt bgra +fate-gif-color: CMD = framecrc -i $(TARGET_SAMPLES)/gif/tc217.gif -pix_fmt bgra + +FATE_GIF += fate-gif-disposal-background +fate-gif-disposal-background: CMD = framecrc -trans_color 0 -i $(TARGET_SAMPLES)/gif/m4nb.gif -pix_fmt bgra FATE_GIF += fate-gif-disposal-restore -fate-gif-disposal-restore: CMD = framecrc -i $(SAMPLES)/gif/banner2.gif -pix_fmt bgra +fate-gif-disposal-restore: CMD = framecrc -i $(TARGET_SAMPLES)/gif/banner2.gif -pix_fmt bgra FATE_GIF += fate-gif-gray -fate-gif-gray: CMD = framecrc -i $(SAMPLES)/gif/Newtons_cradle_animation_book_2.gif -pix_fmt bgra +fate-gif-gray: CMD = framecrc -i $(TARGET_SAMPLES)/gif/Newtons_cradle_animation_book_2.gif -pix_fmt bgra + +fate-gifenc%: fate-gif-color +fate-gifenc%: PIXFMT = $(word 3, $(subst -, ,$(@))) +fate-gifenc%: SRC = $(SAMPLES)/gif/tc217.gif +fate-gifenc%: CMD = framecrc -i $(SRC) -c:v gif -pix_fmt $(PIXFMT) + +FATE_GIF_ENC_PIXFMT = rgb8 bgr8 rgb4_byte bgr4_byte gray pal8 +FATE_GIF_ENC-$(call ENCDEC, GIF, GIF) = $(FATE_GIF_ENC_PIXFMT:%=fate-gifenc-%) + +FATE_GIF += $(FATE_GIF_ENC-yes) +fate-gifenc: $(FATE_GIF_ENC-yes) FATE_GIF-$(call DEMDEC, GIF, GIF) += $(FATE_GIF) diff --git a/ffmpeg/tests/fate/h264.mak b/ffmpeg/tests/fate/h264.mak index 31ee5bf..55270d0 100644 --- a/ffmpeg/tests/fate/h264.mak +++ b/ffmpeg/tests/fate/h264.mak @@ -64,6 +64,7 @@ FATE_H264 = aud_mw_e \ ci_mw_d \ cvbs3_sony_c \ cvcanlma2_sony_c \ + cvfc1_sony_c \ cvfi1_sony_d \ cvfi1_sva_c \ cvfi2_sony_h \ @@ -193,199 +194,202 @@ FATE_H264 := $(FATE_H264:%=fate-h264-conformance-%) \ fate-h264-lossless \ FATE_H264-$(call DEMDEC, H264, H264) += $(FATE_H264) +FATE_H264-$(call DEMDEC, MOV, H264) += fate-h264-crop-to-container FATE_H264-$(call DEMDEC, MOV, H264) += fate-h264-interlace-crop FATE_H264-$(call ALLYES, MOV_DEMUXER H264_MP4TOANNEXB_BSF) += fate-h264-bsf-mp4toannexb FATE_SAMPLES_AVCONV += $(FATE_H264-yes) fate-h264: $(FATE_H264-yes) -fate-h264-conformance-aud_mw_e: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/AUD_MW_E.264 -fate-h264-conformance-ba1_ft_c: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/BA1_FT_C.264 -fate-h264-conformance-ba1_sony_d: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/BA1_Sony_D.jsv -fate-h264-conformance-ba2_sony_f: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/BA2_Sony_F.jsv -fate-h264-conformance-ba3_sva_c: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/BA3_SVA_C.264 -fate-h264-conformance-ba_mw_d: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/BA_MW_D.264 -fate-h264-conformance-bamq1_jvc_c: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/BAMQ1_JVC_C.264 -fate-h264-conformance-bamq2_jvc_c: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/BAMQ2_JVC_C.264 -fate-h264-conformance-banm_mw_d: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/BANM_MW_D.264 -fate-h264-conformance-basqp1_sony_c: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/BASQP1_Sony_C.jsv -fate-h264-conformance-caba1_sony_d: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CABA1_Sony_D.jsv -fate-h264-conformance-caba1_sva_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CABA1_SVA_B.264 -fate-h264-conformance-caba2_sony_e: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CABA2_Sony_E.jsv -fate-h264-conformance-caba2_sva_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CABA2_SVA_B.264 -fate-h264-conformance-caba3_sony_c: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CABA3_Sony_C.jsv -fate-h264-conformance-caba3_sva_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CABA3_SVA_B.264 -fate-h264-conformance-caba3_toshiba_e: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CABA3_TOSHIBA_E.264 -fate-h264-conformance-cabac_mot_fld0_full: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/camp_mot_fld0_full.26l -fate-h264-conformance-cabac_mot_frm0_full: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/camp_mot_frm0_full.26l -fate-h264-conformance-cabac_mot_mbaff0_full: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/camp_mot_mbaff0_full.26l -fate-h264-conformance-cabac_mot_picaff0_full: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/camp_mot_picaff0_full.26l -fate-h264-conformance-cabaci3_sony_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CABACI3_Sony_B.jsv -fate-h264-conformance-cabast3_sony_e: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CABAST3_Sony_E.jsv -fate-h264-conformance-cabastbr3_sony_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CABASTBR3_Sony_B.jsv -fate-h264-conformance-cabref3_sand_d: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CABREF3_Sand_D.264 -fate-h264-conformance-cacqp3_sony_d: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CACQP3_Sony_D.jsv -fate-h264-conformance-cafi1_sva_c: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CAFI1_SVA_C.264 -fate-h264-conformance-cama1_sony_c: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CAMA1_Sony_C.jsv -fate-h264-conformance-cama1_toshiba_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CAMA1_TOSHIBA_B.264 -fate-h264-conformance-cama1_vtc_c: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/cama1_vtc_c.avc -fate-h264-conformance-cama2_vtc_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/cama2_vtc_b.avc -fate-h264-conformance-cama3_sand_e: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CAMA3_Sand_E.264 -fate-h264-conformance-cama3_vtc_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/cama3_vtc_b.avc -fate-h264-conformance-camaci3_sony_c: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CAMACI3_Sony_C.jsv -fate-h264-conformance-camanl1_toshiba_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CAMANL1_TOSHIBA_B.264 -fate-h264-conformance-camanl2_toshiba_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CAMANL2_TOSHIBA_B.264 -fate-h264-conformance-camanl3_sand_e: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CAMANL3_Sand_E.264 -fate-h264-conformance-camasl3_sony_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CAMASL3_Sony_B.jsv -fate-h264-conformance-camp_mot_mbaff_l30: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CAMP_MOT_MBAFF_L30.26l -fate-h264-conformance-camp_mot_mbaff_l31: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CAMP_MOT_MBAFF_L31.26l -fate-h264-conformance-canl1_sony_e: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CANL1_Sony_E.jsv -fate-h264-conformance-canl1_sva_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CANL1_SVA_B.264 -fate-h264-conformance-canl1_toshiba_g: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CANL1_TOSHIBA_G.264 -fate-h264-conformance-canl2_sony_e: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CANL2_Sony_E.jsv -fate-h264-conformance-canl2_sva_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CANL2_SVA_B.264 -fate-h264-conformance-canl3_sony_c: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CANL3_Sony_C.jsv -fate-h264-conformance-canl3_sva_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CANL3_SVA_B.264 -fate-h264-conformance-canl4_sva_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CANL4_SVA_B.264 -fate-h264-conformance-canlma2_sony_c: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CANLMA2_Sony_C.jsv -fate-h264-conformance-canlma3_sony_c: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CANLMA3_Sony_C.jsv -fate-h264-conformance-capa1_toshiba_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CAPA1_TOSHIBA_B.264 -fate-h264-conformance-capama3_sand_f: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CAPAMA3_Sand_F.264 -fate-h264-conformance-capcm1_sand_e: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CAPCM1_Sand_E.264 -fate-h264-conformance-capcmnl1_sand_e: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CAPCMNL1_Sand_E.264 -fate-h264-conformance-capm3_sony_d: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CAPM3_Sony_D.jsv -fate-h264-conformance-caqp1_sony_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CAQP1_Sony_B.jsv -fate-h264-conformance-cavlc_mot_fld0_full_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/cvmp_mot_fld0_full_B.26l -fate-h264-conformance-cavlc_mot_frm0_full_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/cvmp_mot_frm0_full_B.26l -fate-h264-conformance-cavlc_mot_mbaff0_full_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/cvmp_mot_mbaff0_full_B.26l -fate-h264-conformance-cavlc_mot_picaff0_full_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/cvmp_mot_picaff0_full_B.26l -fate-h264-conformance-cawp1_toshiba_e: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CAWP1_TOSHIBA_E.264 -fate-h264-conformance-cawp5_toshiba_e: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CAWP5_TOSHIBA_E.264 -fate-h264-conformance-ci1_ft_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CI1_FT_B.264 -fate-h264-conformance-ci_mw_d: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CI_MW_D.264 -fate-h264-conformance-cvbs3_sony_c: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CVBS3_Sony_C.jsv -fate-h264-conformance-cvcanlma2_sony_c: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CVCANLMA2_Sony_C.jsv -fate-h264-conformance-cvfi1_sony_d: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CVFI1_Sony_D.jsv -fate-h264-conformance-cvfi1_sva_c: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CVFI1_SVA_C.264 -fate-h264-conformance-cvfi2_sony_h: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CVFI2_Sony_H.jsv -fate-h264-conformance-cvfi2_sva_c: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CVFI2_SVA_C.264 -fate-h264-conformance-cvma1_sony_d: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CVMA1_Sony_D.jsv -fate-h264-conformance-cvma1_toshiba_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CVMA1_TOSHIBA_B.264 -fate-h264-conformance-cvmanl1_toshiba_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CVMANL1_TOSHIBA_B.264 -fate-h264-conformance-cvmanl2_toshiba_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CVMANL2_TOSHIBA_B.264 -fate-h264-conformance-cvmapaqp3_sony_e: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CVMAPAQP3_Sony_E.jsv -fate-h264-conformance-cvmaqp2_sony_g: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CVMAQP2_Sony_G.jsv -fate-h264-conformance-cvmaqp3_sony_d: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CVMAQP3_Sony_D.jsv -fate-h264-conformance-cvmp_mot_fld_l30_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CVMP_MOT_FLD_L30_B.26l -fate-h264-conformance-cvmp_mot_frm_l31_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CVMP_MOT_FRM_L31_B.26l -fate-h264-conformance-cvnlfi1_sony_c: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CVNLFI1_Sony_C.jsv -fate-h264-conformance-cvnlfi2_sony_h: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CVNLFI2_Sony_H.jsv -fate-h264-conformance-cvpa1_toshiba_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CVPA1_TOSHIBA_B.264 -fate-h264-conformance-cvpcmnl1_sva_c: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CVPCMNL1_SVA_C.264 -fate-h264-conformance-cvpcmnl2_sva_c: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CVPCMNL2_SVA_C.264 -fate-h264-conformance-cvwp1_toshiba_e: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CVWP1_TOSHIBA_E.264 -fate-h264-conformance-cvwp2_toshiba_e: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CVWP2_TOSHIBA_E.264 -fate-h264-conformance-cvwp3_toshiba_e: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CVWP3_TOSHIBA_E.264 -fate-h264-conformance-cvwp5_toshiba_e: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/CVWP5_TOSHIBA_E.264 -fate-h264-conformance-fi1_sony_e: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FI1_Sony_E.jsv -fate-h264-conformance-frext-alphaconformanceg: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/test8b43.264 -fate-h264-conformance-frext-bcrm_freh10: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/freh10.264 -vsync drop -fate-h264-conformance-frext-brcm_freh11: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/freh11.264 -vsync drop -fate-h264-conformance-frext-brcm_freh3: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/freh3.264 -fate-h264-conformance-frext-brcm_freh4: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/freh4.264 -vsync drop -fate-h264-conformance-frext-brcm_freh5: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/freh5.264 -fate-h264-conformance-frext-brcm_freh8: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/freh8.264 -fate-h264-conformance-frext-brcm_freh9: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/freh9.264 -fate-h264-conformance-frext-freh12_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/Freh12_B.264 -fate-h264-conformance-frext-freh1_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/Freh1_B.264 -fate-h264-conformance-frext-freh2_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/Freh2_B.264 -fate-h264-conformance-frext-freh6: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/freh6.264 -vsync drop -fate-h264-conformance-frext-freh7_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/Freh7_B.264 -vsync drop -fate-h264-conformance-frext-frext01_jvc_d: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/FREXT01_JVC_D.264 -fate-h264-conformance-frext-frext02_jvc_c: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/FREXT02_JVC_C.264 -fate-h264-conformance-frext-frext1_panasonic_c: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/FRExt1_Panasonic.avc -fate-h264-conformance-frext-frext2_panasonic_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/FRExt2_Panasonic.avc -vsync 0 -fate-h264-conformance-frext-frext3_panasonic_d: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/FRExt3_Panasonic.avc -fate-h264-conformance-frext-frext4_panasonic_a: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/FRExt4_Panasonic.avc -fate-h264-conformance-frext-frext_mmco4_sony_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/FRExt_MMCO4_Sony_B.264 -fate-h264-conformance-frext-hcaff1_hhi_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/HCAFF1_HHI.264 -fate-h264-conformance-frext-hcafr1_hhi_c: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/HCAFR1_HHI.264 -fate-h264-conformance-frext-hcafr2_hhi_a: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/HCAFR2_HHI.264 -fate-h264-conformance-frext-hcafr3_hhi_a: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/HCAFR3_HHI.264 -fate-h264-conformance-frext-hcafr4_hhi_a: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/HCAFR4_HHI.264 -fate-h264-conformance-frext-hcamff1_hhi_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/HCAMFF1_HHI.264 -fate-h264-conformance-frext-hi422fr10_sony_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/Hi422FR10_SONY_B.264 -fate-h264-conformance-frext-hi422fr13_sony_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/Hi422FR13_SONY_B.264 -pix_fmt yuv422p10le -fate-h264-conformance-frext-hi422fr1_sony_a: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/Hi422FR1_SONY_A.jsv -fate-h264-conformance-frext-hi422fr6_sony_a: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/Hi422FR6_SONY_A.jsv -pix_fmt yuv422p10le -fate-h264-conformance-frext-hpca_brcm_c: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/HPCA_BRCM_C.264 -fate-h264-conformance-frext-hpcadq_brcm_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/HPCADQ_BRCM_B.264 -fate-h264-conformance-frext-hpcafl_bcrm_c: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/HPCAFL_BRCM_C.264 -vsync drop -fate-h264-conformance-frext-hpcaflnl_bcrm_c: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/HPCAFLNL_BRCM_C.264 -vsync drop -fate-h264-conformance-frext-hpcalq_brcm_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/HPCALQ_BRCM_B.264 -fate-h264-conformance-frext-hpcamapalq_bcrm_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/HPCAMAPALQ_BRCM_B.264 -vsync 0 -fate-h264-conformance-frext-hpcamolq_brcm_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/HPCAMOLQ_BRCM_B.264 -fate-h264-conformance-frext-hpcanl_brcm_c: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/HPCANL_BRCM_C.264 -fate-h264-conformance-frext-hpcaq2lq_brcm_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/HPCAQ2LQ_BRCM_B.264 -fate-h264-conformance-frext-hpcv_brcm_a: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/HPCV_BRCM_A.264 -fate-h264-conformance-frext-hpcvfl_bcrm_a: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/HPCVFL_BRCM_A.264 -vsync drop -fate-h264-conformance-frext-hpcvflnl_bcrm_a: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/HPCVFLNL_BRCM_A.264 -vsync drop -fate-h264-conformance-frext-hpcvmolq_brcm_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/HPCVMOLQ_BRCM_B.264 -fate-h264-conformance-frext-hpcvnl_brcm_a: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/HPCVNL_BRCM_A.264 -fate-h264-conformance-frext-pph10i1_panasonic_a: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/PPH10I1_Panasonic_A.264 -pix_fmt yuv420p10le -fate-h264-conformance-frext-pph10i2_panasonic_a: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/PPH10I2_Panasonic_A.264 -pix_fmt yuv420p10le -fate-h264-conformance-frext-pph10i3_panasonic_a: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/PPH10I3_Panasonic_A.264 -pix_fmt yuv420p10le -fate-h264-conformance-frext-pph10i4_panasonic_a: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/PPH10I4_Panasonic_A.264 -pix_fmt yuv420p10le -fate-h264-conformance-frext-pph10i5_panasonic_a: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/PPH10I5_Panasonic_A.264 -pix_fmt yuv420p10le -fate-h264-conformance-frext-pph10i6_panasonic_a: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/PPH10I6_Panasonic_A.264 -pix_fmt yuv420p10le -fate-h264-conformance-frext-pph10i7_panasonic_a: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/PPH10I7_Panasonic_A.264 -pix_fmt yuv420p10le -fate-h264-conformance-frext-pph422i1_panasonic_a: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/PPH422I1_Panasonic_A.264 -pix_fmt yuv422p10le -fate-h264-conformance-frext-pph422i2_panasonic_a: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/PPH422I2_Panasonic_A.264 -pix_fmt yuv422p10le -fate-h264-conformance-frext-pph422i3_panasonic_a: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/PPH422I3_Panasonic_A.264 -pix_fmt yuv422p10le -fate-h264-conformance-frext-pph422i4_panasonic_a: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/PPH422I4_Panasonic_A.264 -pix_fmt yuv422p10le -fate-h264-conformance-frext-pph422i5_panasonic_a: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/PPH422I5_Panasonic_A.264 -pix_fmt yuv422p10le -fate-h264-conformance-frext-pph422i6_panasonic_a: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/PPH422I6_Panasonic_A.264 -pix_fmt yuv422p10le -fate-h264-conformance-frext-pph422i7_panasonic_a: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/FRext/PPH422I7_Panasonic_A.264 -pix_fmt yuv422p10le -fate-h264-conformance-hcbp2_hhi_a: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/HCBP2_HHI_A.264 -fate-h264-conformance-hcmp1_hhi_a: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/HCMP1_HHI_A.264 -fate-h264-conformance-ls_sva_d: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/LS_SVA_D.264 -fate-h264-conformance-midr_mw_d: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/MIDR_MW_D.264 -fate-h264-conformance-mps_mw_a: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/MPS_MW_A.264 -fate-h264-conformance-mr1_bt_a: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/MR1_BT_A.h264 -fate-h264-conformance-mr1_mw_a: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/MR1_MW_A.264 -fate-h264-conformance-mr2_mw_a: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/MR2_MW_A.264 -fate-h264-conformance-mr2_tandberg_e: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/MR2_TANDBERG_E.264 -fate-h264-conformance-mr3_tandberg_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/MR3_TANDBERG_B.264 -fate-h264-conformance-mr4_tandberg_c: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/MR4_TANDBERG_C.264 -fate-h264-conformance-mr5_tandberg_c: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/MR5_TANDBERG_C.264 -fate-h264-conformance-mr6_bt_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/MR6_BT_B.h264 -fate-h264-conformance-mr7_bt_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/MR7_BT_B.h264 -fate-h264-conformance-mr8_bt_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/MR8_BT_B.h264 -fate-h264-conformance-mr9_bt_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/MR9_BT_B.h264 -fate-h264-conformance-mv1_brcm_d: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/src19td.IBP.264 -fate-h264-conformance-nl1_sony_d: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/NL1_Sony_D.jsv -fate-h264-conformance-nl2_sony_h: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/NL2_Sony_H.jsv -fate-h264-conformance-nl3_sva_e: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/NL3_SVA_E.264 -fate-h264-conformance-nlmq1_jvc_c: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/NLMQ1_JVC_C.264 -fate-h264-conformance-nlmq2_jvc_c: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/NLMQ2_JVC_C.264 -fate-h264-conformance-nrf_mw_e: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/NRF_MW_E.264 -fate-h264-conformance-sharp_mp_field_1_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/Sharp_MP_Field_1_B.jvt -fate-h264-conformance-sharp_mp_field_2_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/Sharp_MP_Field_2_B.jvt -fate-h264-conformance-sharp_mp_field_3_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/Sharp_MP_Field_3_B.jvt -fate-h264-conformance-sharp_mp_paff_1r2: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/Sharp_MP_PAFF_1r2.jvt -fate-h264-conformance-sharp_mp_paff_2r: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/Sharp_MP_PAFF_2.jvt -fate-h264-conformance-sl1_sva_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/SL1_SVA_B.264 -fate-h264-conformance-sva_ba1_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/SVA_BA1_B.264 -fate-h264-conformance-sva_ba2_d: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/SVA_BA2_D.264 -fate-h264-conformance-sva_base_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/SVA_Base_B.264 -fate-h264-conformance-sva_cl1_e: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/SVA_CL1_E.264 -fate-h264-conformance-sva_fm1_e: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/SVA_FM1_E.264 -fate-h264-conformance-sva_nl1_b: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/SVA_NL1_B.264 -fate-h264-conformance-sva_nl2_e: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/SVA_NL2_E.264 +fate-h264-conformance-aud_mw_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/AUD_MW_E.264 +fate-h264-conformance-ba1_ft_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/BA1_FT_C.264 +fate-h264-conformance-ba1_sony_d: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/BA1_Sony_D.jsv +fate-h264-conformance-ba2_sony_f: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/BA2_Sony_F.jsv +fate-h264-conformance-ba3_sva_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/BA3_SVA_C.264 +fate-h264-conformance-ba_mw_d: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/BA_MW_D.264 +fate-h264-conformance-bamq1_jvc_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/BAMQ1_JVC_C.264 +fate-h264-conformance-bamq2_jvc_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/BAMQ2_JVC_C.264 +fate-h264-conformance-banm_mw_d: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/BANM_MW_D.264 +fate-h264-conformance-basqp1_sony_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/BASQP1_Sony_C.jsv +fate-h264-conformance-caba1_sony_d: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CABA1_Sony_D.jsv +fate-h264-conformance-caba1_sva_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CABA1_SVA_B.264 +fate-h264-conformance-caba2_sony_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CABA2_Sony_E.jsv +fate-h264-conformance-caba2_sva_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CABA2_SVA_B.264 +fate-h264-conformance-caba3_sony_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CABA3_Sony_C.jsv +fate-h264-conformance-caba3_sva_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CABA3_SVA_B.264 +fate-h264-conformance-caba3_toshiba_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CABA3_TOSHIBA_E.264 +fate-h264-conformance-cabac_mot_fld0_full: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/camp_mot_fld0_full.26l +fate-h264-conformance-cabac_mot_frm0_full: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/camp_mot_frm0_full.26l +fate-h264-conformance-cabac_mot_mbaff0_full: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/camp_mot_mbaff0_full.26l +fate-h264-conformance-cabac_mot_picaff0_full: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/camp_mot_picaff0_full.26l +fate-h264-conformance-cabaci3_sony_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CABACI3_Sony_B.jsv +fate-h264-conformance-cabast3_sony_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CABAST3_Sony_E.jsv +fate-h264-conformance-cabastbr3_sony_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CABASTBR3_Sony_B.jsv +fate-h264-conformance-cabref3_sand_d: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CABREF3_Sand_D.264 +fate-h264-conformance-cacqp3_sony_d: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CACQP3_Sony_D.jsv +fate-h264-conformance-cafi1_sva_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAFI1_SVA_C.264 +fate-h264-conformance-cama1_sony_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAMA1_Sony_C.jsv +fate-h264-conformance-cama1_toshiba_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAMA1_TOSHIBA_B.264 +fate-h264-conformance-cama1_vtc_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/cama1_vtc_c.avc +fate-h264-conformance-cama2_vtc_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/cama2_vtc_b.avc +fate-h264-conformance-cama3_sand_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAMA3_Sand_E.264 +fate-h264-conformance-cama3_vtc_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/cama3_vtc_b.avc +fate-h264-conformance-camaci3_sony_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAMACI3_Sony_C.jsv +fate-h264-conformance-camanl1_toshiba_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAMANL1_TOSHIBA_B.264 +fate-h264-conformance-camanl2_toshiba_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAMANL2_TOSHIBA_B.264 +fate-h264-conformance-camanl3_sand_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAMANL3_Sand_E.264 +fate-h264-conformance-camasl3_sony_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAMASL3_Sony_B.jsv +fate-h264-conformance-camp_mot_mbaff_l30: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAMP_MOT_MBAFF_L30.26l +fate-h264-conformance-camp_mot_mbaff_l31: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAMP_MOT_MBAFF_L31.26l +fate-h264-conformance-canl1_sony_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CANL1_Sony_E.jsv +fate-h264-conformance-canl1_sva_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CANL1_SVA_B.264 +fate-h264-conformance-canl1_toshiba_g: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CANL1_TOSHIBA_G.264 +fate-h264-conformance-canl2_sony_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CANL2_Sony_E.jsv +fate-h264-conformance-canl2_sva_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CANL2_SVA_B.264 +fate-h264-conformance-canl3_sony_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CANL3_Sony_C.jsv +fate-h264-conformance-canl3_sva_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CANL3_SVA_B.264 +fate-h264-conformance-canl4_sva_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CANL4_SVA_B.264 +fate-h264-conformance-canlma2_sony_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CANLMA2_Sony_C.jsv +fate-h264-conformance-canlma3_sony_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CANLMA3_Sony_C.jsv +fate-h264-conformance-capa1_toshiba_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAPA1_TOSHIBA_B.264 +fate-h264-conformance-capama3_sand_f: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAPAMA3_Sand_F.264 +fate-h264-conformance-capcm1_sand_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAPCM1_Sand_E.264 +fate-h264-conformance-capcmnl1_sand_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAPCMNL1_Sand_E.264 +fate-h264-conformance-capm3_sony_d: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAPM3_Sony_D.jsv +fate-h264-conformance-caqp1_sony_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAQP1_Sony_B.jsv +fate-h264-conformance-cavlc_mot_fld0_full_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/cvmp_mot_fld0_full_B.26l +fate-h264-conformance-cavlc_mot_frm0_full_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/cvmp_mot_frm0_full_B.26l +fate-h264-conformance-cavlc_mot_mbaff0_full_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/cvmp_mot_mbaff0_full_B.26l +fate-h264-conformance-cavlc_mot_picaff0_full_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/cvmp_mot_picaff0_full_B.26l +fate-h264-conformance-cawp1_toshiba_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAWP1_TOSHIBA_E.264 +fate-h264-conformance-cawp5_toshiba_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAWP5_TOSHIBA_E.264 +fate-h264-conformance-ci1_ft_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CI1_FT_B.264 +fate-h264-conformance-ci_mw_d: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CI_MW_D.264 +fate-h264-conformance-cvbs3_sony_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVBS3_Sony_C.jsv +fate-h264-conformance-cvcanlma2_sony_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVCANLMA2_Sony_C.jsv +fate-h264-conformance-cvfc1_sony_c: CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/h264-conformance/CVFC1_Sony_C.jsv +fate-h264-conformance-cvfi1_sony_d: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVFI1_Sony_D.jsv +fate-h264-conformance-cvfi1_sva_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVFI1_SVA_C.264 +fate-h264-conformance-cvfi2_sony_h: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVFI2_Sony_H.jsv +fate-h264-conformance-cvfi2_sva_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVFI2_SVA_C.264 +fate-h264-conformance-cvma1_sony_d: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVMA1_Sony_D.jsv +fate-h264-conformance-cvma1_toshiba_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVMA1_TOSHIBA_B.264 +fate-h264-conformance-cvmanl1_toshiba_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVMANL1_TOSHIBA_B.264 +fate-h264-conformance-cvmanl2_toshiba_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVMANL2_TOSHIBA_B.264 +fate-h264-conformance-cvmapaqp3_sony_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVMAPAQP3_Sony_E.jsv +fate-h264-conformance-cvmaqp2_sony_g: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVMAQP2_Sony_G.jsv +fate-h264-conformance-cvmaqp3_sony_d: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVMAQP3_Sony_D.jsv +fate-h264-conformance-cvmp_mot_fld_l30_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVMP_MOT_FLD_L30_B.26l +fate-h264-conformance-cvmp_mot_frm_l31_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVMP_MOT_FRM_L31_B.26l +fate-h264-conformance-cvnlfi1_sony_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVNLFI1_Sony_C.jsv +fate-h264-conformance-cvnlfi2_sony_h: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVNLFI2_Sony_H.jsv +fate-h264-conformance-cvpa1_toshiba_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVPA1_TOSHIBA_B.264 +fate-h264-conformance-cvpcmnl1_sva_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVPCMNL1_SVA_C.264 +fate-h264-conformance-cvpcmnl2_sva_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVPCMNL2_SVA_C.264 +fate-h264-conformance-cvwp1_toshiba_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVWP1_TOSHIBA_E.264 +fate-h264-conformance-cvwp2_toshiba_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVWP2_TOSHIBA_E.264 +fate-h264-conformance-cvwp3_toshiba_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVWP3_TOSHIBA_E.264 +fate-h264-conformance-cvwp5_toshiba_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVWP5_TOSHIBA_E.264 +fate-h264-conformance-fi1_sony_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FI1_Sony_E.jsv +fate-h264-conformance-frext-alphaconformanceg: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/test8b43.264 +fate-h264-conformance-frext-bcrm_freh10: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh10.264 -vsync drop +fate-h264-conformance-frext-brcm_freh11: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh11.264 -vsync drop +fate-h264-conformance-frext-brcm_freh3: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh3.264 +fate-h264-conformance-frext-brcm_freh4: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh4.264 -vsync drop +fate-h264-conformance-frext-brcm_freh5: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh5.264 +fate-h264-conformance-frext-brcm_freh8: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh8.264 +fate-h264-conformance-frext-brcm_freh9: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh9.264 +fate-h264-conformance-frext-freh12_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/Freh12_B.264 +fate-h264-conformance-frext-freh1_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/Freh1_B.264 +fate-h264-conformance-frext-freh2_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/Freh2_B.264 +fate-h264-conformance-frext-freh6: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh6.264 -vsync drop +fate-h264-conformance-frext-freh7_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/Freh7_B.264 -vsync drop +fate-h264-conformance-frext-frext01_jvc_d: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/FREXT01_JVC_D.264 +fate-h264-conformance-frext-frext02_jvc_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/FREXT02_JVC_C.264 +fate-h264-conformance-frext-frext1_panasonic_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt1_Panasonic.avc +fate-h264-conformance-frext-frext2_panasonic_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt2_Panasonic.avc -vsync 0 +fate-h264-conformance-frext-frext3_panasonic_d: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt3_Panasonic.avc +fate-h264-conformance-frext-frext4_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt4_Panasonic.avc +fate-h264-conformance-frext-frext_mmco4_sony_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt_MMCO4_Sony_B.264 +fate-h264-conformance-frext-hcaff1_hhi_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HCAFF1_HHI.264 +fate-h264-conformance-frext-hcafr1_hhi_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HCAFR1_HHI.264 +fate-h264-conformance-frext-hcafr2_hhi_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HCAFR2_HHI.264 +fate-h264-conformance-frext-hcafr3_hhi_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HCAFR3_HHI.264 +fate-h264-conformance-frext-hcafr4_hhi_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HCAFR4_HHI.264 +fate-h264-conformance-frext-hcamff1_hhi_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HCAMFF1_HHI.264 +fate-h264-conformance-frext-hi422fr10_sony_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/Hi422FR10_SONY_B.264 +fate-h264-conformance-frext-hi422fr13_sony_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/Hi422FR13_SONY_B.264 -pix_fmt yuv422p10le +fate-h264-conformance-frext-hi422fr1_sony_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/Hi422FR1_SONY_A.jsv +fate-h264-conformance-frext-hi422fr6_sony_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/Hi422FR6_SONY_A.jsv -pix_fmt yuv422p10le +fate-h264-conformance-frext-hpca_brcm_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCA_BRCM_C.264 +fate-h264-conformance-frext-hpcadq_brcm_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCADQ_BRCM_B.264 +fate-h264-conformance-frext-hpcafl_bcrm_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCAFL_BRCM_C.264 -vsync drop +fate-h264-conformance-frext-hpcaflnl_bcrm_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCAFLNL_BRCM_C.264 -vsync drop +fate-h264-conformance-frext-hpcalq_brcm_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCALQ_BRCM_B.264 +fate-h264-conformance-frext-hpcamapalq_bcrm_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCAMAPALQ_BRCM_B.264 -vsync 0 +fate-h264-conformance-frext-hpcamolq_brcm_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCAMOLQ_BRCM_B.264 +fate-h264-conformance-frext-hpcanl_brcm_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCANL_BRCM_C.264 +fate-h264-conformance-frext-hpcaq2lq_brcm_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCAQ2LQ_BRCM_B.264 +fate-h264-conformance-frext-hpcv_brcm_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCV_BRCM_A.264 +fate-h264-conformance-frext-hpcvfl_bcrm_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCVFL_BRCM_A.264 -vsync drop +fate-h264-conformance-frext-hpcvflnl_bcrm_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCVFLNL_BRCM_A.264 -vsync drop +fate-h264-conformance-frext-hpcvmolq_brcm_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCVMOLQ_BRCM_B.264 +fate-h264-conformance-frext-hpcvnl_brcm_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCVNL_BRCM_A.264 +fate-h264-conformance-frext-pph10i1_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I1_Panasonic_A.264 -pix_fmt yuv420p10le +fate-h264-conformance-frext-pph10i2_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I2_Panasonic_A.264 -pix_fmt yuv420p10le +fate-h264-conformance-frext-pph10i3_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I3_Panasonic_A.264 -pix_fmt yuv420p10le +fate-h264-conformance-frext-pph10i4_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I4_Panasonic_A.264 -pix_fmt yuv420p10le +fate-h264-conformance-frext-pph10i5_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I5_Panasonic_A.264 -pix_fmt yuv420p10le +fate-h264-conformance-frext-pph10i6_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I6_Panasonic_A.264 -pix_fmt yuv420p10le +fate-h264-conformance-frext-pph10i7_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I7_Panasonic_A.264 -pix_fmt yuv420p10le +fate-h264-conformance-frext-pph422i1_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH422I1_Panasonic_A.264 -pix_fmt yuv422p10le +fate-h264-conformance-frext-pph422i2_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH422I2_Panasonic_A.264 -pix_fmt yuv422p10le +fate-h264-conformance-frext-pph422i3_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH422I3_Panasonic_A.264 -pix_fmt yuv422p10le +fate-h264-conformance-frext-pph422i4_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH422I4_Panasonic_A.264 -pix_fmt yuv422p10le +fate-h264-conformance-frext-pph422i5_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH422I5_Panasonic_A.264 -pix_fmt yuv422p10le +fate-h264-conformance-frext-pph422i6_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH422I6_Panasonic_A.264 -pix_fmt yuv422p10le +fate-h264-conformance-frext-pph422i7_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH422I7_Panasonic_A.264 -pix_fmt yuv422p10le +fate-h264-conformance-hcbp2_hhi_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/HCBP2_HHI_A.264 +fate-h264-conformance-hcmp1_hhi_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/HCMP1_HHI_A.264 +fate-h264-conformance-ls_sva_d: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/LS_SVA_D.264 +fate-h264-conformance-midr_mw_d: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MIDR_MW_D.264 +fate-h264-conformance-mps_mw_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MPS_MW_A.264 +fate-h264-conformance-mr1_bt_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MR1_BT_A.h264 +fate-h264-conformance-mr1_mw_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MR1_MW_A.264 +fate-h264-conformance-mr2_mw_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MR2_MW_A.264 +fate-h264-conformance-mr2_tandberg_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MR2_TANDBERG_E.264 +fate-h264-conformance-mr3_tandberg_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MR3_TANDBERG_B.264 +fate-h264-conformance-mr4_tandberg_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MR4_TANDBERG_C.264 +fate-h264-conformance-mr5_tandberg_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MR5_TANDBERG_C.264 +fate-h264-conformance-mr6_bt_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MR6_BT_B.h264 +fate-h264-conformance-mr7_bt_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MR7_BT_B.h264 +fate-h264-conformance-mr8_bt_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MR8_BT_B.h264 +fate-h264-conformance-mr9_bt_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MR9_BT_B.h264 +fate-h264-conformance-mv1_brcm_d: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/src19td.IBP.264 +fate-h264-conformance-nl1_sony_d: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/NL1_Sony_D.jsv +fate-h264-conformance-nl2_sony_h: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/NL2_Sony_H.jsv +fate-h264-conformance-nl3_sva_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/NL3_SVA_E.264 +fate-h264-conformance-nlmq1_jvc_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/NLMQ1_JVC_C.264 +fate-h264-conformance-nlmq2_jvc_c: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/NLMQ2_JVC_C.264 +fate-h264-conformance-nrf_mw_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/NRF_MW_E.264 +fate-h264-conformance-sharp_mp_field_1_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/Sharp_MP_Field_1_B.jvt +fate-h264-conformance-sharp_mp_field_2_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/Sharp_MP_Field_2_B.jvt +fate-h264-conformance-sharp_mp_field_3_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/Sharp_MP_Field_3_B.jvt +fate-h264-conformance-sharp_mp_paff_1r2: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/Sharp_MP_PAFF_1r2.jvt +fate-h264-conformance-sharp_mp_paff_2r: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/Sharp_MP_PAFF_2.jvt +fate-h264-conformance-sl1_sva_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/SL1_SVA_B.264 +fate-h264-conformance-sva_ba1_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/SVA_BA1_B.264 +fate-h264-conformance-sva_ba2_d: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/SVA_BA2_D.264 +fate-h264-conformance-sva_base_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/SVA_Base_B.264 +fate-h264-conformance-sva_cl1_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/SVA_CL1_E.264 +fate-h264-conformance-sva_fm1_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/SVA_FM1_E.264 +fate-h264-conformance-sva_nl1_b: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/SVA_NL1_B.264 +fate-h264-conformance-sva_nl2_e: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/SVA_NL2_E.264 -fate-h264-bsf-mp4toannexb: CMD = md5 -i $(SAMPLES)/h264/interlaced_crop.mp4 -vcodec copy -bsf h264_mp4toannexb -f h264 -fate-h264-extreme-plane-pred: CMD = framemd5 -i $(SAMPLES)/h264/extreme-plane-pred.h264 -fate-h264-interlace-crop: CMD = framecrc -i $(SAMPLES)/h264/interlaced_crop.mp4 -vframes 3 -fate-h264-lossless: CMD = framecrc -i $(SAMPLES)/h264/lossless.h264 +fate-h264-bsf-mp4toannexb: CMD = md5 -i $(TARGET_SAMPLES)/h264/interlaced_crop.mp4 -vcodec copy -bsf h264_mp4toannexb -f h264 +fate-h264-crop-to-container: CMD = framemd5 -i $(TARGET_SAMPLES)/h264/crop-to-container-dims-canon.mov +fate-h264-extreme-plane-pred: CMD = framemd5 -i $(TARGET_SAMPLES)/h264/extreme-plane-pred.h264 +fate-h264-interlace-crop: CMD = framecrc -i $(TARGET_SAMPLES)/h264/interlaced_crop.mp4 -vframes 3 +fate-h264-lossless: CMD = framecrc -i $(TARGET_SAMPLES)/h264/lossless.h264 -fate-h264-reinit-%: CMD = framecrc -i $(SAMPLES)/h264/$(@:fate-h264-%=%).h264 -vf format=yuv444p10,scale=352:288 +fate-h264-reinit-%: CMD = framecrc -i $(TARGET_SAMPLES)/h264/$(@:fate-h264-%=%).h264 -vf format=yuv444p10le,scale=w=352:h=288 diff --git a/ffmpeg/tests/fate/image.mak b/ffmpeg/tests/fate/image.mak index 2a6a4b2..7c2ac10 100644 --- a/ffmpeg/tests/fate/image.mak +++ b/ffmpeg/tests/fate/image.mak @@ -1,32 +1,55 @@ FATE_IMAGE-$(call DEMDEC, IMAGE2, DPX) += fate-dpx -fate-dpx: CMD = framecrc -i $(SAMPLES)/dpx/lighthouse_rgb48.dpx +fate-dpx: CMD = framecrc -i $(TARGET_SAMPLES)/dpx/lighthouse_rgb48.dpx + +FATE_EXR += fate-exr-slice-raw +fate-exr-slice-raw: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_slice_raw.exr -pix_fmt rgba64le + +FATE_EXR += fate-exr-slice-rle +fate-exr-slice-rle: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_slice_rle.exr -pix_fmt rgba64le + +FATE_EXR += fate-exr-slice-zip1 +fate-exr-slice-zip1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_slice_zip1.exr -pix_fmt rgba64le + +FATE_EXR += fate-exr-slice-zip16 +fate-exr-slice-zip16: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_slice_zip16.exr -pix_fmt rgba64le + +FATE_EXR += fate-exr-slice-pxr24 +fate-exr-slice-pxr24: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_slice_pxr24.exr -pix_fmt rgb48le + +FATE_EXR-$(call DEMDEC, IMAGE2, EXR) += $(FATE_EXR) + +FATE_IMAGE += $(FATE_EXR-yes) +fate-exr: $(FATE_EXR-yes) FATE_IMAGE-$(call DEMDEC, IMAGE2, PICTOR) += fate-pictor -fate-pictor: CMD = framecrc -i $(SAMPLES)/pictor/MFISH.PIC -pix_fmt rgb24 +fate-pictor: CMD = framecrc -i $(TARGET_SAMPLES)/pictor/MFISH.PIC -pix_fmt rgb24 + +FATE_IMAGE-$(call PARSERDEMDEC, PNG, IMAGE2PIPE, PNG) += fate-pngparser +fate-pngparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/png1/feed_4x_concat.png -pix_fmt rgba FATE_IMAGE-$(call DEMDEC, IMAGE2, PTX) += fate-ptx -fate-ptx: CMD = framecrc -i $(SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24 +fate-ptx: CMD = framecrc -i $(TARGET_SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24 FATE_SUNRASTER += fate-sunraster-1bit-raw -fate-sunraster-1bit-raw: CMD = framecrc -i $(SAMPLES)/sunraster/lena-1bit-raw.sun +fate-sunraster-1bit-raw: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/lena-1bit-raw.sun FATE_SUNRASTER += fate-sunraster-1bit-rle -fate-sunraster-1bit-rle: CMD = framecrc -i $(SAMPLES)/sunraster/lena-1bit-rle.sun +fate-sunraster-1bit-rle: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/lena-1bit-rle.sun FATE_SUNRASTER += fate-sunraster-8bit-raw -fate-sunraster-8bit-raw: CMD = framecrc -i $(SAMPLES)/sunraster/lena-8bit-raw.sun -pix_fmt rgb24 +fate-sunraster-8bit-raw: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/lena-8bit-raw.sun -pix_fmt rgb24 FATE_SUNRASTER += fate-sunraster-8bit_gray-raw -fate-sunraster-8bit_gray-raw: CMD = framecrc -i $(SAMPLES)/sunraster/gray.ras +fate-sunraster-8bit_gray-raw: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/gray.ras FATE_SUNRASTER += fate-sunraster-8bit-rle -fate-sunraster-8bit-rle: CMD = framecrc -i $(SAMPLES)/sunraster/lena-8bit-rle.sun -pix_fmt rgb24 +fate-sunraster-8bit-rle: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/lena-8bit-rle.sun -pix_fmt rgb24 FATE_SUNRASTER += fate-sunraster-24bit-raw -fate-sunraster-24bit-raw: CMD = framecrc -i $(SAMPLES)/sunraster/lena-24bit-raw.sun +fate-sunraster-24bit-raw: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/lena-24bit-raw.sun FATE_SUNRASTER += fate-sunraster-24bit-rle -fate-sunraster-24bit-rle: CMD = framecrc -i $(SAMPLES)/sunraster/lena-24bit-rle.sun +fate-sunraster-24bit-rle: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/lena-24bit-rle.sun FATE_SUNRASTER-$(call DEMDEC, IMAGE2, SUNRAST) += $(FATE_SUNRASTER) @@ -52,24 +75,24 @@ FATE_TARGA-$(call DEMDEC, IMAGE2, TARGA) += $(FATE_TARGA) FATE_IMAGE += $(FATE_TARGA-yes) fate-targa: $(FATE_TARGA-yes) -fate-targa-conformance-CBW8: CMD = framecrc -i $(SAMPLES)/targa-conformance/CBW8.TGA -fate-targa-conformance-CCM8: CMD = framecrc -i $(SAMPLES)/targa-conformance/CCM8.TGA -pix_fmt rgba -fate-targa-conformance-CTC16: CMD = framecrc -i $(SAMPLES)/targa-conformance/CTC16.TGA -pix_fmt rgb555le -fate-targa-conformance-CTC24: CMD = framecrc -i $(SAMPLES)/targa-conformance/CTC24.TGA -fate-targa-conformance-CTC32: CMD = framecrc -i $(SAMPLES)/targa-conformance/CTC32.TGA -pix_fmt bgra -fate-targa-conformance-UBW8: CMD = framecrc -i $(SAMPLES)/targa-conformance/UBW8.TGA -fate-targa-conformance-UCM8: CMD = framecrc -i $(SAMPLES)/targa-conformance/UCM8.TGA -pix_fmt rgba -fate-targa-conformance-UTC16: CMD = framecrc -i $(SAMPLES)/targa-conformance/UTC16.TGA -pix_fmt rgb555le -fate-targa-conformance-UTC24: CMD = framecrc -i $(SAMPLES)/targa-conformance/UTC24.TGA -fate-targa-conformance-UTC32: CMD = framecrc -i $(SAMPLES)/targa-conformance/UTC32.TGA -pix_fmt bgra +fate-targa-conformance-CBW8: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/CBW8.TGA +fate-targa-conformance-CCM8: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/CCM8.TGA -pix_fmt rgba +fate-targa-conformance-CTC16: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/CTC16.TGA -pix_fmt rgb555le +fate-targa-conformance-CTC24: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/CTC24.TGA +fate-targa-conformance-CTC32: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/CTC32.TGA -pix_fmt bgra +fate-targa-conformance-UBW8: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/UBW8.TGA +fate-targa-conformance-UCM8: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/UCM8.TGA -pix_fmt rgba +fate-targa-conformance-UTC16: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/UTC16.TGA -pix_fmt rgb555le +fate-targa-conformance-UTC24: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/UTC24.TGA +fate-targa-conformance-UTC32: CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/UTC32.TGA -pix_fmt bgra -fate-targa-top-to-bottom: CMD = framecrc -i $(SAMPLES)/targa/lena-top-to-bottom.tga +fate-targa-top-to-bottom: CMD = framecrc -i $(TARGET_SAMPLES)/targa/lena-top-to-bottom.tga FATE_TIFF += fate-tiff-fax-g3 -fate-tiff-fax-g3: CMD = framecrc -i $(SAMPLES)/CCITT_fax/G31D.TIF +fate-tiff-fax-g3: CMD = framecrc -i $(TARGET_SAMPLES)/CCITT_fax/G31D.TIF FATE_TIFF += fate-tiff-fax-g3s -fate-tiff-fax-g3s: CMD = framecrc -i $(SAMPLES)/CCITT_fax/G31DS.TIF +fate-tiff-fax-g3s: CMD = framecrc -i $(TARGET_SAMPLES)/CCITT_fax/G31DS.TIF FATE_TIFF-$(call DEMDEC, IMAGE2, TIFF) += $(FATE_TIFF) @@ -77,7 +100,7 @@ FATE_IMAGE += $(FATE_TIFF-yes) fate-tiff: $(FATE_TIFF-yes) FATE_IMAGE-$(call DEMDEC, IMAGE2, XFACE) += fate-xface -fate-xface: CMD = framecrc -i $(SAMPLES)/xface/lena.xface +fate-xface: CMD = framecrc -i $(TARGET_SAMPLES)/xface/lena.xface FATE_IMAGE += $(FATE_IMAGE-yes) diff --git a/ffmpeg/tests/fate/indeo.mak b/ffmpeg/tests/fate/indeo.mak index 5a99b46..e725a6b 100644 --- a/ffmpeg/tests/fate/indeo.mak +++ b/ffmpeg/tests/fate/indeo.mak @@ -1,14 +1,17 @@ FATE_INDEO-$(call DEMDEC, AVI, INDEO2) += fate-indeo2 -fate-indeo2: CMD = framecrc -i $(SAMPLES)/rt21/VPAR0026.AVI +fate-indeo2: CMD = framecrc -i $(TARGET_SAMPLES)/rt21/VPAR0026.AVI FATE_INDEO-$(call DEMDEC, MOV, INDEO3) += fate-indeo3 -fate-indeo3: CMD = framecrc -i $(SAMPLES)/iv32/cubes.mov +fate-indeo3: CMD = framecrc -i $(TARGET_SAMPLES)/iv32/cubes.mov + +FATE_INDEO-$(call DEMDEC, AVI, INDEO3) += fate-indeo3-2 +fate-indeo3-2: CMD = framecrc -i $(TARGET_SAMPLES)/iv32/OPENINGH.avi FATE_INDEO-$(call DEMDEC, AVI, INDEO4) += fate-indeo4 -fate-indeo4: CMD = framecrc -i $(SAMPLES)/iv41/indeo41-partial.avi -an +fate-indeo4: CMD = framecrc -i $(TARGET_SAMPLES)/iv41/indeo41-partial.avi -an FATE_INDEO-$(call DEMDEC, AVI, INDEO5) += fate-indeo5 -fate-indeo5: CMD = framecrc -i $(SAMPLES)/iv50/Educ_Movie_DeadlyForce.avi -an +fate-indeo5: CMD = framecrc -i $(TARGET_SAMPLES)/iv50/Educ_Movie_DeadlyForce.avi -an FATE_SAMPLES_AVCONV += $(FATE_INDEO-yes) fate-indeo: $(FATE_INDEO-yes) diff --git a/ffmpeg/tests/fate/libavcodec.mak b/ffmpeg/tests/fate/libavcodec.mak index 6e81f57..b5fa4f0 100644 --- a/ffmpeg/tests/fate/libavcodec.mak +++ b/ffmpeg/tests/fate/libavcodec.mak @@ -3,7 +3,7 @@ fate-golomb: libavcodec/golomb-test$(EXESUF) fate-golomb: CMD = run libavcodec/golomb-test fate-golomb: REF = /dev/null -FATE_LIBAVCODEC-yes += fate-idct8x8 +FATE_LIBAVCODEC-$(CONFIG_DCT) += fate-idct8x8 fate-idct8x8: libavcodec/dct-test$(EXESUF) fate-idct8x8: CMD = run libavcodec/dct-test -i fate-idct8x8: CMP = null diff --git a/ffmpeg/tests/fate/libavformat.mak b/ffmpeg/tests/fate/libavformat.mak index 8332246..d532adc 100644 --- a/ffmpeg/tests/fate/libavformat.mak +++ b/ffmpeg/tests/fate/libavformat.mak @@ -1,14 +1,14 @@ -FATE_LIBAVFORMAT += fate-noproxy +FATE_LIBAVFORMAT-$(CONFIG_NETWORK) += fate-noproxy fate-noproxy: libavformat/noproxy-test$(EXESUF) fate-noproxy: CMD = run libavformat/noproxy-test -FATE_LIBAVFORMAT += fate-srtp +FATE_LIBAVFORMAT-yes += fate-srtp fate-srtp: libavformat/srtp-test$(EXESUF) fate-srtp: CMD = run libavformat/srtp-test -FATE_LIBAVFORMAT += fate-url +FATE_LIBAVFORMAT-yes += fate-url fate-url: libavformat/url-test$(EXESUF) fate-url: CMD = run libavformat/url-test -FATE-$(CONFIG_AVFORMAT) += $(FATE_LIBAVFORMAT) +FATE-$(CONFIG_AVFORMAT) += $(FATE_LIBAVFORMAT-yes) fate-libavformat: $(FATE_LIBAVFORMAT) diff --git a/ffmpeg/tests/fate/libavutil.mak b/ffmpeg/tests/fate/libavutil.mak index 2508ba0..eeece47 100644 --- a/ffmpeg/tests/fate/libavutil.mak +++ b/ffmpeg/tests/fate/libavutil.mak @@ -54,6 +54,10 @@ FATE_LIBAVUTIL += fate-md5 fate-md5: libavutil/md5-test$(EXESUF) fate-md5: CMD = run libavutil/md5-test +FATE_LIBAVUTIL += fate-murmur3 +fate-murmur3: libavutil/murmur3-test$(EXESUF) +fate-murmur3: CMD = run libavutil/murmur3-test + FATE_LIBAVUTIL += fate-parseutils fate-parseutils: libavutil/parseutils-test$(EXESUF) fate-parseutils: CMD = run libavutil/parseutils-test @@ -62,10 +66,23 @@ FATE_LIBAVUTIL += fate-random_seed fate-random_seed: libavutil/random_seed-test$(EXESUF) fate-random_seed: CMD = run libavutil/random_seed-test +FATE_LIBAVUTIL += fate-ripemd +fate-ripemd: libavutil/ripemd-test$(EXESUF) +fate-ripemd: CMD = run libavutil/ripemd-test + FATE_LIBAVUTIL += fate-sha fate-sha: libavutil/sha-test$(EXESUF) fate-sha: CMD = run libavutil/sha-test +FATE_LIBAVUTIL += fate-sha512 +fate-sha512: libavutil/sha512-test$(EXESUF) +fate-sha512: CMD = run libavutil/sha512-test + +FATE_LIBAVUTIL += fate-tree +fate-tree: libavutil/tree-test$(EXESUF) +fate-tree: CMD = run libavutil/tree-test +fate-tree: REF = /dev/null + FATE_LIBAVUTIL += fate-xtea fate-xtea: libavutil/xtea-test$(EXESUF) fate-xtea: CMD = run libavutil/xtea-test diff --git a/ffmpeg/tests/fate/lossless-audio.mak b/ffmpeg/tests/fate/lossless-audio.mak index 8dc0f06..0736a01 100644 --- a/ffmpeg/tests/fate/lossless-audio.mak +++ b/ffmpeg/tests/fate/lossless-audio.mak @@ -1,29 +1,26 @@ FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, MOV, ALAC) += fate-lossless-alac -fate-lossless-alac: CMD = md5 -i $(SAMPLES)/lossless-audio/inside.m4a -f s16le +fate-lossless-alac: CMD = md5 -i $(TARGET_SAMPLES)/lossless-audio/inside.m4a -f s16le FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, MLP, MLP) += fate-lossless-meridianaudio -fate-lossless-meridianaudio: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.mlp -f s16le - -FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, APE, APE) += fate-lossless-monkeysaudio -fate-lossless-monkeysaudio: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.ape -f s16le +fate-lossless-meridianaudio: CMD = md5 -i $(TARGET_SAMPLES)/lossless-audio/luckynight-partial.mlp -f s16le FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, RM, RALF) += fate-ralf -fate-ralf: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.rmvb -vn -f s16le +fate-ralf: CMD = md5 -i $(TARGET_SAMPLES)/lossless-audio/luckynight-partial.rmvb -vn -f s16le FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, SHORTEN, SHORTEN) += fate-lossless-shorten -fate-lossless-shorten: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.shn -f s16le +fate-lossless-shorten: CMD = md5 -i $(TARGET_SAMPLES)/lossless-audio/luckynight-partial.shn -f s16le FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, TAK, TAK) += fate-lossless-tak -fate-lossless-tak: CMD = crc -i $(SAMPLES)/lossless-audio/luckynight-partial.tak +fate-lossless-tak: CMD = crc -i $(TARGET_SAMPLES)/lossless-audio/luckynight-partial.tak FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, TTA, TTA) += fate-lossless-tta -fate-lossless-tta: CMD = crc -i $(SAMPLES)/lossless-audio/inside.tta +fate-lossless-tta: CMD = crc -i $(TARGET_SAMPLES)/lossless-audio/inside.tta FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, TTA, TTA) += fate-lossless-tta-encrypted -fate-lossless-tta-encrypted: CMD = crc -password ffmpeg -i $(SAMPLES)/lossless-audio/encrypted.tta +fate-lossless-tta-encrypted: CMD = crc -password ffmpeg -i $(TARGET_SAMPLES)/lossless-audio/encrypted.tta FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, ASF, WMALOSSLESS) += fate-lossless-wma -fate-lossless-wma: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.wma -f s16le +fate-lossless-wma: CMD = md5 -i $(TARGET_SAMPLES)/lossless-audio/luckynight-partial.wma -f s16le FATE_SAMPLES_LOSSLESS_AUDIO += $(FATE_SAMPLES_LOSSLESS_AUDIO-yes) diff --git a/ffmpeg/tests/fate/lossless-video.mak b/ffmpeg/tests/fate/lossless-video.mak index f918ac4..11eba30 100644 --- a/ffmpeg/tests/fate/lossless-video.mak +++ b/ffmpeg/tests/fate/lossless-video.mak @@ -1,50 +1,56 @@ FATE_CLLC += fate-cllc-argb -fate-cllc-argb: CMD = framecrc -i $(SAMPLES)/cllc/sample-cllc-argb.avi +fate-cllc-argb: CMD = framecrc -i $(TARGET_SAMPLES)/cllc/sample-cllc-argb.avi FATE_CLLC += fate-cllc-rgb -fate-cllc-rgb: CMD = framecrc -i $(SAMPLES)/cllc/sample-cllc-rgb.avi +fate-cllc-rgb: CMD = framecrc -i $(TARGET_SAMPLES)/cllc/sample-cllc-rgb.avi + +FATE_CLLC += fate-cllc-yuy2-noblock +fate-cllc-yuy2-noblock: CMD = framecrc -i $(TARGET_SAMPLES)/cllc/sample-cllc-yuy2-noblock.avi FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, CLLC) += $(FATE_CLLC) fate-cllc: $(FATE_CLLC) FATE_LAGARITH += fate-lagarith-rgb24 -fate-lagarith-rgb24: CMD = framecrc -i $(SAMPLES)/lagarith/lag-rgb24.avi +fate-lagarith-rgb24: CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lag-rgb24.avi FATE_LAGARITH += fate-lagarith-rgb32 -fate-lagarith-rgb32: CMD = framecrc -i $(SAMPLES)/lagarith/lag-rgb32.avi -pix_fmt bgra +fate-lagarith-rgb32: CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lag-rgb32.avi -pix_fmt bgra FATE_LAGARITH += fate-lagarith-yuy2 -fate-lagarith-yuy2: CMD = framecrc -i $(SAMPLES)/lagarith/lag-yuy2.avi +fate-lagarith-yuy2: CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lag-yuy2.avi FATE_LAGARITH += fate-lagarith-yv12 -fate-lagarith-yv12: CMD = framecrc -i $(SAMPLES)/lagarith/lag-yv12.avi +fate-lagarith-yv12: CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lag-yv12.avi + +FATE_LAGARITH += fate-lagarith-red +fate-lagarith-red: CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lagarith-red.avi FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, LAGARITH) += $(FATE_LAGARITH) fate-lagarith: $(FATE_LAGARITH) FATE_LOCO += fate-loco-rgb -fate-loco-rgb: CMD = framecrc -i $(SAMPLES)/loco/pig-loco-rgb.avi +fate-loco-rgb: CMD = framecrc -i $(TARGET_SAMPLES)/loco/pig-loco-rgb.avi FATE_LOCO += fate-loco-yuy2 -fate-loco-yuy2: CMD = framecrc -i $(SAMPLES)/loco/pig-loco-0.avi +fate-loco-yuy2: CMD = framecrc -i $(TARGET_SAMPLES)/loco/pig-loco-0.avi FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, LOCO) += $(FATE_LOCO) fate-loco: $(FATE_LOCO) FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, MSRLE) += fate-msrle-8bit -fate-msrle-8bit: CMD = framecrc -i $(SAMPLES)/msrle/Search-RLE.avi -pix_fmt rgb24 +fate-msrle-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/msrle/Search-RLE.avi -pix_fmt rgb24 FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, MSZH) += fate-mszh -fate-mszh: CMD = framecrc -i $(SAMPLES)/lcl/mszh-1frame.avi +fate-mszh: CMD = framecrc -i $(TARGET_SAMPLES)/lcl/mszh-1frame.avi FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, VBLE) += fate-vble -fate-vble: CMD = framecrc -i $(SAMPLES)/vble/flowers-partial-2MB.avi +fate-vble: CMD = framecrc -i $(TARGET_SAMPLES)/vble/flowers-partial-2MB.avi FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, ZEROCODEC) += fate-zerocodec -fate-zerocodec: CMD = framecrc -i $(SAMPLES)/zerocodec/sample-zeco.avi +fate-zerocodec: CMD = framecrc -i $(TARGET_SAMPLES)/zerocodec/sample-zeco.avi FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, ZLIB) += fate-zlib -fate-zlib: CMD = framecrc -i $(SAMPLES)/lcl/zlib-1frame.avi +fate-zlib: CMD = framecrc -i $(TARGET_SAMPLES)/lcl/zlib-1frame.avi FATE_LOSSLESS_VIDEO += $(FATE_LOSSLESS_VIDEO-yes) diff --git a/ffmpeg/tests/fate/microsoft.mak b/ffmpeg/tests/fate/microsoft.mak index 6347f20..630dda8 100644 --- a/ffmpeg/tests/fate/microsoft.mak +++ b/ffmpeg/tests/fate/microsoft.mak @@ -1,46 +1,46 @@ FATE_MICROSOFT-$(call DEMDEC, AVI, MSMPEG4V1) += fate-msmpeg4v1 -fate-msmpeg4v1: CMD = framecrc -flags +bitexact -idct simple -i $(SAMPLES)/msmpeg4v1/mpg4.avi -an +fate-msmpeg4v1: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/msmpeg4v1/mpg4.avi -an FATE_MSVIDEO1 += fate-msvideo1-8bit -fate-msvideo1-8bit: CMD = framecrc -i $(SAMPLES)/cram/skating.avi -t 1 -pix_fmt rgb24 +fate-msvideo1-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/cram/skating.avi -t 1 -pix_fmt rgb24 FATE_MSVIDEO1 += fate-msvideo1-16bit -fate-msvideo1-16bit: CMD = framecrc -i $(SAMPLES)/cram/clock-cram16.avi -pix_fmt rgb24 +fate-msvideo1-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/cram/clock-cram16.avi -pix_fmt rgb24 FATE_MICROSOFT-$(call DEMDEC, AVI, MSVIDEO1) += $(FATE_MSVIDEO1) fate-msvideo1: $(FATE_MSVIDEO1) FATE_WMV8_DRM += fate-wmv8-drm # discard last packet to avoid fails due to overread of VC-1 decoder -fate-wmv8-drm: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(SAMPLES)/wmv8/wmv_drm.wmv -an -vframes 162 +fate-wmv8-drm: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(TARGET_SAMPLES)/wmv8/wmv_drm.wmv -an -frames:v 129 FATE_WMV8_DRM += fate-wmv8-drm-nodec -fate-wmv8-drm-nodec: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(SAMPLES)/wmv8/wmv_drm.wmv -acodec copy -vcodec copy +fate-wmv8-drm-nodec: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(TARGET_SAMPLES)/wmv8/wmv_drm.wmv -acodec copy -vcodec copy #FATE_MICROSOFT += fate-wmv8-x8intra FATE_TESTS-no += fate-wmv8-x8intra -fate-wmv8-x8intra: CMD = framecrc -flags +bitexact -idct 19 -i $(SAMPLES)/wmv8/wmv8_x8intra.wmv -an +fate-wmv8-x8intra: CMD = framecrc -flags +bitexact -idct 19 -i $(TARGET_SAMPLES)/wmv8/wmv8_x8intra.wmv -an FATE_MICROSOFT-$(call DEMDEC, ASF, WMV3) += $(FATE_WMV8_DRM) fate-wmv8_drm: $(FATE_WMV8_DRM) FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa00040 -fate-vc1_sa00040: CMD = framecrc -i $(SAMPLES)/vc1/SA00040.vc1 +fate-vc1_sa00040: CMD = framecrc -i $(TARGET_SAMPLES)/vc1/SA00040.vc1 FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa00050 -fate-vc1_sa00050: CMD = framecrc -i $(SAMPLES)/vc1/SA00050.vc1 +fate-vc1_sa00050: CMD = framecrc -i $(TARGET_SAMPLES)/vc1/SA00050.vc1 FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa10091 -fate-vc1_sa10091: CMD = framecrc -i $(SAMPLES)/vc1/SA10091.vc1 +fate-vc1_sa10091: CMD = framecrc -i $(TARGET_SAMPLES)/vc1/SA10091.vc1 FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa10143 -fate-vc1_sa10143: CMD = framecrc -i $(SAMPLES)/vc1/SA10143.vc1 +fate-vc1_sa10143: CMD = framecrc -i $(TARGET_SAMPLES)/vc1/SA10143.vc1 FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa20021 -fate-vc1_sa20021: CMD = framecrc -i $(SAMPLES)/vc1/SA20021.vc1 +fate-vc1_sa20021: CMD = framecrc -i $(TARGET_SAMPLES)/vc1/SA20021.vc1 FATE_VC1-$(CONFIG_MOV_DEMUXER) += fate-vc1-ism -fate-vc1-ism: CMD = framecrc -i $(SAMPLES)/isom/vc1-wmapro.ism -an +fate-vc1-ism: CMD = framecrc -i $(TARGET_SAMPLES)/isom/vc1-wmapro.ism -an FATE_MICROSOFT-$(CONFIG_VC1_DECODER) += $(FATE_VC1-yes) fate-vc1: $(FATE_VC1-yes) diff --git a/ffmpeg/tests/fate/mp3.mak b/ffmpeg/tests/fate/mp3.mak index 1986061..57ee084 100644 --- a/ffmpeg/tests/fate/mp3.mak +++ b/ffmpeg/tests/fate/mp3.mak @@ -1,33 +1,33 @@ FATE_MP3 += fate-mp3-float-conf-compl -fate-mp3-float-conf-compl: CMD = pcm -acodec mp3float -i $(SAMPLES)/mp3-conformance/compl.bit +fate-mp3-float-conf-compl: CMD = pcm -acodec mp3float -i $(TARGET_SAMPLES)/mp3-conformance/compl.bit fate-mp3-float-conf-compl: REF = $(SAMPLES)/mp3-conformance/compl.pcm FATE_MP3 += fate-mp3-float-conf-he_32khz -fate-mp3-float-conf-he_32khz: CMD = pcm -acodec mp3float -i $(SAMPLES)/mp3-conformance/he_32khz.bit -fs 343296 +fate-mp3-float-conf-he_32khz: CMD = pcm -acodec mp3float -i $(TARGET_SAMPLES)/mp3-conformance/he_32khz.bit -fs 343296 fate-mp3-float-conf-he_32khz: REF = $(SAMPLES)/mp3-conformance/he_32khz.pcm FATE_MP3 += fate-mp3-float-conf-he_44khz -fate-mp3-float-conf-he_44khz: CMD = pcm -acodec mp3float -i $(SAMPLES)/mp3-conformance/he_44khz.bit -fs 942336 +fate-mp3-float-conf-he_44khz: CMD = pcm -acodec mp3float -i $(TARGET_SAMPLES)/mp3-conformance/he_44khz.bit -fs 942336 fate-mp3-float-conf-he_44khz: REF = $(SAMPLES)/mp3-conformance/he_44khz.pcm FATE_MP3 += fate-mp3-float-conf-he_48khz -fate-mp3-float-conf-he_48khz: CMD = pcm -acodec mp3float -i $(SAMPLES)/mp3-conformance/he_48khz.bit -fs 343296 +fate-mp3-float-conf-he_48khz: CMD = pcm -acodec mp3float -i $(TARGET_SAMPLES)/mp3-conformance/he_48khz.bit -fs 343296 fate-mp3-float-conf-he_48khz: REF = $(SAMPLES)/mp3-conformance/he_48khz.pcm FATE_MP3 += fate-mp3-float-conf-hecommon -fate-mp3-float-conf-hecommon: CMD = pcm -acodec mp3float -i $(SAMPLES)/mp3-conformance/hecommon.bit -fs 133632 +fate-mp3-float-conf-hecommon: CMD = pcm -acodec mp3float -i $(TARGET_SAMPLES)/mp3-conformance/hecommon.bit -fs 133632 fate-mp3-float-conf-hecommon: REF = $(SAMPLES)/mp3-conformance/hecommon.pcm FATE_MP3 += fate-mp3-float-conf-si -fate-mp3-float-conf-si: CMD = pcm -acodec mp3float -i $(SAMPLES)/mp3-conformance/si.bit -fs 269568 +fate-mp3-float-conf-si: CMD = pcm -acodec mp3float -i $(TARGET_SAMPLES)/mp3-conformance/si.bit -fs 269568 fate-mp3-float-conf-si: REF = $(SAMPLES)/mp3-conformance/si.pcm FATE_MP3 += fate-mp3-float-conf-si_block -fate-mp3-float-conf-si_block: CMD = pcm -acodec mp3float -i $(SAMPLES)/mp3-conformance/si_block.bit -fs 145152 +fate-mp3-float-conf-si_block: CMD = pcm -acodec mp3float -i $(TARGET_SAMPLES)/mp3-conformance/si_block.bit -fs 145152 fate-mp3-float-conf-si_block: REF = $(SAMPLES)/mp3-conformance/si_block.pcm FATE_MP3 += fate-mp3-float-extra_overread -fate-mp3-float-extra_overread: CMD = pcm -c:a mp3float -i $(SAMPLES)/mpegaudio/extra_overread.mp3 +fate-mp3-float-extra_overread: CMD = pcm -c:a mp3float -i $(TARGET_SAMPLES)/mpegaudio/extra_overread.mp3 fate-mp3-float-extra_overread: REF = $(SAMPLES)/mpegaudio/extra_overread.pcm $(FATE_MP3): CMP = stddev diff --git a/ffmpeg/tests/fate/mpc.mak b/ffmpeg/tests/fate/mpc.mak index 53d236e..4a01273 100644 --- a/ffmpeg/tests/fate/mpc.mak +++ b/ffmpeg/tests/fate/mpc.mak @@ -1,11 +1,11 @@ FATE_MPC-$(CONFIG_MPC_DEMUXER) += fate-mpc7-demux -fate-mpc7-demux: CMD = crc -i $(SAMPLES)/musepack/inside-mp7.mpc -acodec copy +fate-mpc7-demux: CMD = crc -i $(TARGET_SAMPLES)/musepack/inside-mp7.mpc -acodec copy FATE_MPC-$(CONFIG_MPC8_DEMUXER) += fate-mpc8-demux -fate-mpc8-demux: CMD = crc -i $(SAMPLES)/musepack/inside-mp8.mpc -acodec copy +fate-mpc8-demux: CMD = crc -i $(TARGET_SAMPLES)/musepack/inside-mp8.mpc -acodec copy FATE_MPC-$(call DEMDEC, MPC, MPC7) += fate-musepack7 -fate-musepack7: CMD = pcm -i $(SAMPLES)/musepack/inside-mp7.mpc +fate-musepack7: CMD = pcm -i $(TARGET_SAMPLES)/musepack/inside-mp7.mpc fate-musepack7: CMP = oneoff fate-musepack7: REF = $(SAMPLES)/musepack/inside-mp7.pcm diff --git a/ffmpeg/tests/fate/pcm.mak b/ffmpeg/tests/fate/pcm.mak index 4a3822f..9ba4be5 100644 --- a/ffmpeg/tests/fate/pcm.mak +++ b/ffmpeg/tests/fate/pcm.mak @@ -1,26 +1,26 @@ FATE_SAMPLES_PCM-$(call DEMDEC, WAV, PCM_U8) += fate-iff-pcm -fate-iff-pcm: CMD = md5 -i $(SAMPLES)/iff/Bells -f s16le +fate-iff-pcm: CMD = md5 -i $(TARGET_SAMPLES)/iff/Bells -f s16le FATE_SAMPLES_PCM-$(call DEMDEC, MPEGPS, PCM_DVD) += fate-pcm_dvd -fate-pcm_dvd: CMD = framecrc -i $(SAMPLES)/pcm-dvd/coolitnow-partial.vob -vn +fate-pcm_dvd: CMD = framecrc -i $(TARGET_SAMPLES)/pcm-dvd/coolitnow-partial.vob -vn FATE_SAMPLES_PCM-$(call DEMDEC, EA, PCM_S16LE_PLANAR) += fate-pcm-planar -fate-pcm-planar: CMD = framecrc -i $(SAMPLES)/ea-mad/xeasport.mad -vn +fate-pcm-planar: CMD = framecrc -i $(TARGET_SAMPLES)/ea-mad/xeasport.mad -vn FATE_SAMPLES_PCM-$(call DEMDEC, MOV, PCM_S16BE) += fate-pcm_s16be-stereo -fate-pcm_s16be-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-B-twos.mov -f s16le +fate-pcm_s16be-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-B-twos.mov -f s16le FATE_SAMPLES_PCM-$(call DEMDEC, MOV, PCM_S16LE) += fate-pcm_s16le-stereo -fate-pcm_s16le-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-L-sowt.mov -f s16le +fate-pcm_s16le-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-L-sowt.mov -f s16le FATE_SAMPLES_PCM-$(call DEMDEC, MOV, PCM_U8) += fate-pcm_u8-mono -fate-pcm_u8-mono: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-1-8-raw.mov -f s16le +fate-pcm_u8-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-8-raw.mov -f s16le FATE_SAMPLES_PCM-$(call DEMDEC, MOV, PCM_U8) += fate-pcm_u8-stereo -fate-pcm_u8-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-8-raw.mov -f s16le +fate-pcm_u8-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-8-raw.mov -f s16le FATE_SAMPLES_PCM-$(call DEMDEC, W64, PCM_S16LE) += fate-w64 -fate-w64: CMD = crc -i $(SAMPLES)/w64/w64-pcm16.w64 +fate-w64: CMD = crc -i $(TARGET_SAMPLES)/w64/w64-pcm16.w64 FATE_PCM-$(call ENCMUX, PCM_S24DAUD, DAUD) += fate-dcinema-encode fate-dcinema-encode: tests/data/asynth-96000-6.wav diff --git a/ffmpeg/tests/fate/probe.mak b/ffmpeg/tests/fate/probe.mak index 1166de4..9f9dd4a 100644 --- a/ffmpeg/tests/fate/probe.mak +++ b/ffmpeg/tests/fate/probe.mak @@ -17,4 +17,4 @@ fate-probe-format: $(FATE_PROBE_FORMAT) $(FATE_PROBE_FORMAT): ffprobe$(EXESUF) $(FATE_PROBE_FORMAT): CMP = oneline -fate-probe-format-%: CMD = probefmt $(SAMPLES)/probe-format/$(@:fate-probe-format-%=%) +fate-probe-format-%: CMD = probefmt $(TARGET_SAMPLES)/probe-format/$(@:fate-probe-format-%=%) diff --git a/ffmpeg/tests/fate/prores.mak b/ffmpeg/tests/fate/prores.mak index 00e2159..e88df5f 100644 --- a/ffmpeg/tests/fate/prores.mak +++ b/ffmpeg/tests/fate/prores.mak @@ -3,12 +3,18 @@ FATE_PRORES = fate-prores-422 \ fate-prores-422_lt \ fate-prores-422_proxy \ fate-prores-alpha \ + fate-prores-alpha_skip \ + fate-prores-transparency \ + fate-prores-transparency_skip \ FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, PRORES) += $(FATE_PRORES) fate-prores: $(FATE_PRORES) -fate-prores-422: CMD = framecrc -flags +bitexact -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422.mov -pix_fmt yuv422p10le -fate-prores-422_hq: CMD = framecrc -flags +bitexact -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_HQ.mov -pix_fmt yuv422p10le -fate-prores-422_lt: CMD = framecrc -flags +bitexact -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_LT.mov -pix_fmt yuv422p10le -fate-prores-422_proxy: CMD = framecrc -flags +bitexact -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_Proxy.mov -pix_fmt yuv422p10le -fate-prores-alpha: CMD = framecrc -flags +bitexact -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_with_Alpha.mov -pix_fmt yuv444p10le +fate-prores-422: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/prores/Sequence_1-Apple_ProRes_422.mov -pix_fmt yuv422p10le +fate-prores-422_hq: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/prores/Sequence_1-Apple_ProRes_422_HQ.mov -pix_fmt yuv422p10le +fate-prores-422_lt: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/prores/Sequence_1-Apple_ProRes_422_LT.mov -pix_fmt yuv422p10le +fate-prores-422_proxy: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/prores/Sequence_1-Apple_ProRes_422_Proxy.mov -pix_fmt yuv422p10le +fate-prores-alpha: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/prores/Sequence_1-Apple_ProRes_with_Alpha.mov -pix_fmt yuva444p10le +fate-prores-alpha_skip: CMD = framecrc -flags +bitexact -skip_alpha 1 -i $(TARGET_SAMPLES)/prores/Sequence_1-Apple_ProRes_with_Alpha.mov -pix_fmt yuv444p10le +fate-prores-transparency: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/prores/prores4444_with_transparency.mov -pix_fmt yuva444p10le +fate-prores-transparency_skip: CMD = framecrc -flags +bitexact -skip_alpha 1 -i $(TARGET_SAMPLES)/prores/prores4444_with_transparency.mov -pix_fmt yuv444p10le diff --git a/ffmpeg/tests/fate/qt.mak b/ffmpeg/tests/fate/qt.mak index 03b2fce..6d78822 100644 --- a/ffmpeg/tests/fate/qt.mak +++ b/ffmpeg/tests/fate/qt.mak @@ -1,53 +1,53 @@ FATE_QT-$(call DEMDEC, MOV, EIGHTBPS) += fate-8bps -fate-8bps: CMD = framecrc -i $(SAMPLES)/8bps/full9iron-partial.mov -pix_fmt rgb24 +fate-8bps: CMD = framecrc -i $(TARGET_SAMPLES)/8bps/full9iron-partial.mov -pix_fmt rgb24 FATE_QT-$(call DEMDEC, MOV, QDM2) += fate-qdm2 -fate-qdm2: CMD = pcm -i $(SAMPLES)/qt-surge-suite/surge-2-16-B-QDM2.mov +fate-qdm2: CMD = pcm -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-B-QDM2.mov fate-qdm2: CMP = oneoff fate-qdm2: REF = $(SAMPLES)/qt-surge-suite/surge-2-16-B-QDM2.pcm fate-qdm2: FUZZ = 2 FATE_QT-$(call DEMDEC, MOV, PCM_ALAW) += fate-qt-alaw-mono -fate-qt-alaw-mono: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-1-16-B-alaw.mov -f s16le +fate-qt-alaw-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-16-B-alaw.mov -f s16le FATE_QT-$(call DEMDEC, MOV, PCM_ALAW) += fate-qt-alaw-stereo -fate-qt-alaw-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-B-alaw.mov -f s16le +fate-qt-alaw-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-B-alaw.mov -f s16le FATE_QT-$(call DEMDEC, MOV, ADPCM_IMA_QT) += fate-qt-ima4-mono -fate-qt-ima4-mono: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-1-16-B-ima4.mov -f s16le +fate-qt-ima4-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-16-B-ima4.mov -f s16le FATE_QT-$(call DEMDEC, MOV, ADPCM_IMA_QT) += fate-qt-ima4-stereo -fate-qt-ima4-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-B-ima4.mov -f s16le +fate-qt-ima4-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-B-ima4.mov -f s16le FATE_QT-$(call DEMDEC, MOV, MACE3) += fate-qt-mac3-mono -fate-qt-mac3-mono: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-1-8-MAC3.mov -f s16le +fate-qt-mac3-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-8-MAC3.mov -f s16le FATE_QT-$(call DEMDEC, MOV, MACE3) += fate-qt-mac3-stereo -fate-qt-mac3-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-8-MAC3.mov -f s16le +fate-qt-mac3-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-8-MAC3.mov -f s16le FATE_QT-$(call DEMDEC, MOV, MACE6) += fate-qt-mac6-mono -fate-qt-mac6-mono: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-1-8-MAC6.mov -f s16le +fate-qt-mac6-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-8-MAC6.mov -f s16le FATE_QT-$(call DEMDEC, MOV, MACE6) += fate-qt-mac6-stereo -fate-qt-mac6-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-8-MAC6.mov -f s16le +fate-qt-mac6-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-8-MAC6.mov -f s16le FATE_QT-$(call DEMDEC, MOV, PCM_MULAW) += fate-qt-ulaw-mono -fate-qt-ulaw-mono: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-1-16-B-ulaw.mov -f s16le +fate-qt-ulaw-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-16-B-ulaw.mov -f s16le FATE_QT-$(call DEMDEC, MOV, PCM_MULAW) += fate-qt-ulaw-stereo -fate-qt-ulaw-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-B-ulaw.mov -f s16le +fate-qt-ulaw-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-B-ulaw.mov -f s16le FATE_QT-$(call DEMDEC, MOV, QDRAW) += fate-quickdraw -fate-quickdraw: CMD = framecrc -i $(SAMPLES)/quickdraw/Airplane.mov -pix_fmt rgb24 +fate-quickdraw: CMD = framecrc -i $(TARGET_SAMPLES)/quickdraw/Airplane.mov -pix_fmt rgb24 FATE_QT-$(call DEMDEC, MOV, RPZA) += fate-rpza -fate-rpza: CMD = framecrc -i $(SAMPLES)/rpza/rpza2.mov -t 2 -pix_fmt rgb24 +fate-rpza: CMD = framecrc -i $(TARGET_SAMPLES)/rpza/rpza2.mov -t 2 -pix_fmt rgb24 FATE_QT-$(call DEMDEC, MOV, SVQ1) += fate-svq1 -fate-svq1: CMD = framecrc -i $(SAMPLES)/svq1/marymary-shackles.mov -an -t 10 +fate-svq1: CMD = framecrc -i $(TARGET_SAMPLES)/svq1/marymary-shackles.mov -an -t 10 FATE_QT-$(call ALLYES, MOV_DEMUXER SVQ3_DECODER ZLIB) += fate-svq3 -fate-svq3: CMD = framecrc -i $(SAMPLES)/svq3/Vertical400kbit.sorenson3.mov -t 6 -an +fate-svq3: CMD = framecrc -i $(TARGET_SAMPLES)/svq3/Vertical400kbit.sorenson3.mov -t 6 -an FATE_QT += $(FATE_QT-yes) diff --git a/ffmpeg/tests/fate/qtrle.mak b/ffmpeg/tests/fate/qtrle.mak index d8a6ecf..774a816 100644 --- a/ffmpeg/tests/fate/qtrle.mak +++ b/ffmpeg/tests/fate/qtrle.mak @@ -1,23 +1,23 @@ FATE_QTRLE += fate-qtrle-1bit -fate-qtrle-1bit: CMD = framecrc -i $(SAMPLES)/qtrle/Animation-Monochrome.mov -an +fate-qtrle-1bit: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/Animation-Monochrome.mov -an FATE_QTRLE += fate-qtrle-2bit -fate-qtrle-2bit: CMD = framecrc -i $(SAMPLES)/qtrle/Animation-4Greys.mov -pix_fmt rgb24 -an +fate-qtrle-2bit: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/Animation-4Greys.mov -pix_fmt rgb24 -an FATE_QTRLE += fate-qtrle-4bit -fate-qtrle-4bit: CMD = framecrc -i $(SAMPLES)/qtrle/Animation-16Greys.mov -pix_fmt rgb24 -an +fate-qtrle-4bit: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/Animation-16Greys.mov -pix_fmt rgb24 -an FATE_QTRLE += fate-qtrle-8bit -fate-qtrle-8bit: CMD = framecrc -i $(SAMPLES)/qtrle/criticalpath-credits.mov -pix_fmt rgb24 -an +fate-qtrle-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/criticalpath-credits.mov -pix_fmt rgb24 -an FATE_QTRLE += fate-qtrle-16bit -fate-qtrle-16bit: CMD = framecrc -i $(SAMPLES)/qtrle/mr-cork-rle.mov -pix_fmt rgb24 +fate-qtrle-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/mr-cork-rle.mov -pix_fmt rgb24 FATE_QTRLE += fate-qtrle-24bit -fate-qtrle-24bit: CMD = framecrc -i $(SAMPLES)/qtrle/aletrek-rle.mov +fate-qtrle-24bit: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/aletrek-rle.mov FATE_QTRLE += fate-qtrle-32bit -fate-qtrle-32bit: CMD = framecrc -i $(SAMPLES)/qtrle/ultra_demo_720_480_32bpp_rle.mov -pix_fmt rgb24 +fate-qtrle-32bit: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/ultra_demo_720_480_32bpp_rle.mov -pix_fmt rgb24 FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, QTRLE) += $(FATE_QTRLE) fate-qtrle: $(FATE_QTRLE) diff --git a/ffmpeg/tests/fate/real.mak b/ffmpeg/tests/fate/real.mak index 6c640ad..82d7e3a 100644 --- a/ffmpeg/tests/fate/real.mak +++ b/ffmpeg/tests/fate/real.mak @@ -1,37 +1,37 @@ FATE_REAL-$(call DEMDEC, RM, RA_144) += fate-ra-144 -fate-ra-144: CMD = md5 -i $(SAMPLES)/real/ra3_in_rm_file.rm -f s16le +fate-ra-144: CMD = md5 -i $(TARGET_SAMPLES)/real/ra3_in_rm_file.rm -f s16le FATE_REAL-$(call DEMDEC, RM, RA_288) += fate-ra-288 -fate-ra-288: CMD = pcm -i $(SAMPLES)/real/ra_288.rm +fate-ra-288: CMD = pcm -i $(TARGET_SAMPLES)/real/ra_288.rm fate-ra-288: CMP = oneoff fate-ra-288: REF = $(SAMPLES)/real/ra_288.pcm fate-ra-288: FUZZ = 2 FATE_REAL-$(call DEMDEC, RM, COOK) += fate-ra-cook -fate-ra-cook: CMD = pcm -i $(SAMPLES)/real/ra_cook.rm +fate-ra-cook: CMD = pcm -i $(TARGET_SAMPLES)/real/ra_cook.rm fate-ra-cook: CMP = oneoff fate-ra-cook: REF = $(SAMPLES)/real/ra_cook.pcm FATE_REAL-$(call DEMDEC, RM, RV30) += fate-rv30 -fate-rv30: CMD = framecrc -flags +bitexact -idct simple -i $(SAMPLES)/real/rv30.rm -an +fate-rv30: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/real/rv30.rm -an FATE_REAL-$(call DEMDEC, RM, RV40) += fate-rv40 -fate-rv40: CMD = framecrc -i $(SAMPLES)/real/spygames-2MB.rmvb -t 10 -an +fate-rv40: CMD = framecrc -i $(TARGET_SAMPLES)/real/spygames-2MB.rmvb -t 10 -an FATE_SIPR += fate-sipr-5k0 -fate-sipr-5k0: CMD = pcm -i $(SAMPLES)/sipr/sipr_5k0.rm +fate-sipr-5k0: CMD = pcm -i $(TARGET_SAMPLES)/sipr/sipr_5k0.rm fate-sipr-5k0: REF = $(SAMPLES)/sipr/sipr_5k0.pcm FATE_SIPR += fate-sipr-6k5 -fate-sipr-6k5: CMD = pcm -i $(SAMPLES)/sipr/sipr_6k5.rm +fate-sipr-6k5: CMD = pcm -i $(TARGET_SAMPLES)/sipr/sipr_6k5.rm fate-sipr-6k5: REF = $(SAMPLES)/sipr/sipr_6k5.pcm FATE_SIPR += fate-sipr-8k5 -fate-sipr-8k5: CMD = pcm -i $(SAMPLES)/sipr/sipr_8k5.rm +fate-sipr-8k5: CMD = pcm -i $(TARGET_SAMPLES)/sipr/sipr_8k5.rm fate-sipr-8k5: REF = $(SAMPLES)/sipr/sipr_8k5.pcm FATE_SIPR += fate-sipr-16k -fate-sipr-16k: CMD = pcm -i $(SAMPLES)/sipr/sipr_16k.rm +fate-sipr-16k: CMD = pcm -i $(TARGET_SAMPLES)/sipr/sipr_16k.rm fate-sipr-16k: REF = $(SAMPLES)/sipr/sipr_16k.pcm $(FATE_SIPR): CMP = oneoff diff --git a/ffmpeg/tests/fate/screen.mak b/ffmpeg/tests/fate/screen.mak index b55e02b..12250ca 100644 --- a/ffmpeg/tests/fate/screen.mak +++ b/ffmpeg/tests/fate/screen.mak @@ -1,60 +1,63 @@ # FIXME dropped frames in this test because of coarse timebase FATE_SCREEN-$(call DEMDEC, AVI, CSCD) += fate-cscd -fate-cscd: CMD = framecrc -i $(SAMPLES)/CSCD/sample_video.avi -an -pix_fmt rgb24 +fate-cscd: CMD = framecrc -i $(TARGET_SAMPLES)/CSCD/sample_video.avi -an -pix_fmt rgb24 FATE_SCREEN-$(call DEMDEC, AVI, DXTORY) += fate-dxtory -fate-dxtory: CMD = framecrc -i $(SAMPLES)/dxtory/dxtory_mic.avi +fate-dxtory: CMD = framecrc -i $(TARGET_SAMPLES)/dxtory/dxtory_mic.avi FATE_FRAPS += fate-fraps-v0 -fate-fraps-v0: CMD = framecrc -i $(SAMPLES)/fraps/Griffin_Ragdoll01-partial.avi +fate-fraps-v0: CMD = framecrc -i $(TARGET_SAMPLES)/fraps/Griffin_Ragdoll01-partial.avi FATE_FRAPS += fate-fraps-v1 -fate-fraps-v1: CMD = framecrc -i $(SAMPLES)/fraps/sample-v1.avi -an +fate-fraps-v1: CMD = framecrc -i $(TARGET_SAMPLES)/fraps/sample-v1.avi -an FATE_FRAPS += fate-fraps-v2 -fate-fraps-v2: CMD = framecrc -i $(SAMPLES)/fraps/test3-nosound-partial.avi +fate-fraps-v2: CMD = framecrc -i $(TARGET_SAMPLES)/fraps/test3-nosound-partial.avi FATE_FRAPS += fate-fraps-v3 -fate-fraps-v3: CMD = framecrc -i $(SAMPLES)/fraps/psclient-partial.avi -pix_fmt rgb24 +fate-fraps-v3: CMD = framecrc -i $(TARGET_SAMPLES)/fraps/psclient-partial.avi -pix_fmt rgb24 FATE_FRAPS += fate-fraps-v4 -fate-fraps-v4: CMD = framecrc -i $(SAMPLES)/fraps/WoW_2006-11-03_14-58-17-19-nosound-partial.avi +fate-fraps-v4: CMD = framecrc -i $(TARGET_SAMPLES)/fraps/WoW_2006-11-03_14-58-17-19-nosound-partial.avi FATE_FRAPS += fate-fraps-v5 -fate-fraps-v5: CMD = framecrc -i $(SAMPLES)/fraps/fraps-v5-bouncing-balls-partial.avi +fate-fraps-v5: CMD = framecrc -i $(TARGET_SAMPLES)/fraps/fraps-v5-bouncing-balls-partial.avi FATE_SCREEN-$(call DEMDEC, AVI, FRAPS) += $(FATE_FRAPS) fate-fraps: $(FATE_FRAPS) FATE_TSCC += fate-tscc-15bit -fate-tscc-15bit: CMD = framecrc -i $(SAMPLES)/tscc/oneminute.avi -t 15 -pix_fmt rgb24 +fate-tscc-15bit: CMD = framecrc -i $(TARGET_SAMPLES)/tscc/oneminute.avi -t 15 -pix_fmt rgb24 FATE_TSCC += fate-tscc-32bit -fate-tscc-32bit: CMD = framecrc -i $(SAMPLES)/tscc/2004-12-17-uebung9-partial.avi -pix_fmt rgb24 -an +fate-tscc-32bit: CMD = framecrc -i $(TARGET_SAMPLES)/tscc/2004-12-17-uebung9-partial.avi -pix_fmt rgb24 -an FATE_SCREEN-$(call DEMDEC, AVI, TSCC) += $(FATE_TSCC) fate-tscc: $(FATE_TSCC) +FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, TSCC2) += fate-tscc2 +fate-tscc2: CMD = framecrc -i $(TARGET_SAMPLES)/tscc/tsc2_16bpp.avi + FATE_VMNC += fate-vmnc-16bit -fate-vmnc-16bit: CMD = framecrc -i $(SAMPLES)/VMnc/test.avi -pix_fmt rgb24 +fate-vmnc-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/VMnc/test.avi -pix_fmt rgb24 FATE_VMNC += fate-vmnc-32bit -fate-vmnc-32bit: CMD = framecrc -i $(SAMPLES)/VMnc/VS2k5DebugDemo-01-partial.avi -pix_fmt rgb24 +fate-vmnc-32bit: CMD = framecrc -i $(TARGET_SAMPLES)/VMnc/VS2k5DebugDemo-01-partial.avi -pix_fmt rgb24 FATE_SCREEN-$(call DEMDEC, AVI, VMNC) += $(FATE_VMNC) fate-vmnc: $(FATE_VMNC) FATE_ZMBV += fate-zmbv-8bit -fate-zmbv-8bit: CMD = framecrc -i $(SAMPLES)/zmbv/wc2_001-partial.avi -an -pix_fmt rgb24 +fate-zmbv-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/zmbv/wc2_001-partial.avi -an -pix_fmt rgb24 FATE_ZMBV += fate-zmbv-15bit -fate-zmbv-15bit: CMD = framecrc -i $(SAMPLES)/zmbv/zmbv_15bit.avi -pix_fmt rgb24 -t 25 +fate-zmbv-15bit: CMD = framecrc -i $(TARGET_SAMPLES)/zmbv/zmbv_15bit.avi -pix_fmt rgb24 -t 25 FATE_ZMBV += fate-zmbv-16bit -fate-zmbv-16bit: CMD = framecrc -i $(SAMPLES)/zmbv/zmbv_16bit.avi -pix_fmt rgb24 -t 25 +fate-zmbv-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/zmbv/zmbv_16bit.avi -pix_fmt rgb24 -t 25 FATE_ZMBV += fate-zmbv-32bit -fate-zmbv-32bit: CMD = framecrc -i $(SAMPLES)/zmbv/zmbv_32bit.avi -pix_fmt rgb24 -t 25 +fate-zmbv-32bit: CMD = framecrc -i $(TARGET_SAMPLES)/zmbv/zmbv_32bit.avi -pix_fmt rgb24 -t 25 FATE_SCREEN-$(call DEMDEC, AVI, ZMBV) += $(FATE_ZMBV) fate-zmbv: $(FATE_ZMBV) diff --git a/ffmpeg/tests/fate/subtitles.mak b/ffmpeg/tests/fate/subtitles.mak index 8e586fb..33d798e 100644 --- a/ffmpeg/tests/fate/subtitles.mak +++ b/ffmpeg/tests/fate/subtitles.mak @@ -1,59 +1,59 @@ -FATE_SUBTITLES_ASS-$(call DEMDEC, AQTITLE, TEXT) += fate-sub-aqtitle -fate-sub-aqtitle: CMD = md5 -i $(SAMPLES)/sub/AQTitle_capability_tester.aqt -f ass +FATE_SUBTITLES_ASS-$(call ALLYES, AQTITLE_DEMUXER TEXT_DECODER ICONV) += fate-sub-aqtitle +fate-sub-aqtitle: CMD = md5 -sub_charenc windows-1250 -i $(TARGET_SAMPLES)/sub/AQTitle_capability_tester.aqt -f ass FATE_SUBTITLES_ASS-$(call DEMDEC, JACOSUB, JACOSUB) += fate-sub-jacosub -fate-sub-jacosub: CMD = md5 -i $(SAMPLES)/sub/JACOsub_capability_tester.jss -f ass +fate-sub-jacosub: CMD = md5 -i $(TARGET_SAMPLES)/sub/JACOsub_capability_tester.jss -f ass FATE_SUBTITLES_ASS-$(call DEMDEC, MICRODVD, MICRODVD) += fate-sub-microdvd -fate-sub-microdvd: CMD = md5 -i $(SAMPLES)/sub/MicroDVD_capability_tester.sub -f ass +fate-sub-microdvd: CMD = md5 -i $(TARGET_SAMPLES)/sub/MicroDVD_capability_tester.sub -f ass FATE_SUBTITLES-$(call ALLYES, MICRODVD_DEMUXER MICRODVD_MUXER) += fate-sub-microdvd-remux -fate-sub-microdvd-remux: CMD = md5 -i $(SAMPLES)/sub/MicroDVD_capability_tester.sub -c:s copy -f microdvd +fate-sub-microdvd-remux: CMD = md5 -i $(TARGET_SAMPLES)/sub/MicroDVD_capability_tester.sub -c:s copy -f microdvd FATE_SUBTITLES_ASS-$(call DEMDEC, MOV, MOVTEXT) += fate-sub-movtext -fate-sub-movtext: CMD = md5 -i $(SAMPLES)/sub/MovText_capability_tester.mp4 -f ass +fate-sub-movtext: CMD = md5 -i $(TARGET_SAMPLES)/sub/MovText_capability_tester.mp4 -f ass FATE_SUBTITLES-$(call ENCDEC, MOVTEXT, MOV) += fate-sub-movtextenc -fate-sub-movtextenc: CMD = md5 -i $(SAMPLES)/sub/MovText_capability_tester.mp4 -map 0 -scodec mov_text -f mp4 -flags +bitexact -movflags frag_keyframe+empty_moov +fate-sub-movtextenc: CMD = md5 -i $(TARGET_SAMPLES)/sub/MovText_capability_tester.mp4 -map 0 -scodec mov_text -f mp4 -flags +bitexact -movflags frag_keyframe+empty_moov FATE_SUBTITLES_ASS-$(call DEMDEC, MPL2, MPL2) += fate-sub-mpl2 -fate-sub-mpl2: CMD = md5 -i $(SAMPLES)/sub/MPL2_capability_tester.txt -f ass +fate-sub-mpl2: CMD = md5 -i $(TARGET_SAMPLES)/sub/MPL2_capability_tester.txt -f ass FATE_SUBTITLES_ASS-$(call DEMDEC, MPSUB, TEXT) += fate-sub-mpsub -fate-sub-mpsub: CMD = md5 -i $(SAMPLES)/sub/MPSub_capability_tester.sub -f ass +fate-sub-mpsub: CMD = md5 -i $(TARGET_SAMPLES)/sub/MPSub_capability_tester.sub -f ass FATE_SUBTITLES_ASS-$(call DEMDEC, MPSUB, TEXT) += fate-sub-mpsub-frames -fate-sub-mpsub-frames: CMD = md5 -i $(SAMPLES)/sub/MPSub_capability_tester_frames.sub -f ass +fate-sub-mpsub-frames: CMD = md5 -i $(TARGET_SAMPLES)/sub/MPSub_capability_tester_frames.sub -f ass FATE_SUBTITLES_ASS-$(call DEMDEC, PJS, PJS) += fate-sub-pjs -fate-sub-pjs: CMD = md5 -i $(SAMPLES)/sub/PJS_capability_tester.pjs -f ass +fate-sub-pjs: CMD = md5 -i $(TARGET_SAMPLES)/sub/PJS_capability_tester.pjs -f ass FATE_SUBTITLES_ASS-$(call DEMDEC, REALTEXT, REALTEXT) += fate-sub-realtext -fate-sub-realtext: CMD = md5 -i $(SAMPLES)/sub/RealText_capability_tester.rt -f ass +fate-sub-realtext: CMD = md5 -i $(TARGET_SAMPLES)/sub/RealText_capability_tester.rt -f ass FATE_SUBTITLES_ASS-$(call DEMDEC, SAMI, SAMI) += fate-sub-sami -fate-sub-sami: CMD = md5 -i $(SAMPLES)/sub/SAMI_capability_tester.smi -f ass +fate-sub-sami: CMD = md5 -i $(TARGET_SAMPLES)/sub/SAMI_capability_tester.smi -f ass FATE_SUBTITLES_ASS-$(call DEMDEC, SRT, SUBRIP) += fate-sub-srt -fate-sub-srt: CMD = md5 -i $(SAMPLES)/sub/SubRip_capability_tester.srt -f ass +fate-sub-srt: CMD = md5 -i $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt -f ass FATE_SUBTITLES-$(call ALLYES, MOV_DEMUXER MOVTEXT_DECODER SUBRIP_ENCODER) += fate-sub-subripenc -fate-sub-subripenc: CMD = md5 -i $(SAMPLES)/sub/MovText_capability_tester.mp4 -scodec subrip -f srt +fate-sub-subripenc: CMD = md5 -i $(TARGET_SAMPLES)/sub/MovText_capability_tester.mp4 -scodec subrip -f srt -FATE_SUBTITLES_ASS-$(call DEMDEC, SUBVIEWER1, SUBVIEWER1) += fate-sub-subviewer1 -fate-sub-subviewer1: CMD = md5 -i $(SAMPLES)/sub/SubViewer1_capability_tester.sub -f ass +FATE_SUBTITLES_ASS-$(call ALLYES, SUBVIEWER1_DEMUXER SUBVIEWER1_DECODER ICONV) += fate-sub-subviewer1 +fate-sub-subviewer1: CMD = md5 -sub_charenc windows-1250 -i $(TARGET_SAMPLES)/sub/SubViewer1_capability_tester.sub -f ass FATE_SUBTITLES_ASS-$(call DEMDEC, SUBVIEWER, SUBVIEWER) += fate-sub-subviewer -fate-sub-subviewer: CMD = md5 -i $(SAMPLES)/sub/SubViewer_capability_tester.sub -f ass +fate-sub-subviewer: CMD = md5 -i $(TARGET_SAMPLES)/sub/SubViewer_capability_tester.sub -f ass FATE_SUBTITLES_ASS-$(call DEMDEC, VPLAYER, VPLAYER) += fate-sub-vplayer -fate-sub-vplayer: CMD = md5 -i $(SAMPLES)/sub/VPlayer_capability_tester.txt -f ass +fate-sub-vplayer: CMD = md5 -i $(TARGET_SAMPLES)/sub/VPlayer_capability_tester.txt -f ass FATE_SUBTITLES_ASS-$(call DEMDEC, WEBVTT, WEBVTT) += fate-sub-webvtt -fate-sub-webvtt: CMD = md5 -i $(SAMPLES)/sub/WebVTT_capability_tester.vtt -f ass +fate-sub-webvtt: CMD = md5 -i $(TARGET_SAMPLES)/sub/WebVTT_capability_tester.vtt -f ass FATE_SUBTITLES_ASS-$(call ALLYES, MICRODVD_DEMUXER MICRODVD_DECODER ICONV) += fate-sub-charenc -fate-sub-charenc: CMD = md5 -sub_charenc cp1251 -i $(SAMPLES)/sub/cp1251-subtitles.sub -f ass +fate-sub-charenc: CMD = md5 -sub_charenc cp1251 -i $(TARGET_SAMPLES)/sub/cp1251-subtitles.sub -f ass FATE_SUBTITLES-$(call ENCMUX, ASS, ASS) += $(FATE_SUBTITLES_ASS-yes) FATE_SUBTITLES += $(FATE_SUBTITLES-yes) diff --git a/ffmpeg/tests/fate/utvideo.mak b/ffmpeg/tests/fate/utvideo.mak index c6ce217..6ec206b 100644 --- a/ffmpeg/tests/fate/utvideo.mak +++ b/ffmpeg/tests/fate/utvideo.mak @@ -1,29 +1,29 @@ FATE_UTVIDEO += fate-utvideo_rgb_left -fate-utvideo_rgb_left: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_rgb_left.avi +fate-utvideo_rgb_left: CMD = framecrc -i $(TARGET_SAMPLES)/utvideo/utvideo_rgb_left.avi FATE_UTVIDEO += fate-utvideo_rgb_median -fate-utvideo_rgb_median: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_rgb_median.avi +fate-utvideo_rgb_median: CMD = framecrc -i $(TARGET_SAMPLES)/utvideo/utvideo_rgb_median.avi FATE_UTVIDEO += fate-utvideo_rgba_left -fate-utvideo_rgba_left: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_rgba_left.avi +fate-utvideo_rgba_left: CMD = framecrc -i $(TARGET_SAMPLES)/utvideo/utvideo_rgba_left.avi FATE_UTVIDEO += fate-utvideo_rgba_median -fate-utvideo_rgba_median: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_rgba_median.avi +fate-utvideo_rgba_median: CMD = framecrc -i $(TARGET_SAMPLES)/utvideo/utvideo_rgba_median.avi FATE_UTVIDEO += fate-utvideo_rgba_single_symbol -fate-utvideo_rgba_single_symbol: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_rgba_single_symbol.avi +fate-utvideo_rgba_single_symbol: CMD = framecrc -i $(TARGET_SAMPLES)/utvideo/utvideo_rgba_single_symbol.avi FATE_UTVIDEO += fate-utvideo_yuv420_left -fate-utvideo_yuv420_left: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_yuv420_left.avi +fate-utvideo_yuv420_left: CMD = framecrc -i $(TARGET_SAMPLES)/utvideo/utvideo_yuv420_left.avi FATE_UTVIDEO += fate-utvideo_yuv420_median -fate-utvideo_yuv420_median: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_yuv420_median.avi +fate-utvideo_yuv420_median: CMD = framecrc -i $(TARGET_SAMPLES)/utvideo/utvideo_yuv420_median.avi FATE_UTVIDEO += fate-utvideo_yuv422_left -fate-utvideo_yuv422_left: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_yuv422_left.avi +fate-utvideo_yuv422_left: CMD = framecrc -i $(TARGET_SAMPLES)/utvideo/utvideo_yuv422_left.avi FATE_UTVIDEO += fate-utvideo_yuv422_median -fate-utvideo_yuv422_median: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_yuv422_median.avi +fate-utvideo_yuv422_median: CMD = framecrc -i $(TARGET_SAMPLES)/utvideo/utvideo_yuv422_median.avi FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, UTVIDEO) += $(FATE_UTVIDEO) fate-utvideo: $(FATE_UTVIDEO) @@ -66,7 +66,7 @@ fate-utvideoenc_yuv422_median: OPTS = -pix_fmt yuv422p -pred median FATE_UTVIDEOENC += fate-utvideoenc_yuv422_none fate-utvideoenc_yuv422_none: OPTS = -pix_fmt yuv422p -pred 3 -$(FATE_UTVIDEOENC): tests/vsynth1/00.pgm +$(FATE_UTVIDEOENC): $(VREF) FATE_AVCONV-$(call ENCMUX, UTVIDEO, AVI) += $(FATE_UTVIDEOENC) fate-utvideoenc: $(FATE_UTVIDEOENC) diff --git a/ffmpeg/tests/fate/vcodec.mak b/ffmpeg/tests/fate/vcodec.mak index fbbe4a4..9846646 100644 --- a/ffmpeg/tests/fate/vcodec.mak +++ b/ffmpeg/tests/fate/vcodec.mak @@ -54,8 +54,9 @@ fate-vsynth%-dv-50: ENCOPTS = -dct int -s pal -pix_fmt yuv422p \ fate-vsynth%-dv-50: DECOPTS = -sws_flags neighbor fate-vsynth%-dv-50: FMT = dv -FATE_VCODEC-$(call ENCDEC, FFV1, AVI) += ffv1 -fate-vsynth%-ffv1: ENCOPTS = -slices 4 -strict -2 +FATE_VCODEC-$(call ENCDEC, FFV1, AVI) += ffv1 ffv1.0 +fate-vsynth%-ffv1: ENCOPTS = -slices 4 +fate-vsynth%-ffv1.0: CODEC = ffv1 FATE_VCODEC-$(call ENCDEC, FFVHUFF, AVI) += ffvhuff @@ -73,8 +74,9 @@ FATE_VCODEC-$(call ENCDEC, FLV, FLV) += flv fate-vsynth%-flv: ENCOPTS = -qscale 10 fate-vsynth%-flv: FMT = flv -FATE_VCODEC-$(call ENCDEC, H261, AVI) += h261 +FATE_VCODEC-$(call ENCDEC, H261, AVI) += h261 h261-trellis fate-vsynth%-h261: ENCOPTS = -qscale 11 +fate-vsynth%-h261-trellis: ENCOPTS = -qscale 12 -trellis 1 -mbd rd FATE_VCODEC-$(call ENCDEC, H263, AVI) += h263 h263-obmc h263p fate-vsynth%-h263: ENCOPTS = -qscale 10 @@ -89,9 +91,11 @@ FATE_VCODEC-$(call ENCDEC, JPEGLS, AVI) += jpegls fate-vsynth%-jpegls: ENCOPTS = -sws_flags neighbor+full_chroma_int fate-vsynth%-jpegls: DECOPTS = -sws_flags area -FATE_VCODEC-$(call ENCDEC, JPEG2000, AVI) += j2k -fate-vsynth%-j2k: ENCOPTS = -qscale 7 -strict experimental -pix_fmt rgb24 -fate-vsynth%-j2k: DECINOPTS = -vcodec j2k -strict experimental +FATE_VCODEC-$(call ENCDEC, JPEG2000, AVI) += jpeg2000 jpeg2000-97 +fate-vsynth%-jpeg2000: ENCOPTS = -qscale 7 -strict experimental -pred 1 -pix_fmt rgb24 +fate-vsynth%-jpeg2000: DECINOPTS = -vcodec jpeg2000 +fate-vsynth%-jpeg2000-97: ENCOPTS = -qscale 7 -strict experimental -pix_fmt rgb24 +fate-vsynth%-jpeg2000-97: DECINOPTS = -vcodec jpeg2000 FATE_VCODEC-$(call ENCDEC, LJPEG MJPEG, AVI) += ljpeg fate-vsynth%-ljpeg: ENCOPTS = -strict -1 @@ -202,11 +206,11 @@ fate-vsynth%-mpng: CODEC = png FATE_VCODEC-$(call ENCDEC, MSVIDEO1, AVI) += msvideo1 -FATE_VCODEC-$(call ENCDEC, PRORES, MOV) += prores prores_kostya +FATE_VCODEC-$(call ENCDEC, PRORES, MOV) += prores prores_ks fate-vsynth%-prores: FMT = mov -fate-vsynth%-prores_kostya: ENCOPTS = -profile hq -fate-vsynth%-prores_kostya: FMT = mov +fate-vsynth%-prores_ks: ENCOPTS = -profile hq +fate-vsynth%-prores_ks: FMT = mov FATE_VCODEC-$(call ENCDEC, QTRLE, MOV) += qtrle qtrlegray fate-vsynth%-qtrle: FMT = mov diff --git a/ffmpeg/tests/fate/video.mak b/ffmpeg/tests/fate/video.mak index 6090074..d00df1e 100644 --- a/ffmpeg/tests/fate/video.mak +++ b/ffmpeg/tests/fate/video.mak @@ -1,285 +1,297 @@ FATE_4XM += fate-4xm-1 -fate-4xm-1: CMD = framecrc -i $(SAMPLES)/4xm/version1.4xm -pix_fmt rgb24 -an +fate-4xm-1: CMD = framecrc -i $(TARGET_SAMPLES)/4xm/version1.4xm -pix_fmt rgb24 -an FATE_4XM += fate-4xm-2 -fate-4xm-2: CMD = framecrc -i $(SAMPLES)/4xm/version2.4xm -pix_fmt rgb24 -an +fate-4xm-2: CMD = framecrc -i $(TARGET_SAMPLES)/4xm/version2.4xm -pix_fmt rgb24 -an FATE_VIDEO-$(call DEMDEC, FOURXM, FOURXM) += $(FATE_4XM) fate-4xm: $(FATE_4XM) FATE_VIDEO-$(call DEMDEC, AVI, AASC) += fate-aasc -fate-aasc: CMD = framecrc -i $(SAMPLES)/aasc/AASC-1.5MB.AVI -pix_fmt rgb24 +fate-aasc: CMD = framecrc -i $(TARGET_SAMPLES)/aasc/AASC-1.5MB.AVI -pix_fmt rgb24 FATE_VIDEO-$(call DEMDEC, MM, MMVIDEO) += fate-alg-mm -fate-alg-mm: CMD = framecrc -i $(SAMPLES)/alg-mm/ibmlogo.mm -an -pix_fmt rgb24 +fate-alg-mm: CMD = framecrc -i $(TARGET_SAMPLES)/alg-mm/ibmlogo.mm -an -pix_fmt rgb24 FATE_VIDEO-$(call DEMDEC, AVI, AMV) += fate-amv -fate-amv: CMD = framecrc -idct simple -i $(SAMPLES)/amv/MTV_high_res_320x240_sample_Penguin_Joke_MTV_from_WMV.amv -t 10 -an +fate-amv: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/amv/MTV_high_res_320x240_sample_Penguin_Joke_MTV_from_WMV.amv -t 10 -an FATE_VIDEO-$(call DEMDEC, TTY, ANSI) += fate-ansi -fate-ansi: CMD = framecrc -chars_per_frame 44100 -i $(SAMPLES)/ansi/TRE-IOM5.ANS -pix_fmt rgb24 +fate-ansi: CMD = framecrc -chars_per_frame 44100 -i $(TARGET_SAMPLES)/ansi/TRE-IOM5.ANS -pix_fmt rgb24 FATE_VIDEO-$(call DEMDEC, TTY, ANSI) += fate-ansi256 -fate-ansi256: CMD = framecrc -chars_per_frame 44100 -i $(SAMPLES)/ansi/ansi256.ans -pix_fmt rgb24 +fate-ansi256: CMD = framecrc -chars_per_frame 44100 -i $(TARGET_SAMPLES)/ansi/ansi256.ans -pix_fmt rgb24 FATE_VIDEO-$(call DEMDEC, RPL, ESCAPE124) += fate-armovie-escape124 -fate-armovie-escape124: CMD = framecrc -i $(SAMPLES)/rpl/ESCAPE.RPL -pix_fmt rgb24 +fate-armovie-escape124: CMD = framecrc -i $(TARGET_SAMPLES)/rpl/ESCAPE.RPL -pix_fmt rgb24 + +FATE_VIDEO-$(call DEMDEC, RPL, ESCAPE130) += fate-armovie-escape130 +fate-armovie-escape130: CMD = framecrc -i $(TARGET_SAMPLES)/rpl/landing.rpl -an FATE_VIDEO-$(call DEMDEC, AVI, AURA) += fate-auravision-v1 -fate-auravision-v1: CMD = framecrc -i $(SAMPLES)/auravision/SOUVIDEO.AVI -an +fate-auravision-v1: CMD = framecrc -i $(TARGET_SAMPLES)/auravision/SOUVIDEO.AVI -an FATE_VIDEO-$(call DEMDEC, AVI, AURA2) += fate-auravision-v2 -fate-auravision-v2: CMD = framecrc -i $(SAMPLES)/auravision/salma-hayek-in-ugly-betty-partial-avi -an +fate-auravision-v2: CMD = framecrc -i $(TARGET_SAMPLES)/auravision/salma-hayek-in-ugly-betty-partial-avi -an FATE_VIDEO-$(call DEMDEC, BETHSOFTVID, BETHSOFTVID) += fate-bethsoft-vid -fate-bethsoft-vid: CMD = framecrc -i $(SAMPLES)/bethsoft-vid/ANIM0001.VID -t 5 -pix_fmt rgb24 +fate-bethsoft-vid: CMD = framecrc -i $(TARGET_SAMPLES)/bethsoft-vid/ANIM0001.VID -t 5 -pix_fmt rgb24 FATE_VIDEO-$(call DEMDEC, BFI, BFI) += fate-bfi -fate-bfi: CMD = framecrc -i $(SAMPLES)/bfi/2287.bfi -pix_fmt rgb24 +fate-bfi: CMD = framecrc -i $(TARGET_SAMPLES)/bfi/2287.bfi -pix_fmt rgb24 FATE_BINK_VIDEO += fate-bink-video-b -fate-bink-video-b: CMD = framecrc -i $(SAMPLES)/bink/RISE.BIK -frames 30 +fate-bink-video-b: CMD = framecrc -i $(TARGET_SAMPLES)/bink/RISE.BIK -frames 30 FATE_BINK_VIDEO += fate-bink-video-f -fate-bink-video-f: CMD = framecrc -i $(SAMPLES)/bink/hol2br.bik +fate-bink-video-f: CMD = framecrc -i $(TARGET_SAMPLES)/bink/hol2br.bik FATE_BINK_VIDEO += fate-bink-video-i -fate-bink-video-i: CMD = framecrc -i $(SAMPLES)/bink/RazOnBull.bik -an +fate-bink-video-i: CMD = framecrc -i $(TARGET_SAMPLES)/bink/RazOnBull.bik -an FATE_VIDEO-$(call DEMDEC, BINK, BINK) += $(FATE_BINK_VIDEO) FATE_VIDEO-$(call DEMDEC, BMV, BMV_VIDEO) += fate-bmv-video -fate-bmv-video: CMD = framecrc -i $(SAMPLES)/bmv/SURFING-partial.BMV -pix_fmt rgb24 -an +fate-bmv-video: CMD = framecrc -i $(TARGET_SAMPLES)/bmv/SURFING-partial.BMV -pix_fmt rgb24 -an FATE_VIDEO-$(call DEMDEC, MPEGPS, CAVS) += fate-cavs -fate-cavs: CMD = framecrc -i $(SAMPLES)/cavs/cavs.mpg -an +fate-cavs: CMD = framecrc -i $(TARGET_SAMPLES)/cavs/cavs.mpg -an FATE_VIDEO-$(call DEMDEC, CDG, CDGRAPHICS) += fate-cdgraphics -fate-cdgraphics: CMD = framecrc -i $(SAMPLES)/cdgraphics/BrotherJohn.cdg -pix_fmt rgb24 -t 1 +fate-cdgraphics: CMD = framecrc -i $(TARGET_SAMPLES)/cdgraphics/BrotherJohn.cdg -pix_fmt rgb24 -t 1 FATE_VIDEO-$(call DEMDEC, AVI, CLJR) += fate-cljr -fate-cljr: CMD = framecrc -i $(SAMPLES)/cljr/testcljr-partial.avi +fate-cljr: CMD = framecrc -i $(TARGET_SAMPLES)/cljr/testcljr-partial.avi FATE_VIDEO-$(call DEMDEC, AVI, PNG) += fate-corepng -fate-corepng: CMD = framecrc -i $(SAMPLES)/png1/corepng-partial.avi +fate-corepng: CMD = framecrc -i $(TARGET_SAMPLES)/png1/corepng-partial.avi FATE_VIDEO-$(call DEMDEC, AVS, AVS) += fate-creatureshock-avs -fate-creatureshock-avs: CMD = framecrc -i $(SAMPLES)/creatureshock-avs/OUTATIME.AVS -pix_fmt rgb24 +fate-creatureshock-avs: CMD = framecrc -i $(TARGET_SAMPLES)/creatureshock-avs/OUTATIME.AVS -pix_fmt rgb24 FATE_CVID-$(CONFIG_MOV_DEMUXER) += fate-cvid-palette -fate-cvid-palette: CMD = framecrc -i $(SAMPLES)/cvid/catfight-cvid-pal8-partial.mov -pix_fmt rgb24 -an +fate-cvid-palette: CMD = framecrc -i $(TARGET_SAMPLES)/cvid/catfight-cvid-pal8-partial.mov -pix_fmt rgb24 -an FATE_CVID-$(CONFIG_AVI_DEMUXER) += fate-cvid-partial -fate-cvid-partial: CMD = framecrc -i $(SAMPLES)/cvid/laracroft-cinepak-partial.avi -an +fate-cvid-partial: CMD = framecrc -i $(TARGET_SAMPLES)/cvid/laracroft-cinepak-partial.avi -an FATE_CVID-$(CONFIG_AVI_DEMUXER) += fate-cvid-grayscale -fate-cvid-grayscale: CMD = framecrc -i $(SAMPLES)/cvid/pcitva15.avi -an +fate-cvid-grayscale: CMD = framecrc -i $(TARGET_SAMPLES)/cvid/pcitva15.avi -an FATE_VIDEO-$(CONFIG_CINEPAK_DECODER) += $(FATE_CVID-yes) fate-cvid: $(FATE_CVID-yes) FATE_VIDEO-$(call DEMDEC, C93, C93) += fate-cyberia-c93 -fate-cyberia-c93: CMD = framecrc -i $(SAMPLES)/cyberia-c93/intro1.c93 -t 3 -pix_fmt rgb24 +fate-cyberia-c93: CMD = framecrc -i $(TARGET_SAMPLES)/cyberia-c93/intro1.c93 -t 3 -pix_fmt rgb24 FATE_VIDEO-$(call DEMDEC, AVI, CYUV) += fate-cyuv -fate-cyuv: CMD = framecrc -i $(SAMPLES)/cyuv/cyuv.avi +fate-cyuv: CMD = framecrc -i $(TARGET_SAMPLES)/cyuv/cyuv.avi FATE_VIDEO-$(call DEMDEC, DSICIN, DSICINVIDEO) += fate-delphine-cin-video -fate-delphine-cin-video: CMD = framecrc -i $(SAMPLES)/delphine-cin/LOGO-partial.CIN -pix_fmt rgb24 -an +fate-delphine-cin-video: CMD = framecrc -i $(TARGET_SAMPLES)/delphine-cin/LOGO-partial.CIN -pix_fmt rgb24 -an FATE_VIDEO-$(call DEMDEC, ANM, ANM) += fate-deluxepaint-anm -fate-deluxepaint-anm: CMD = framecrc -i $(SAMPLES)/deluxepaint-anm/INTRO1.ANM -pix_fmt rgb24 +fate-deluxepaint-anm: CMD = framecrc -i $(TARGET_SAMPLES)/deluxepaint-anm/INTRO1.ANM -pix_fmt rgb24 FATE_VIDEO-$(call DEMDEC, DIRAC, DIRAC) += fate-dirac -fate-dirac: CMD = framecrc -i $(SAMPLES)/dirac/vts.profile-main.drc +fate-dirac: CMD = framecrc -i $(TARGET_SAMPLES)/dirac/vts.profile-main.drc FATE_TRUEMOTION1 += fate-truemotion1-15 -fate-truemotion1-15: CMD = framecrc -i $(SAMPLES)/duck/phant2-940.duk -pix_fmt rgb24 -an +fate-truemotion1-15: CMD = framecrc -i $(TARGET_SAMPLES)/duck/phant2-940.duk -pix_fmt rgb24 -an FATE_TRUEMOTION1 += fate-truemotion1-24 -fate-truemotion1-24: CMD = framecrc -i $(SAMPLES)/duck/sonic3dblast_intro-partial.avi -pix_fmt rgb24 -an +fate-truemotion1-24: CMD = framecrc -i $(TARGET_SAMPLES)/duck/sonic3dblast_intro-partial.avi -pix_fmt rgb24 -an FATE_VIDEO-$(call DEMDEC, AVI, TRUEMOTION1) += $(FATE_TRUEMOTION1) fate-truemotion1: $(FATE_TRUEMOTION1) FATE_VIDEO-$(call DEMDEC, AVI, TRUEMOTION2) += fate-truemotion2 -fate-truemotion2: CMD = framecrc -i $(SAMPLES)/duck/tm20.avi +fate-truemotion2: CMD = framecrc -i $(TARGET_SAMPLES)/duck/tm20.avi FATE_DXA += fate-dxa-feeble -fate-dxa-feeble: CMD = framecrc -i $(SAMPLES)/dxa/meetsquid.dxa -t 2 -pix_fmt rgb24 -an +fate-dxa-feeble: CMD = framecrc -i $(TARGET_SAMPLES)/dxa/meetsquid.dxa -t 2 -pix_fmt rgb24 -an FATE_DXA += fate-dxa-scummvm -fate-dxa-scummvm: CMD = framecrc -i $(SAMPLES)/dxa/scummvm.dxa -pix_fmt rgb24 +fate-dxa-scummvm: CMD = framecrc -i $(TARGET_SAMPLES)/dxa/scummvm.dxa -pix_fmt rgb24 FATE_VIDEO-$(call DEMDEC, DXA, DXA) += $(FATE_DXA) fate-dxa: $(FATE_DXA) FATE_VIDEO-$(call DEMDEC, SEGAFILM, CINEPAK) += fate-film-cvid -fate-film-cvid: CMD = framecrc -i $(SAMPLES)/film/logo-capcom.cpk -an +fate-film-cvid: CMD = framecrc -i $(TARGET_SAMPLES)/film/logo-capcom.cpk -an FATE_FLIC += fate-flic-af11-palette-change -fate-flic-af11-palette-change: CMD = framecrc -i $(SAMPLES)/fli/fli-engines.fli -t 3.3 -pix_fmt rgb24 +fate-flic-af11-palette-change: CMD = framecrc -i $(TARGET_SAMPLES)/fli/fli-engines.fli -t 3.31 -pix_fmt rgb24 FATE_FLIC += fate-flic-af12 -fate-flic-af12: CMD = framecrc -i $(SAMPLES)/fli/jj00c2.fli -pix_fmt rgb24 +fate-flic-af12: CMD = framecrc -i $(TARGET_SAMPLES)/fli/jj00c2.fli -pix_fmt rgb24 FATE_FLIC += fate-flic-magiccarpet -fate-flic-magiccarpet: CMD = framecrc -i $(SAMPLES)/fli/intel.dat -pix_fmt rgb24 +fate-flic-magiccarpet: CMD = framecrc -i $(TARGET_SAMPLES)/fli/intel.dat -pix_fmt rgb24 FATE_VIDEO-$(call DEMDEC, FLIC, FLIC) += $(FATE_FLIC) fate-flic: $(FATE_FLIC) FATE_VIDEO-$(call DEMDEC, AVI, FRWU) += fate-frwu -fate-frwu: CMD = framecrc -i $(SAMPLES)/frwu/frwu.avi +fate-frwu: CMD = framecrc -i $(TARGET_SAMPLES)/frwu/frwu.avi FATE_VIDEO-$(call DEMDEC, IDCIN, IDCIN) += fate-id-cin-video -fate-id-cin-video: CMD = framecrc -i $(SAMPLES)/idcin/idlog-2MB.cin -pix_fmt rgb24 +fate-id-cin-video: CMD = framecrc -i $(TARGET_SAMPLES)/idcin/idlog-2MB.cin -pix_fmt rgb24 FATE_VIDEO-$(call ENCDEC, ROQ PGMYUV, ROQ IMAGE2) += fate-idroq-video-encode -fate-idroq-video-encode: CMD = md5 -f image2 -vcodec pgmyuv -i $(SAMPLES)/ffmpeg-synthetic/vsynth1/%02d.pgm -sws_flags +bitexact -vf pad=512:512:80:112 -f roq -t 0.2 +fate-idroq-video-encode: CMD = md5 -f image2 -vcodec pgmyuv -i $(TARGET_SAMPLES)/ffmpeg-synthetic/vsynth1/%02d.pgm -sws_flags +bitexact -vf pad=512:512:80:112 -f roq -t 0.2 FATE_IFF-$(CONFIG_IFF_BYTERUN1_DECODER) += fate-iff-byterun1 -fate-iff-byterun1: CMD = framecrc -i $(SAMPLES)/iff/ASH.LBM -pix_fmt rgb24 +fate-iff-byterun1: CMD = framecrc -i $(TARGET_SAMPLES)/iff/ASH.LBM -pix_fmt rgb24 FATE_IFF-$(CONFIG_EIGHTSVX_FIB_DECODER) += fate-iff-fibonacci -fate-iff-fibonacci: CMD = md5 -i $(SAMPLES)/iff/dasboot-in-compressed -f s16le +fate-iff-fibonacci: CMD = md5 -i $(TARGET_SAMPLES)/iff/dasboot-in-compressed -f s16le FATE_IFF-$(CONFIG_IFF_ILBM_DECODER) += fate-iff-ilbm -fate-iff-ilbm: CMD = framecrc -i $(SAMPLES)/iff/lms-matriks.ilbm -pix_fmt rgb24 +fate-iff-ilbm: CMD = framecrc -i $(TARGET_SAMPLES)/iff/lms-matriks.ilbm -pix_fmt rgb24 FATE_VIDEO-$(CONFIG_IFF_DEMUXER) += $(FATE_IFF-yes) fate-iff: $(FATE_IFF-yes) FATE_VIDEO-$(call DEMDEC, IPMOVIE, INTERPLAY_VIDEO) += fate-interplay-mve-8bit -fate-interplay-mve-8bit: CMD = framecrc -i $(SAMPLES)/interplay-mve/interplay-logo-2MB.mve -pix_fmt rgb24 -an +fate-interplay-mve-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/interplay-mve/interplay-logo-2MB.mve -pix_fmt rgb24 -an FATE_VIDEO-$(call DEMDEC, IPMOVIE, INTERPLAY_VIDEO) += fate-interplay-mve-16bit -fate-interplay-mve-16bit: CMD = framecrc -i $(SAMPLES)/interplay-mve/descent3-level5-16bit-partial.mve -pix_fmt rgb24 -an +fate-interplay-mve-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/interplay-mve/descent3-level5-16bit-partial.mve -pix_fmt rgb24 -an + +FATE_VIDEO-$(call DEMDEC, MXF, JPEG2000) += fate-jpeg2000-dcinema +fate-jpeg2000-dcinema: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/chiens_dcinema2K.mxf -pix_fmt xyz12le FATE_VIDEO-$(call DEMDEC, JV, JV) += fate-jv -fate-jv: CMD = framecrc -i $(SAMPLES)/jv/intro.jv -pix_fmt rgb24 -an +fate-jv: CMD = framecrc -i $(TARGET_SAMPLES)/jv/intro.jv -an -pix_fmt rgb24 FATE_VIDEO-$(call DEMDEC, AVI, KGV1) += fate-kgv1 -fate-kgv1: CMD = framecrc -i $(SAMPLES)/kega/kgv1.avi -pix_fmt rgb555le -an +fate-kgv1: CMD = framecrc -i $(TARGET_SAMPLES)/kega/kgv1.avi -pix_fmt rgb555le -an FATE_VIDEO-$(call DEMDEC, AVI, KMVC) += fate-kmvc -fate-kmvc: CMD = framecrc -i $(SAMPLES)/KMVC/LOGO1.AVI -an -t 3 -pix_fmt rgb24 +fate-kmvc: CMD = framecrc -i $(TARGET_SAMPLES)/KMVC/LOGO1.AVI -an -t 3 -pix_fmt rgb24 FATE_VIDEO-$(call DEMDEC, EA, MDEC) += fate-mdec -fate-mdec: CMD = framecrc -idct simple -i $(SAMPLES)/ea-dct/NFS2Esprit-partial.dct -an +fate-mdec: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/ea-dct/NFS2Esprit-partial.dct -an FATE_VIDEO-$(call DEMDEC, STR, MDEC) += fate-mdec-v3 -fate-mdec-v3: CMD = framecrc -idct simple -i $(SAMPLES)/psx-str/abc000_cut.str -an +fate-mdec-v3: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/psx-str/abc000_cut.str -an FATE_VIDEO-$(call DEMDEC, MSNWC_TCP, MIMIC) += fate-mimic -fate-mimic: CMD = framecrc -idct simple -i $(SAMPLES)/mimic/mimic2-womanloveffmpeg.cam +fate-mimic: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/mimic/mimic2-womanloveffmpeg.cam FATE_VIDEO-$(call DEMDEC, MOV, MJPEGB) += fate-mjpegb -fate-mjpegb: CMD = framecrc -idct simple -flags +bitexact -i $(SAMPLES)/mjpegb/mjpegb_part.mov -an +fate-mjpegb: CMD = framecrc -idct simple -flags +bitexact -i $(TARGET_SAMPLES)/mjpegb/mjpegb_part.mov -an FATE_VIDEO-$(call DEMDEC, MVI, MOTIONPIXELS) += fate-motionpixels -fate-motionpixels: CMD = framecrc -i $(SAMPLES)/motion-pixels/INTRO-partial.MVI -an -pix_fmt rgb24 -vframes 111 +fate-motionpixels: CMD = framecrc -i $(TARGET_SAMPLES)/motion-pixels/INTRO-partial.MVI -an -pix_fmt rgb24 -vframes 111 FATE_VIDEO-$(call DEMDEC, MPEGTS, MPEG2VIDEO) += fate-mpeg2-field-enc -fate-mpeg2-field-enc: CMD = framecrc -flags +bitexact -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -an -vframes 30 +fate-mpeg2-field-enc: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/mpeg2_field_encoding.ts -an -vframes 30 FATE_VIDEO-$(call DEMDEC, MXG, MXPEG) += fate-mxpeg -fate-mxpeg: CMD = framecrc -idct simple -flags +bitexact -i $(SAMPLES)/mxpeg/m1.mxg -an +fate-mxpeg: CMD = framecrc -idct simple -flags +bitexact -i $(TARGET_SAMPLES)/mxpeg/m1.mxg -an # FIXME dropped frames in this test because of coarse timebase FATE_NUV += fate-nuv-rtjpeg -fate-nuv-rtjpeg: CMD = framecrc -idct simple -i $(SAMPLES)/nuv/Today.nuv -an +fate-nuv-rtjpeg: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/nuv/Today.nuv -an FATE_NUV += fate-nuv-rtjpeg-fh -fate-nuv-rtjpeg-fh: CMD = framecrc -idct simple -i $(SAMPLES)/nuv/rtjpeg_frameheader.nuv -an +fate-nuv-rtjpeg-fh: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/nuv/rtjpeg_frameheader.nuv -an FATE_VIDEO-$(call DEMDEC, NUV, NUV) += $(FATE_NUV) fate-nuv: $(FATE_NUV) FATE_VIDEO-$(call DEMDEC, PAF, PAF_VIDEO) += fate-paf-video -fate-paf-video: CMD = framecrc -i $(SAMPLES)/paf/hod1-partial.paf -pix_fmt rgb24 -an +fate-paf-video: CMD = framecrc -i $(TARGET_SAMPLES)/paf/hod1-partial.paf -pix_fmt rgb24 -an FATE_VIDEO-$(call DEMDEC, AVI, QPEG) += fate-qpeg -fate-qpeg: CMD = framecrc -i $(SAMPLES)/qpeg/Clock.avi -an -pix_fmt rgb24 +fate-qpeg: CMD = framecrc -i $(TARGET_SAMPLES)/qpeg/Clock.avi -an -pix_fmt rgb24 FATE_VIDEO-$(call DEMDEC, AVI, R210) += fate-r210 -fate-r210: CMD = framecrc -i $(SAMPLES)/r210/r210.avi -pix_fmt rgb48le +fate-r210: CMD = framecrc -i $(TARGET_SAMPLES)/r210/r210.avi -pix_fmt rgb48le FATE_VIDEO-$(call DEMDEC, RL2, RL2) += fate-rl2 -fate-rl2: CMD = framecrc -i $(SAMPLES)/rl2/Z4915300.RL2 -pix_fmt rgb24 -an +fate-rl2: CMD = framecrc -i $(TARGET_SAMPLES)/rl2/Z4915300.RL2 -pix_fmt rgb24 -an FATE_VIDEO-$(call DEMDEC, ROQ, ROQ) += fate-roqvideo -fate-roqvideo: CMD = framecrc -i $(SAMPLES)/idroq/idlogo.roq -an +fate-roqvideo: CMD = framecrc -i $(TARGET_SAMPLES)/idroq/idlogo.roq -an FATE_VIDEO-$(call DEMDEC, SMUSH, SANM) += fate-sanm -fate-sanm: CMD = framecrc -i $(SAMPLES)/smush/ronin_part.znm -an -pix_fmt rgb24 +fate-sanm: CMD = framecrc -i $(TARGET_SAMPLES)/smush/ronin_part.znm -an -pix_fmt rgb24 FATE_VIDEO-$(call DEMDEC, VMD, VMDVIDEO) += fate-sierra-vmd-video -fate-sierra-vmd-video: CMD = framecrc -i $(SAMPLES)/vmd/12.vmd -pix_fmt rgb24 -an +fate-sierra-vmd-video: CMD = framecrc -i $(TARGET_SAMPLES)/vmd/12.vmd -pix_fmt rgb24 -an FATE_VIDEO-$(call DEMDEC, SMACKER, SMACKER) += fate-smacker-video -fate-smacker-video: CMD = framecrc -i $(SAMPLES)/smacker/wetlogo.smk -pix_fmt rgb24 -an +fate-smacker-video: CMD = framecrc -i $(TARGET_SAMPLES)/smacker/wetlogo.smk -pix_fmt rgb24 -an FATE_VIDEO-$(call DEMDEC, MOV, SMC) += fate-smc -fate-smc: CMD = framecrc -i $(SAMPLES)/smc/cass_schi.qt -pix_fmt rgb24 +fate-smc: CMD = framecrc -i $(TARGET_SAMPLES)/smc/cass_schi.qt -pix_fmt rgb24 FATE_VIDEO-$(call DEMDEC, AVI, SP5X) += fate-sp5x -fate-sp5x: CMD = framecrc -idct simple -i $(SAMPLES)/sp5x/sp5x_problem.avi +fate-sp5x: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/sp5x/sp5x_problem.avi FATE_VIDEO-$(call DEMDEC, THP, THP) += fate-thp -fate-thp: CMD = framecrc -idct simple -i $(SAMPLES)/thp/pikmin2-opening1-partial.thp -an +fate-thp: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/thp/pikmin2-opening1-partial.thp -an FATE_VIDEO-$(call DEMDEC, TIERTEXSEQ, TIERTEXSEQVIDEO) += fate-tiertex-seq -fate-tiertex-seq: CMD = framecrc -i $(SAMPLES)/tiertex-seq/Gameover.seq -pix_fmt rgb24 +fate-tiertex-seq: CMD = framecrc -i $(TARGET_SAMPLES)/tiertex-seq/Gameover.seq -pix_fmt rgb24 FATE_VIDEO-$(call DEMDEC, TMV, TMV) += fate-tmv -fate-tmv: CMD = framecrc -i $(SAMPLES)/tmv/pop-partial.tmv -pix_fmt rgb24 +fate-tmv: CMD = framecrc -i $(TARGET_SAMPLES)/tmv/pop-partial.tmv -pix_fmt rgb24 FATE_TXD += fate-txd-16bpp -fate-txd-16bpp: CMD = framecrc -i $(SAMPLES)/txd/misc.txd -pix_fmt bgra -an +fate-txd-16bpp: CMD = framecrc -i $(TARGET_SAMPLES)/txd/misc.txd -pix_fmt bgra -an FATE_TXD += fate-txd-pal8 -fate-txd-pal8: CMD = framecrc -i $(SAMPLES)/txd/outro.txd -pix_fmt rgb24 -an +fate-txd-pal8: CMD = framecrc -i $(TARGET_SAMPLES)/txd/outro.txd -pix_fmt rgb24 -an FATE_VIDEO-$(call DEMDEC, TXD, TXD) += $(FATE_TXD) fate-txd: $(FATE_TXD) FATE_VIDEO-$(call DEMDEC, AVI, ULTI) += fate-ulti -fate-ulti: CMD = framecrc -i $(SAMPLES)/ulti/hit12w.avi -an +fate-ulti: CMD = framecrc -i $(TARGET_SAMPLES)/ulti/hit12w.avi -an FATE_VIDEO-$(call DEMDEC, AVI, V210) += fate-v210 -fate-v210: CMD = framecrc -i $(SAMPLES)/v210/v210_720p-partial.avi -pix_fmt yuv422p16be -an +fate-v210: CMD = framecrc -i $(TARGET_SAMPLES)/v210/v210_720p-partial.avi -pix_fmt yuv422p16be -an FATE_VIDEO-$(call DEMDEC, MOV, V410) += fate-v410dec -fate-v410dec: CMD = framecrc -i $(SAMPLES)/v410/lenav410.mov -pix_fmt yuv444p10le +fate-v410dec: CMD = framecrc -i $(TARGET_SAMPLES)/v410/lenav410.mov -pix_fmt yuv444p10le FATE_VIDEO-$(call ENCDEC, V410 PGMYUV, AVI IMAGE2) += fate-v410enc -fate-v410enc: tests/vsynth1/00.pgm +fate-v410enc: $(VREF) fate-v410enc: CMD = md5 -f image2 -vcodec pgmyuv -i $(TARGET_PATH)/tests/vsynth1/%02d.pgm -flags +bitexact -vcodec v410 -f avi FATE_VIDEO-$(call DEMDEC, SIFF, VB) += fate-vb -fate-vb: CMD = framecrc -i $(SAMPLES)/SIFF/INTRO_B.VB -t 3 -pix_fmt rgb24 -an +fate-vb: CMD = framecrc -i $(TARGET_SAMPLES)/SIFF/INTRO_B.VB -t 3 -pix_fmt rgb24 -an FATE_VIDEO-$(call DEMDEC, AVI, VCR1) += fate-vcr1 -fate-vcr1: CMD = framecrc -i $(SAMPLES)/vcr1/VCR1test.avi -an +fate-vcr1: CMD = framecrc -i $(TARGET_SAMPLES)/vcr1/VCR1test.avi -an + +FATE_VIDEO-$(call DEMDEC, AVI, MPEG2VIDEO) += fate-vcr2 +fate-vcr2: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/vcr2/VCR2test.avi -an FATE_VIDEO-$(call DEMDEC, AVI, XL) += fate-videoxl -fate-videoxl: CMD = framecrc -i $(SAMPLES)/vixl/pig-vixl.avi +fate-videoxl: CMD = framecrc -i $(TARGET_SAMPLES)/vixl/pig-vixl.avi FATE_VIDEO-$(call DEMDEC, WSVQA, VQA) += fate-vqa-cc -fate-vqa-cc: CMD = framecrc -i $(SAMPLES)/vqa/cc-demo1-partial.vqa -pix_fmt rgb24 -an +fate-vqa-cc: CMD = framecrc -i $(TARGET_SAMPLES)/vqa/cc-demo1-partial.vqa -pix_fmt rgb24 -an FATE_VIDEO-$(call DEMDEC, WC3, XAN_WC3) += fate-wc3movie-xan -fate-wc3movie-xan: CMD = framecrc -i $(SAMPLES)/wc3movie/SC_32-part.MVE -pix_fmt rgb24 +fate-wc3movie-xan: CMD = framecrc -i $(TARGET_SAMPLES)/wc3movie/SC_32-part.MVE -pix_fmt rgb24 FATE_VIDEO-$(call DEMDEC, AVI, WNV1) += fate-wnv1 -fate-wnv1: CMD = framecrc -i $(SAMPLES)/wnv1/wnv1-codec.avi -an +fate-wnv1: CMD = framecrc -i $(TARGET_SAMPLES)/wnv1/wnv1-codec.avi -an FATE_VIDEO-$(call DEMDEC, YOP, YOP) += fate-yop -fate-yop: CMD = framecrc -i $(SAMPLES)/yop/test1.yop -pix_fmt rgb24 -an +fate-yop: CMD = framecrc -i $(TARGET_SAMPLES)/yop/test1.yop -pix_fmt rgb24 -an FATE_VIDEO-$(call DEMDEC, AVI, XAN_WC4) += fate-xxan-wc4 -fate-xxan-wc4: CMD = framecrc -i $(SAMPLES)/wc4-xan/wc4trailer-partial.avi -an +fate-xxan-wc4: CMD = framecrc -i $(TARGET_SAMPLES)/wc4-xan/wc4trailer-partial.avi -an + +FATE_VIDEO-$(call DEMDEC, WAV, SMVJPEG) += fate-smvjpeg +fate-smvjpeg: CMD = framecrc -idct simple -flags +bitexact -i $(TARGET_SAMPLES)/smv/clock.smv -an FATE_VIDEO += $(FATE_VIDEO-yes) diff --git a/ffmpeg/tests/fate/voice.mak b/ffmpeg/tests/fate/voice.mak index f27be18..44b5b93 100644 --- a/ffmpeg/tests/fate/voice.mak +++ b/ffmpeg/tests/fate/voice.mak @@ -1,5 +1,5 @@ FATE_G722-$(call DEMDEC, G722, ADPCM_G722) += fate-g722dec-1 -fate-g722dec-1: CMD = framecrc -i $(SAMPLES)/g722/conf-adminmenu-162.g722 +fate-g722dec-1: CMD = framecrc -i $(TARGET_SAMPLES)/g722/conf-adminmenu-162.g722 FATE_G722-$(call ENCMUX, ADPCM_G722, WAV) += fate-g722-encode fate-g722-encode: tests/data/asynth-16000-1.wav @@ -10,28 +10,28 @@ FATE_VOICE-yes += $(FATE_G722-yes) fate-g722: $(FATE_G722) FATE_G723_1 += fate-g723_1-dec-1 -fate-g723_1-dec-1: CMD = framecrc -postfilter 0 -i $(SAMPLES)/g723_1/ineqd53.tco +fate-g723_1-dec-1: CMD = framecrc -postfilter 0 -i $(TARGET_SAMPLES)/g723_1/ineqd53.tco FATE_G723_1 += fate-g723_1-dec-2 -fate-g723_1-dec-2: CMD = framecrc -postfilter 0 -i $(SAMPLES)/g723_1/overd53.tco +fate-g723_1-dec-2: CMD = framecrc -postfilter 0 -i $(TARGET_SAMPLES)/g723_1/overd53.tco FATE_G723_1 += fate-g723_1-dec-3 -fate-g723_1-dec-3: CMD = framecrc -postfilter 1 -i $(SAMPLES)/g723_1/overd63p.tco +fate-g723_1-dec-3: CMD = framecrc -postfilter 1 -i $(TARGET_SAMPLES)/g723_1/overd63p.tco FATE_G723_1 += fate-g723_1-dec-4 -fate-g723_1-dec-4: CMD = framecrc -postfilter 0 -i $(SAMPLES)/g723_1/pathd53.tco +fate-g723_1-dec-4: CMD = framecrc -postfilter 0 -i $(TARGET_SAMPLES)/g723_1/pathd53.tco FATE_G723_1 += fate-g723_1-dec-5 -fate-g723_1-dec-5: CMD = framecrc -postfilter 1 -i $(SAMPLES)/g723_1/pathd63p.tco +fate-g723_1-dec-5: CMD = framecrc -postfilter 1 -i $(TARGET_SAMPLES)/g723_1/pathd63p.tco FATE_G723_1 += fate-g723_1-dec-6 -fate-g723_1-dec-6: CMD = framecrc -postfilter 1 -i $(SAMPLES)/g723_1/tamed63p.tco +fate-g723_1-dec-6: CMD = framecrc -postfilter 1 -i $(TARGET_SAMPLES)/g723_1/tamed63p.tco FATE_G723_1 += fate-g723_1-dec-7 -fate-g723_1-dec-7: CMD = framecrc -postfilter 1 -i $(SAMPLES)/g723_1/dtx63b.tco +fate-g723_1-dec-7: CMD = framecrc -postfilter 1 -i $(TARGET_SAMPLES)/g723_1/dtx63b.tco FATE_G723_1 += fate-g723_1-dec-8 -fate-g723_1-dec-8: CMD = framecrc -postfilter 1 -i $(SAMPLES)/g723_1/dtx63e.tco +fate-g723_1-dec-8: CMD = framecrc -postfilter 1 -i $(TARGET_SAMPLES)/g723_1/dtx63e.tco FATE_G723_1-$(call DEMDEC, G723_1, G723_1) += $(FATE_G723_1) FATE_SAMPLES_AVCONV += $(FATE_G723_1-yes) @@ -56,21 +56,21 @@ FATE_VOICE-$(call ENCMUX, ADPCM_G726, WAV) += $(FATE_G726) fate-g726: $(FATE_G726) FATE_GSM-$(call DEMDEC, WAV, GSM) += fate-gsm-ms -fate-gsm-ms: CMD = framecrc -i $(SAMPLES)/gsm/ciao.wav +fate-gsm-ms: CMD = framecrc -i $(TARGET_SAMPLES)/gsm/ciao.wav FATE_GSM-$(call DEMDEC, MOV, GSM) += fate-gsm-toast -fate-gsm-toast: CMD = framecrc -i $(SAMPLES)/gsm/sample-gsm-8000.mov -t 10 +fate-gsm-toast: CMD = framecrc -i $(TARGET_SAMPLES)/gsm/sample-gsm-8000.mov -t 10 FATE_VOICE-yes += $(FATE_GSM-yes) fate-gsm: $(FATE_GSM) FATE_VOICE-$(call DEMDEC, QCP, QCELP) += fate-qcelp -fate-qcelp: CMD = pcm -i $(SAMPLES)/qcp/0036580847.QCP +fate-qcelp: CMD = pcm -i $(TARGET_SAMPLES)/qcp/0036580847.QCP fate-qcelp: CMP = oneoff fate-qcelp: REF = $(SAMPLES)/qcp/0036580847.pcm FATE_VOICE-$(call DEMDEC, WAV, TRUESPEECH) += fate-truespeech -fate-truespeech: CMD = pcm -i $(SAMPLES)/truespeech/a6.wav +fate-truespeech: CMD = pcm -i $(TARGET_SAMPLES)/truespeech/a6.wav fate-truespeech: CMP = oneoff fate-truespeech: REF = $(SAMPLES)/truespeech/a6.pcm diff --git a/ffmpeg/tests/fate/vorbis.mak b/ffmpeg/tests/fate/vorbis.mak index 39a9724..4b72373 100644 --- a/ffmpeg/tests/fate/vorbis.mak +++ b/ffmpeg/tests/fate/vorbis.mak @@ -1,83 +1,83 @@ FATE_VORBIS += fate-vorbis-1 -fate-vorbis-1: CMD = pcm -i $(SAMPLES)/vorbis/1.0.1-test_small.ogg +fate-vorbis-1: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/1.0.1-test_small.ogg fate-vorbis-1: REF = $(SAMPLES)/vorbis/1.0.1-test_small.pcm FATE_VORBIS += fate-vorbis-2 -fate-vorbis-2: CMD = pcm -i $(SAMPLES)/vorbis/1.0-test_small.ogg +fate-vorbis-2: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/1.0-test_small.ogg fate-vorbis-2: REF = $(SAMPLES)/vorbis/1.0-test_small.pcm FATE_VORBIS += fate-vorbis-3 -fate-vorbis-3: CMD = pcm -i $(SAMPLES)/vorbis/beta3-test_small.ogg +fate-vorbis-3: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/beta3-test_small.ogg fate-vorbis-3: REF = $(SAMPLES)/vorbis/beta3-test_small.pcm FATE_VORBIS += fate-vorbis-4 -fate-vorbis-4: CMD = pcm -i $(SAMPLES)/vorbis/beta4-test_small.ogg +fate-vorbis-4: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/beta4-test_small.ogg fate-vorbis-4: REF = $(SAMPLES)/vorbis/beta4-test_small.pcm FATE_VORBIS += fate-vorbis-5 -fate-vorbis-5: CMD = pcm -i $(SAMPLES)/vorbis/chain-test1_small.ogg +fate-vorbis-5: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/chain-test1_small.ogg fate-vorbis-5: REF = $(SAMPLES)/vorbis/chain-test1_small.pcm FATE_VORBIS += fate-vorbis-6 -fate-vorbis-6: CMD = pcm -i $(SAMPLES)/vorbis/chain-test2_small.ogg +fate-vorbis-6: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/chain-test2_small.ogg fate-vorbis-6: REF = $(SAMPLES)/vorbis/chain-test2_small.pcm FATE_VORBIS += fate-vorbis-7 -fate-vorbis-7: CMD = pcm -i $(SAMPLES)/vorbis/highrate-test_small.ogg +fate-vorbis-7: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/highrate-test_small.ogg fate-vorbis-7: REF = $(SAMPLES)/vorbis/highrate-test_small.pcm FATE_VORBIS += fate-vorbis-8 -fate-vorbis-8: CMD = pcm -i $(SAMPLES)/vorbis/lsp-test2_small.ogg +fate-vorbis-8: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/lsp-test2_small.ogg fate-vorbis-8: REF = $(SAMPLES)/vorbis/lsp-test2_small.pcm FATE_VORBIS += fate-vorbis-9 -fate-vorbis-9: CMD = pcm -i $(SAMPLES)/vorbis/lsp-test3_small.ogg +fate-vorbis-9: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/lsp-test3_small.ogg fate-vorbis-9: REF = $(SAMPLES)/vorbis/lsp-test3_small.pcm FATE_VORBIS += fate-vorbis-10 -fate-vorbis-10: CMD = pcm -i $(SAMPLES)/vorbis/lsp-test4_small.ogg +fate-vorbis-10: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/lsp-test4_small.ogg fate-vorbis-10: REF = $(SAMPLES)/vorbis/lsp-test4_small.pcm FATE_VORBIS += fate-vorbis-11 -fate-vorbis-11: CMD = pcm -i $(SAMPLES)/vorbis/lsp-test_small.ogg +fate-vorbis-11: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/lsp-test_small.ogg fate-vorbis-11: REF = $(SAMPLES)/vorbis/lsp-test_small.pcm FATE_VORBIS += fate-vorbis-12 -fate-vorbis-12: CMD = pcm -i $(SAMPLES)/vorbis/mono_small.ogg +fate-vorbis-12: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/mono_small.ogg fate-vorbis-12: REF = $(SAMPLES)/vorbis/mono_small.pcm FATE_VORBIS += fate-vorbis-13 -fate-vorbis-13: CMD = pcm -i $(SAMPLES)/vorbis/moog_small.ogg +fate-vorbis-13: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/moog_small.ogg fate-vorbis-13: REF = $(SAMPLES)/vorbis/moog_small.pcm fate-vorbis-13: FUZZ = 2 FATE_VORBIS += fate-vorbis-14 -fate-vorbis-14: CMD = pcm -i $(SAMPLES)/vorbis/rc1-test_small.ogg +fate-vorbis-14: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/rc1-test_small.ogg fate-vorbis-14: REF = $(SAMPLES)/vorbis/rc1-test_small.pcm FATE_VORBIS += fate-vorbis-15 -fate-vorbis-15: CMD = pcm -i $(SAMPLES)/vorbis/rc2-test2_small.ogg +fate-vorbis-15: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/rc2-test2_small.ogg fate-vorbis-15: REF = $(SAMPLES)/vorbis/rc2-test2_small.pcm FATE_VORBIS += fate-vorbis-16 -fate-vorbis-16: CMD = pcm -i $(SAMPLES)/vorbis/rc2-test_small.ogg +fate-vorbis-16: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/rc2-test_small.ogg fate-vorbis-16: REF = $(SAMPLES)/vorbis/rc2-test_small.pcm FATE_VORBIS += fate-vorbis-17 -fate-vorbis-17: CMD = pcm -i $(SAMPLES)/vorbis/rc3-test_small.ogg +fate-vorbis-17: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/rc3-test_small.ogg fate-vorbis-17: REF = $(SAMPLES)/vorbis/rc3-test_small.pcm FATE_VORBIS += fate-vorbis-18 -fate-vorbis-18: CMD = pcm -i $(SAMPLES)/vorbis/sleepzor_small.ogg +fate-vorbis-18: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/sleepzor_small.ogg fate-vorbis-18: REF = $(SAMPLES)/vorbis/sleepzor_small.pcm fate-vorbis-18: FUZZ = 2 FATE_VORBIS += fate-vorbis-19 -fate-vorbis-19: CMD = pcm -i $(SAMPLES)/vorbis/test-short2_small.ogg +fate-vorbis-19: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/test-short2_small.ogg fate-vorbis-19: REF = $(SAMPLES)/vorbis/test-short2_small.pcm FATE_VORBIS += fate-vorbis-20 -fate-vorbis-20: CMD = pcm -i $(SAMPLES)/vorbis/6.ogg +fate-vorbis-20: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/6.ogg fate-vorbis-20: REF = $(SAMPLES)/vorbis/6.pcm FATE_SAMPLES_AVCONV-$(call DEMDEC, OGG, VORBIS) += $(FATE_VORBIS) diff --git a/ffmpeg/tests/fate/vpx.mak b/ffmpeg/tests/fate/vpx.mak index 061a1e8..de0b58f 100644 --- a/ffmpeg/tests/fate/vpx.mak +++ b/ffmpeg/tests/fate/vpx.mak @@ -1,29 +1,32 @@ FATE_VP3-$(call DEMDEC, MATROSKA, THEORA) += fate-theora-coeff-level64 -fate-theora-coeff-level64: CMD = framecrc -i $(SAMPLES)/vp3/coeff_level64.mkv +fate-theora-coeff-level64: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp3/coeff_level64.mkv FATE_VP3-$(call DEMDEC, AVI, VP3) += fate-vp31 -fate-vp31: CMD = framecrc -i $(SAMPLES)/vp3/vp31.avi +fate-vp31: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp3/vp31.avi FATE_SAMPLES_AVCONV += $(FATE_VP3-yes) fate-vp3: $(FATE_VP3-yes) FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, VP5) += fate-vp5 -fate-vp5: CMD = framecrc -i $(SAMPLES)/vp5/potter512-400-partial.avi -an +fate-vp5: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp5/potter512-400-partial.avi -an FATE_VP6-$(call DEMDEC, EA, VP6) += fate-vp60 -fate-vp60: CMD = framecrc -i $(SAMPLES)/ea-vp6/g36.vp6 +fate-vp60: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/ea-vp6/g36.vp6 FATE_VP6-$(call DEMDEC, EA, VP6) += fate-vp61 -fate-vp61: CMD = framecrc -i $(SAMPLES)/ea-vp6/MovieSkirmishGondor.vp6 -t 4 +fate-vp61: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/ea-vp6/MovieSkirmishGondor.vp6 -t 4 FATE_VP6-$(call DEMDEC, FLV, VP6A) += fate-vp6a -fate-vp6a: CMD = framecrc -i $(SAMPLES)/flash-vp6/300x180-Scr-f8-056alpha.flv +fate-vp6a: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/flash-vp6/300x180-Scr-f8-056alpha.flv + +FATE_VP6-$(call DEMDEC, FLV, VP6A) += fate-vp6a-skip_alpha +fate-vp6a-skip_alpha: CMD = framecrc -flags +bitexact -skip_alpha 1 -i $(TARGET_SAMPLES)/flash-vp6/300x180-Scr-f8-056alpha.flv FATE_VP6-$(call DEMDEC, FLV, VP6F) += fate-vp6f -fate-vp6f: CMD = framecrc -i $(SAMPLES)/flash-vp6/clip1024.flv +fate-vp6f: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/flash-vp6/clip1024.flv FATE_VP8-$(call DEMDEC, FLV, VP8) += fate-vp8-alpha -fate-vp8-alpha: CMD = framecrc -i $(SAMPLES)/vp8_alpha/vp8_video_with_alpha.webm -vcodec copy +fate-vp8-alpha: CMD = framecrc -i $(TARGET_SAMPLES)/vp8_alpha/vp8_video_with_alpha.webm -vcodec copy FATE_SAMPLES_AVCONV += $(FATE_VP6-yes) fate-vp6: $(FATE_VP6-yes) @@ -32,7 +35,7 @@ VP8_SUITE = 001 002 003 004 005 006 007 008 009 010 011 012 013 014 015 016 017 define FATE_VP8_SUITE FATE_VP8-$(CONFIG_IVF_DEMUXER) += fate-vp8-test-vector$(2)-$(1) -fate-vp8-test-vector$(2)-$(1): CMD = framemd5 $(3) -i $(SAMPLES)/vp8-test-vectors-r1/vp80-00-comprehensive-$(1).ivf +fate-vp8-test-vector$(2)-$(1): CMD = framemd5 $(3) -i $(TARGET_SAMPLES)/vp8-test-vectors-r1/vp80-00-comprehensive-$(1).ivf fate-vp8-test-vector$(2)-$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-test-vector-$(1) endef @@ -42,11 +45,11 @@ $(foreach N,$(VP8_SUITE),$(eval $(call FATE_VP8_SUITE,$(N),$(1),$(2)))) # FIXME this file contains two frames with identical timestamps, # so ffmpeg drops one of them FATE_VP8-$(CONFIG_IVF_DEMUXER) += fate-vp8-sign-bias$(1) -fate-vp8-sign-bias$(1): CMD = framemd5 $(2) -i $(SAMPLES)/vp8/sintel-signbias.ivf +fate-vp8-sign-bias$(1): CMD = framemd5 $(2) -i $(TARGET_SAMPLES)/vp8/sintel-signbias.ivf fate-vp8-sign-bias$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-sign-bias FATE_VP8-$(CONFIG_MATROSKA_DEMUXER) += fate-vp8-size-change$(1) -fate-vp8-size-change$(1): CMD = framemd5 $(2) -flags +bitexact -i $(SAMPLES)/vp8/frame_size_change.webm -frames:v 30 -sws_flags bitexact+bilinear +fate-vp8-size-change$(1): CMD = framemd5 $(2) -flags +bitexact -i $(TARGET_SAMPLES)/vp8/frame_size_change.webm -frames:v 30 -sws_flags bitexact+bilinear fate-vp8-size-change$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-size-change endef @@ -54,3 +57,36 @@ $(eval $(call FATE_VP8_FULL)) $(eval $(call FATE_VP8_FULL,-emu-edge,-flags +emu_edge)) FATE_SAMPLES_AVCONV-$(CONFIG_VP8_DECODER) += $(FATE_VP8-yes) fate-vp8: $(FATE_VP8-yes) + +define FATE_VP9_SUITE +FATE_VP9-$(CONFIG_MATROSKA_DEMUXER) += fate-vp9$(2)-$(1) +fate-vp9$(2)-$(1): CMD = framemd5 $(3) -i $(TARGET_SAMPLES)/vp9-test-vectors/vp90-2-$(1).webm +fate-vp9$(2)-$(1): REF = $(SRC_PATH)/tests/ref/fate/vp9-$(1) +endef + +VP9_Q = 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 \ + 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 \ + 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 \ + 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 +VP9_SHARP = 1 2 3 4 5 6 7 +VP9_SIZE_A = 08 10 16 18 32 34 64 66 +VP9_SIZE_B = 196 198 200 202 208 210 224 226 + +define FATE_VP9_FULL +$(foreach Q,$(VP9_Q),$(eval $(call FATE_VP9_SUITE,00-quantizer-$(Q),$(1),$(2)))) +$(foreach SHARP,$(VP9_SHARP),$(eval $(call FATE_VP9_SUITE,01-sharpness-$(SHARP),$(1),$(2)))) +$(foreach W,$(VP9_SIZE_A),$(eval $(foreach H,$(VP9_SIZE_A),$(eval $(call FATE_VP9_SUITE,02-size-$(W)x$(H),$(1),$(2)))))) +$(foreach W,$(VP9_SIZE_B),$(eval $(foreach H,$(VP9_SIZE_B),$(eval $(call FATE_VP9_SUITE,03-size-$(W)x$(H),$(1),$(2)))))) +$(eval $(call FATE_VP9_SUITE,03-deltaq,$(1),$(2))) +$(eval $(call FATE_VP9_SUITE,2pass-akiyo,$(1),$(2))) +$(eval $(call FATE_VP9_SUITE,segmentation-sf-akiyo,$(1),$(2))) +$(eval $(call FATE_VP9_SUITE,segmentation-aq-akiyo,$(1),$(2))) +$(eval $(call FATE_VP9_SUITE,tiling-pedestrian,$(1),$(2))) +$(eval $(call FATE_VP9_SUITE,parallelmode-akiyo,$(1),$(2))) +endef + +$(eval $(call FATE_VP9_FULL)) +$(eval $(call FATE_VP9_FULL,-emu-edge,-flags +emu_edge)) + +FATE_SAMPLES_AVCONV-$(CONFIG_VP9_DECODER) += $(FATE_VP9-yes) +fate-vp9: $(FATE_VP9-yes) diff --git a/ffmpeg/tests/fate/vqf.mak b/ffmpeg/tests/fate/vqf.mak index 67ee61f..ac18ebd 100644 --- a/ffmpeg/tests/fate/vqf.mak +++ b/ffmpeg/tests/fate/vqf.mak @@ -1,10 +1,10 @@ FATE_VQF-$(call DEMDEC, VQF, TWINVQ) += fate-twinvq -fate-twinvq: CMD = pcm -i $(SAMPLES)/vqf/achterba.vqf +fate-twinvq: CMD = pcm -i $(TARGET_SAMPLES)/vqf/achterba.vqf fate-twinvq: CMP = oneoff fate-twinvq: REF = $(SAMPLES)/vqf/achterba.pcm FATE_VQF-$(CONFIG_VQF_DEMUXER) += fate-vqf-demux -fate-vqf-demux: CMD = md5 -i $(SAMPLES)/vqf/achterba.vqf -acodec copy -f framecrc +fate-vqf-demux: CMD = md5 -i $(TARGET_SAMPLES)/vqf/achterba.vqf -acodec copy -flags bitexact -f framecrc FATE_VQF += $(FATE_VQF-yes) diff --git a/ffmpeg/tests/fate/wavpack.mak b/ffmpeg/tests/fate/wavpack.mak index 8a1c301..98e0998 100644 --- a/ffmpeg/tests/fate/wavpack.mak +++ b/ffmpeg/tests/fate/wavpack.mak @@ -1,92 +1,102 @@ +FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += $(FATE_WAVPACK) + # lossless -FATE_WAVPACK += fate-wavpack-lossless-8bit -fate-wavpack-lossless-8bit: CMD = md5 -i $(SAMPLES)/wavpack/lossless/8bit-partial.wv -f s8 +FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossless-8bit +fate-wavpack-lossless-8bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/8bit-partial.wv -f s8 -FATE_WAVPACK += fate-wavpack-lossless-12bit -fate-wavpack-lossless-12bit: CMD = md5 -i $(SAMPLES)/wavpack/lossless/12bit-partial.wv -f s16le +FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossless-12bit +fate-wavpack-lossless-12bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/12bit-partial.wv -f s16le -FATE_WAVPACK += fate-wavpack-lossless-16bit -fate-wavpack-lossless-16bit: CMD = md5 -i $(SAMPLES)/wavpack/lossless/16bit-partial.wv -f s16le +FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossless-16bit +fate-wavpack-lossless-16bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/16bit-partial.wv -f s16le -FATE_WAVPACK += fate-wavpack-lossless-24bit -fate-wavpack-lossless-24bit: CMD = md5 -i $(SAMPLES)/wavpack/lossless/24bit-partial.wv -f s24le +FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossless-24bit +fate-wavpack-lossless-24bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/24bit-partial.wv -f s24le -FATE_WAVPACK += fate-wavpack-lossless-32bit -fate-wavpack-lossless-32bit: CMD = md5 -i $(SAMPLES)/wavpack/lossless/32bit_int-partial.wv -f s32le +FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossless-32bit +fate-wavpack-lossless-32bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/32bit_int-partial.wv -f s32le -FATE_WAVPACK += fate-wavpack-lossless-float -fate-wavpack-lossless-float: CMD = md5 -i $(SAMPLES)/wavpack/lossless/32bit_float-partial.wv -f f32le +FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossless-float +fate-wavpack-lossless-float: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/32bit_float-partial.wv -f f32le # lossy -FATE_WAVPACK += fate-wavpack-lossy-8bit -fate-wavpack-lossy-8bit: CMD = md5 -i $(SAMPLES)/wavpack/lossy/4.0_8-bit.wv -f s8 +FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossy-8bit +fate-wavpack-lossy-8bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossy/4.0_8-bit.wv -f s8 -FATE_WAVPACK += fate-wavpack-lossy-16bit -fate-wavpack-lossy-16bit: CMD = md5 -i $(SAMPLES)/wavpack/lossy/4.0_16-bit.wv -f s16le +FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossy-16bit +fate-wavpack-lossy-16bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossy/4.0_16-bit.wv -f s16le -FATE_WAVPACK += fate-wavpack-lossy-24bit -fate-wavpack-lossy-24bit: CMD = md5 -i $(SAMPLES)/wavpack/lossy/4.0_24-bit.wv -f s24le +FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossy-24bit +fate-wavpack-lossy-24bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossy/4.0_24-bit.wv -f s24le -FATE_WAVPACK += fate-wavpack-lossy-32bit -fate-wavpack-lossy-32bit: CMD = md5 -i $(SAMPLES)/wavpack/lossy/4.0_32-bit_int.wv -f s32le +FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossy-32bit +fate-wavpack-lossy-32bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossy/4.0_32-bit_int.wv -f s32le -FATE_WAVPACK += fate-wavpack-lossy-float -fate-wavpack-lossy-float: CMD = md5 -i $(SAMPLES)/wavpack/lossy/2.0_32-bit_float.wv -f f32le +FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossy-float +fate-wavpack-lossy-float: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossy/2.0_32-bit_float.wv -f f32le # channel configurations -FATE_WAVPACK += fate-wavpack-channels-monofloat -fate-wavpack-channels-monofloat: CMD = md5 -i $(SAMPLES)/wavpack/num_channels/mono_float-partial.wv -f f32le +FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-channels-monofloat +fate-wavpack-channels-monofloat: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/mono_float-partial.wv -f f32le -FATE_WAVPACK += fate-wavpack-channels-monoint -fate-wavpack-channels-monoint: CMD = md5 -i $(SAMPLES)/wavpack/num_channels/mono_16bit_int.wv -f s16le +FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-channels-monoint +fate-wavpack-channels-monoint: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/mono_16bit_int.wv -f s16le -FATE_WAVPACK += fate-wavpack-channels-4.0 -fate-wavpack-channels-4.0: CMD = md5 -i $(SAMPLES)/wavpack/num_channels/edward_4.0_16bit-partial.wv -f s16le +FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-channels-4.0 +fate-wavpack-channels-4.0: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/edward_4.0_16bit-partial.wv -f s16le -FATE_WAVPACK += fate-wavpack-channels-5.1 -fate-wavpack-channels-5.1: CMD = md5 -i $(SAMPLES)/wavpack/num_channels/panslab_sample_5.1_16bit-partial.wv -f s16le +FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-channels-5.1 +fate-wavpack-channels-5.1: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/panslab_sample_5.1_16bit-partial.wv -f s16le -FATE_WAVPACK += fate-wavpack-channels-6.1 -fate-wavpack-channels-6.1: CMD = md5 -i $(SAMPLES)/wavpack/num_channels/eva_2.22_6.1_16bit-partial.wv -f s16le +FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-channels-6.1 +fate-wavpack-channels-6.1: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/eva_2.22_6.1_16bit-partial.wv -f s16le -FATE_WAVPACK += fate-wavpack-channels-7.1 -fate-wavpack-channels-7.1: CMD = md5 -i $(SAMPLES)/wavpack/num_channels/panslab_sample_7.1_16bit-partial.wv -f s16le +FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-channels-7.1 +fate-wavpack-channels-7.1: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/panslab_sample_7.1_16bit-partial.wv -f s16le # speed modes -FATE_WAVPACK += fate-wavpack-speed-default -fate-wavpack-speed-default: CMD = md5 -i $(SAMPLES)/wavpack/speed_modes/default-partial.wv -f s16le +FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-speed-default +fate-wavpack-speed-default: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/speed_modes/default-partial.wv -f s16le -FATE_WAVPACK += fate-wavpack-speed-fast -fate-wavpack-speed-fast: CMD = md5 -i $(SAMPLES)/wavpack/speed_modes/fast-partial.wv -f s16le +FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-speed-fast +fate-wavpack-speed-fast: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/speed_modes/fast-partial.wv -f s16le -FATE_WAVPACK += fate-wavpack-speed-high -fate-wavpack-speed-high: CMD = md5 -i $(SAMPLES)/wavpack/speed_modes/high-partial.wv -f s16le +FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-speed-high +fate-wavpack-speed-high: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/speed_modes/high-partial.wv -f s16le -FATE_WAVPACK += fate-wavpack-speed-vhigh -fate-wavpack-speed-vhigh: CMD = md5 -i $(SAMPLES)/wavpack/speed_modes/vhigh-partial.wv -f s16le +FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-speed-vhigh +fate-wavpack-speed-vhigh: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/speed_modes/vhigh-partial.wv -f s16le # special cases -FATE_WAVPACK += fate-wavpack-clipping -fate-wavpack-clipping: CMD = md5 -i $(SAMPLES)/wavpack/special/clipping.wv -f s16le - -FATE_WAVPACK += fate-wavpack-cuesheet -fate-wavpack-cuesheet: CMD = md5 -i $(SAMPLES)/wavpack/special/cue_sheet.wv -f s16le +FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-clipping +fate-wavpack-clipping: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/clipping.wv -f s16le -FATE_WAVPACK += fate-wavpack-falsestereo -fate-wavpack-falsestereo: CMD = md5 -i $(SAMPLES)/wavpack/special/false_stereo.wv -f s16le +FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-cuesheet +fate-wavpack-cuesheet: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/cue_sheet.wv -f s16le -FATE_WAVPACK += fate-wavpack-zerolsbs -fate-wavpack-zerolsbs: CMD = md5 -i $(SAMPLES)/wavpack/special/zero_lsbs.wv -f s16le +FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-falsestereo +fate-wavpack-falsestereo: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/false_stereo.wv -f s16le -FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += $(FATE_WAVPACK) +FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-zerolsbs +fate-wavpack-zerolsbs: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/zero_lsbs.wv -f s16le FATE_WAVPACK-$(call DEMDEC, MATROSKA, WAVPACK) += fate-wavpack-matroskamode -fate-wavpack-matroskamode: CMD = md5 -i $(SAMPLES)/wavpack/special/matroska_mode.mka -f s16le +fate-wavpack-matroskamode: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/matroska_mode.mka -f s16le + +FATE_WAVPACK-$(call DEMMUX, WV, MATROSKA) += fate-wavpack-matroska_mux-mono +fate-wavpack-matroska_mux-mono: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/mono_16bit_int.wv -c copy -flags +bitexact -f matroska +fate-wavpack-matroska_mux-mono: CMP = oneline +fate-wavpack-matroska_mux-mono: REF = a2987e2e51e01a35e47e7da13eb47a35 + +FATE_WAVPACK-$(call DEMMUX, WV, MATROSKA) += fate-wavpack-matroska_mux-61 +fate-wavpack-matroska_mux-61: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/eva_2.22_6.1_16bit-partial.wv -c copy -flags +bitexact -f matroska +fate-wavpack-matroska_mux-61: CMP = oneline +fate-wavpack-matroska_mux-61: REF = ffba4ddea1ba71f7a5901d9ed1a267be FATE_SAMPLES_AVCONV += $(FATE_WAVPACK-yes) fate-wavpack: $(FATE_WAVPACK-yes) diff --git a/ffmpeg/tests/fate/wma.mak b/ffmpeg/tests/fate/wma.mak index b9a856c..1b8c5f9 100644 --- a/ffmpeg/tests/fate/wma.mak +++ b/ffmpeg/tests/fate/wma.mak @@ -1,13 +1,13 @@ FATE_WMAPRO-$(call DEMDEC, ASF, WMAPRO) += fate-wmapro-2ch -fate-wmapro-2ch: CMD = pcm -i $(SAMPLES)/wmapro/Beethovens_9th-1_small.wma +fate-wmapro-2ch: CMD = pcm -i $(TARGET_SAMPLES)/wmapro/Beethovens_9th-1_small.wma fate-wmapro-2ch: REF = $(SAMPLES)/wmapro/Beethovens_9th-1_small.pcm FATE_WMAPRO-$(call DEMDEC, ASF, WMAPRO) += fate-wmapro-5.1 -fate-wmapro-5.1: CMD = pcm -i $(SAMPLES)/wmapro/latin_192_mulitchannel_cut.wma +fate-wmapro-5.1: CMD = pcm -i $(TARGET_SAMPLES)/wmapro/latin_192_mulitchannel_cut.wma fate-wmapro-5.1: REF = $(SAMPLES)/wmapro/latin_192_mulitchannel_cut.pcm FATE_WMAPRO-$(call DEMDEC, MOV, WMAPRO) += fate-wmapro-ism -fate-wmapro-ism: CMD = pcm -i $(SAMPLES)/isom/vc1-wmapro.ism -vn +fate-wmapro-ism: CMD = pcm -i $(TARGET_SAMPLES)/isom/vc1-wmapro.ism -vn fate-wmapro-ism: REF = $(SAMPLES)/isom/vc1-wmapro.pcm $(FATE_WMAPRO-yes): CMP = oneoff @@ -16,17 +16,17 @@ FATE_SAMPLES_AVCONV += $(FATE_WMAPRO-yes) fate-wmapro: $(FATE_WMAPRO-yes) FATE_WMAVOICE-$(call DEMDEC, ASF, WMAVOICE) += fate-wmavoice-7k -fate-wmavoice-7k: CMD = pcm -i $(SAMPLES)/wmavoice/streaming_CBR-7K.wma +fate-wmavoice-7k: CMD = pcm -i $(TARGET_SAMPLES)/wmavoice/streaming_CBR-7K.wma fate-wmavoice-7k: REF = $(SAMPLES)/wmavoice/streaming_CBR-7K.pcm fate-wmavoice-7k: FUZZ = 3 FATE_WMAVOICE-$(call DEMDEC, ASF, WMAVOICE) += fate-wmavoice-11k -fate-wmavoice-11k: CMD = pcm -i $(SAMPLES)/wmavoice/streaming_CBR-11K.wma +fate-wmavoice-11k: CMD = pcm -i $(TARGET_SAMPLES)/wmavoice/streaming_CBR-11K.wma fate-wmavoice-11k: REF = $(SAMPLES)/wmavoice/streaming_CBR-11K.pcm fate-wmavoice-11k: FUZZ = 3 FATE_WMAVOICE-$(call DEMDEC, ASF, WMAVOICE) += fate-wmavoice-19k -fate-wmavoice-19k: CMD = pcm -i $(SAMPLES)/wmavoice/streaming_CBR-19K.wma +fate-wmavoice-19k: CMD = pcm -i $(TARGET_SAMPLES)/wmavoice/streaming_CBR-19K.wma fate-wmavoice-19k: REF = $(SAMPLES)/wmavoice/streaming_CBR-19K.pcm fate-wmavoice-19k: FUZZ = 3 @@ -36,13 +36,13 @@ FATE_SAMPLES_AVCONV += $(FATE_WMAVOICE-yes) fate-wmavoice: $(FATE_WMAVOICE-yes) FATE_WMA_ENCODE-$(call ENCDEC, WMAV1, ASF) += fate-wmav1-encode -fate-wmav1-encode: CMD = enc_dec_pcm asf wav s16le $(REF) -c:a wmav1 -b:a 128k +fate-wmav1-encode: CMD = enc_dec_pcm asf wav s16le $(subst $(SAMPLES),$(TARGET_SAMPLES),$(REF)) -c:a wmav1 -b:a 128k fate-wmav1-encode: CMP_SHIFT = -8192 fate-wmav1-encode: CMP_TARGET = 291.06 fate-wmav1-encode: SIZE_TOLERANCE = 4632 FATE_WMA_ENCODE-$(call ENCDEC, WMAV2, ASF) += fate-wmav2-encode -fate-wmav2-encode: CMD = enc_dec_pcm asf wav s16le $(REF) -c:a wmav2 -b:a 128k +fate-wmav2-encode: CMD = enc_dec_pcm asf wav s16le $(subst $(SAMPLES),$(TARGET_SAMPLES),$(REF)) -c:a wmav2 -b:a 128k fate-wmav2-encode: CMP_SHIFT = -8192 fate-wmav2-encode: CMP_TARGET = 258.32 fate-wmav2-encode: SIZE_TOLERANCE = 4632 diff --git a/ffmpeg/tests/lavf-regression.sh b/ffmpeg/tests/lavf-regression.sh index 1bfdd1e..a4b2ad5 100755 --- a/ffmpeg/tests/lavf-regression.sh +++ b/ffmpeg/tests/lavf-regression.sh @@ -50,7 +50,7 @@ do_image_formats() outfile="$datadir/images/$1/" mkdir -p "$outfile" file=${outfile}%02d.$1 - run_avconv $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $2 $ENC_OPTS -t 0.5 -y -qscale 10 $target_path/$file + run_avconv $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $2 $ENC_OPTS -frames 13 -y -qscale 10 $target_path/$file do_md5sum ${outfile}02.$1 do_avconv_crc $file $DEC_OPTS -i $target_path/$file $3 echo $(wc -c ${outfile}02.$1) @@ -180,18 +180,9 @@ do_streamed_images ppm fi if [ -n "$do_gif" ] ; then -# this tests the gif muxer file=${outfile}lavf.gif do_avconv $file $DEC_OPTS -f image2 -vcodec 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 -# and this the gif encoder -do_image_formats gif "" "-pix_fmt rgb24" -do_image_formats gif "-pix_fmt rgb4_byte" "-pix_fmt rgb24" -do_image_formats gif "-pix_fmt bgr4_byte" "-pix_fmt rgb24" -do_image_formats gif "-pix_fmt rgb8" "-pix_fmt rgb24" -do_image_formats gif "-pix_fmt bgr8" "-pix_fmt rgb24" -do_image_formats gif "-pix_fmt gray" "-pix_fmt rgb24" -do_image_formats gif "-pix_fmt pal8" "-pix_fmt rgb24" fi if [ -n "$do_yuv4mpeg" ] ; then @@ -244,8 +235,8 @@ if [ -n "$do_pam" ] ; then do_image_formats pam do_image_formats pam "-pix_fmt rgba" do_image_formats pam "-pix_fmt gray" -do_image_formats pam "-pix_fmt gray16be" -do_image_formats pam "-pix_fmt rgb48be" +do_image_formats pam "-pix_fmt gray16be" "-pix_fmt gray16be" +do_image_formats pam "-pix_fmt rgb48be" "-pix_fmt rgb48be" do_image_formats pam "-pix_fmt monob" fi @@ -255,8 +246,11 @@ fi if [ -n "$do_dpx" ] ; then do_image_formats dpx +do_image_formats dpx "-pix_fmt gbrp10le" "-pix_fmt gbrp10le" +do_image_formats dpx "-pix_fmt gbrp12le" "-pix_fmt gbrp12le" do_image_formats dpx "-pix_fmt rgb48le" do_image_formats dpx "-pix_fmt rgb48le -bits_per_raw_sample 10" "-pix_fmt rgb48le" +do_image_formats dpx "-pix_fmt rgba64le" fi if [ -n "$do_xwd" ] ; then diff --git a/ffmpeg/tests/lavfi-regression.sh b/ffmpeg/tests/lavfi-regression.sh deleted file mode 100755 index 6460742..0000000 --- a/ffmpeg/tests/lavfi-regression.sh +++ /dev/null @@ -1,141 +0,0 @@ -#!/bin/sh -# -# automatic regression test for libavfilter -# -# -#set -x - -set -e - -. $(dirname $0)/regression-funcs.sh - -eval do_$test=y - -do_video_filter() { - label=$1 - filters="$2" - shift 2 - printf '%-20s' $label - run_avconv $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src \ - $ENC_OPTS -vf "$filters" -vcodec rawvideo $* -f nut md5: -} - -do_lavfi_plain() { - vfilters="$2" - - if [ $test = $1 ] ; then - do_video_filter $test "$2" - fi -} - -do_lavfi() { - do_lavfi_plain $1 "$2" -} - -do_lavfi_colormatrix() { - do_lavfi "${1}1" "$1=$4:$5,$1=$5:$3,$1=$3:$4,$1=$4:$3,$1=$3:$5,$1=$5:$2" - do_lavfi "${1}2" "$1=$2:$3,$1=$3:$2,$1=$2:$4,$1=$4:$2,$1=$2:$5,$1=$5:$4" -} - -do_lavfi "crop" "crop=iw-100:ih-100:100:100" -do_lavfi "crop_scale" "crop=iw-100:ih-100:100:100,scale=400:-1" -do_lavfi "crop_scale_vflip" "null,null,crop=iw-200:ih-200:200:200,crop=iw-20:ih-20:20:20,scale=200:200,scale=250:250,vflip,vflip,null,scale=200:200,crop=iw-100:ih-100:100:100,vflip,scale=200:200,null,vflip,crop=iw-100:ih-100:100:100,null" -do_lavfi "crop_vflip" "crop=iw-100:ih-100:100:100,vflip" -do_lavfi "drawbox" "drawbox=224:24:88:72:#FF8010@0.5" -do_lavfi "edgedetect" "edgedetect" -do_lavfi "fade" "fade=in:5:15,fade=out:30:15" -do_lavfi "hue" "perms=random,hue=s=sin(2*PI*t)+1" -do_lavfi "idet" "idet" -do_lavfi "null" "null" -do_lavfi "overlay_rgb" "split[m],scale=88:72,pad=96:80:4:4[o2];[m]fifo[o1],[o1][o2]overlay=240:16:format=rgb" -do_lavfi "overlay_yuv420" "split[m],scale=88:72,pad=96:80:4:4[o2];[m]fifo[o1],[o1][o2]overlay=240:16:format=yuv420" -do_lavfi "overlay_yuv444" "split[m],scale=88:72,pad=96:80:4:4[o2];[m]fifo[o1],[o1][o2]overlay=240:16:format=yuv444" -do_lavfi "pad" "pad=iw*1.5:ih*1.5:iw*0.3:ih*0.2" -do_lavfi "pp" "pp=be/hb/vb/tn/l5/al" -do_lavfi "pp2" "pp=be/fq:16/h1/v1/lb" -do_lavfi "pp3" "pp=be/fq:8/ha:128:7/va/li" -do_lavfi "pp4" "pp=be/ci" -do_lavfi "pp5" "pp=md" -do_lavfi "pp6" "pp=be/fd" -do_lavfi "scale200" "scale=200:200" -do_lavfi "scale500" "scale=500:500" -do_lavfi "select" "select=not(eq(mod(n\,2)\,0)+eq(mod(n\,3)\,0))" -do_lavfi "setdar" "setdar=16/9" -do_lavfi "setsar" "setsar=16/11" -do_lavfi "thumbnail" "thumbnail=10" -do_lavfi "tile" "tile=3x3:nb_frames=5:padding=7:margin=2" -do_lavfi "transpose" "transpose" -do_lavfi "unsharp" "unsharp=11:11:-1.5:11:11:-1.5" -do_lavfi "vflip" "vflip" -do_lavfi "vflip_crop" "vflip,crop=iw-100:ih-100:100:100" -do_lavfi "vflip_vflip" "vflip,vflip" - -do_lavfi_plain "alphamerge_rgb" "[in]format=bgra,split,alphamerge[out]" -do_lavfi_plain "alphamerge_yuv" "[in]format=yuv420p,split,alphamerge[out]" -do_lavfi_plain "alphaextract_rgb" "[in]format=bgra,split,alphamerge,split[o3][o4];[o4]alphaextract[alpha];[o3][alpha]alphamerge[out]" -do_lavfi_plain "alphaextract_yuv" "[in]format=yuv420p,split,alphamerge,split[o3][o4];[o4]alphaextract[alpha];[o3][alpha]alphamerge[out]" - -do_lavfi_colormatrix "colormatrix" bt709 fcc bt601 smpte240m - -do_lavfi_pixfmts(){ - testname=$1; - test ${test%_[bl]e} = $testname || return 0 - filter=$2 - filter_args=$3 - prefilter_chain=$4 - - showfiltfmts="$target_exec $target_path/libavfilter/filtfmts-test" - scale_exclude_fmts=${outfile}${testname}_scale_exclude_fmts - scale_in_fmts=${outfile}${testname}_scale_in_fmts - scale_out_fmts=${outfile}${testname}_scale_out_fmts - in_fmts=${outfile}${testname}_in_fmts - - # exclude pixel formats which are not supported as input - $showfiltfmts scale | awk -F '[ \r]' '/^INPUT/{ fmt=substr($3, 5); print fmt }' | sort >$scale_in_fmts - $showfiltfmts scale | awk -F '[ \r]' '/^OUTPUT/{ fmt=substr($3, 5); print fmt }' | sort >$scale_out_fmts - comm -12 $scale_in_fmts $scale_out_fmts >$scale_exclude_fmts - - $showfiltfmts $filter | awk -F '[ \r]' '/^INPUT/{ fmt=substr($3, 5); print fmt }' | sort >$in_fmts - pix_fmts=$(comm -12 $scale_exclude_fmts $in_fmts) - - for pix_fmt in $pix_fmts; do - do_video_filter $pix_fmt "${prefilter_chain}format=$pix_fmt,$filter=$filter_args" -pix_fmt $pix_fmt - done - - rm $in_fmts $scale_in_fmts $scale_out_fmts $scale_exclude_fmts -} - -# all these filters have exactly one input and exactly one output -do_lavfi_pixfmts "field" "field" "bottom" -do_lavfi_pixfmts "histeq" "histeq" "antibanding=strong" -do_lavfi_pixfmts "il" "il" "luma_mode=d:chroma_mode=d:alpha_mode=d" -do_lavfi_pixfmts "kerndeint" "kerndeint" "" "tinterlace=interleave_top," -do_lavfi_pixfmts "pixfmts_copy" "copy" "" -do_lavfi_pixfmts "pixfmts_crop" "crop" "100:100:100:100" -do_lavfi_pixfmts "pixfmts_hflip" "hflip" "" -do_lavfi_pixfmts "pixfmts_null" "null" "" -do_lavfi_pixfmts "pixfmts_pad" "pad" "500:400:20:20" -do_lavfi_pixfmts "pixfmts_pixdesctest" "pixdesctest" -do_lavfi_pixfmts "pixfmts_scale" "scale" "200:100" -do_lavfi_pixfmts "pixfmts_super2xsai" "super2xsai" -do_lavfi_pixfmts "pixfmts_vflip" "vflip" -do_lavfi_pixfmts "tinterlace_merge" "tinterlace" "merge" -do_lavfi_pixfmts "tinterlace_pad" "tinterlace" "pad" - -do_lavfi_lavd() { - label=$1 - graph=$2 - shift 2 - [ $test = $label ] || return 0 - printf '%-20s' $label - run_avconv $DEC_OPTS -f lavfi -i $graph \ - $ENC_OPTS -vcodec rawvideo $* -f nut md5: -} - -do_lavfi_lavd "life" "life=s=40x40:r=5:seed=42:mold=64" -t 2 -do_lavfi_lavd "testsrc" "testsrc=r=7:n=2:d=10" -do_lavfi_lavd "scalenorm" "sws_flags=+accurate_rnd+bitexact;testsrc=s=128x96:d=1:r=5,format=yuv420p[a];testsrc=s=160x120:d=1:r=5[b];[a][b]concat=unsafe=1,scale=flags=+accurate_rnd+bitexact" - -# TODO: add tests for -# direct rendering, -# chains with feedback loops diff --git a/ffmpeg/tests/ref/acodec/alac b/ffmpeg/tests/ref/acodec/alac index d923719..2739b01 100644 --- a/ffmpeg/tests/ref/acodec/alac +++ b/ffmpeg/tests/ref/acodec/alac @@ -1,4 +1,4 @@ -f01f453dd13c4e88266409cddf2a7177 *tests/data/fate/acodec-alac.mov +8d9fb9f5433962e7880b666e6e2e428e *tests/data/fate/acodec-alac.mov 389018 tests/data/fate/acodec-alac.mov 64151e4bcc2b717aa5a8454d424d6a1f *tests/data/fate/acodec-alac.out.wav stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 diff --git a/ffmpeg/tests/ref/acodec/pcm-s16be b/ffmpeg/tests/ref/acodec/pcm-s16be index 6f7222a..de7c5c7 100644 --- a/ffmpeg/tests/ref/acodec/pcm-s16be +++ b/ffmpeg/tests/ref/acodec/pcm-s16be @@ -1,4 +1,4 @@ -d00ca427a66be2e33ca8d63bcde41316 *tests/data/fate/acodec-pcm-s16be.mov +d2515f35266ae6dba525c700bb76d893 *tests/data/fate/acodec-pcm-s16be.mov 1059069 tests/data/fate/acodec-pcm-s16be.mov 64151e4bcc2b717aa5a8454d424d6a1f *tests/data/fate/acodec-pcm-s16be.out.wav stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 diff --git a/ffmpeg/tests/ref/acodec/pcm-s24be b/ffmpeg/tests/ref/acodec/pcm-s24be index 3ebe02a..70271d2 100644 --- a/ffmpeg/tests/ref/acodec/pcm-s24be +++ b/ffmpeg/tests/ref/acodec/pcm-s24be @@ -1,4 +1,4 @@ -f65a7ae3b70ca53ffa354b1e7ff3a33d *tests/data/fate/acodec-pcm-s24be.mov +0f4a37a77619124f486f656f03c53d33 *tests/data/fate/acodec-pcm-s24be.mov 1588323 tests/data/fate/acodec-pcm-s24be.mov 64151e4bcc2b717aa5a8454d424d6a1f *tests/data/fate/acodec-pcm-s24be.out.wav stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 diff --git a/ffmpeg/tests/ref/acodec/pcm-s32be b/ffmpeg/tests/ref/acodec/pcm-s32be index 9075083..03f14c1 100644 --- a/ffmpeg/tests/ref/acodec/pcm-s32be +++ b/ffmpeg/tests/ref/acodec/pcm-s32be @@ -1,4 +1,4 @@ -f9e16fafeefb2285e943f53133e9cfd5 *tests/data/fate/acodec-pcm-s32be.mov +d6380bf54ac3e452c190ce302c264bf0 *tests/data/fate/acodec-pcm-s32be.mov 2117527 tests/data/fate/acodec-pcm-s32be.mov 64151e4bcc2b717aa5a8454d424d6a1f *tests/data/fate/acodec-pcm-s32be.out.wav stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 diff --git a/ffmpeg/tests/ref/acodec/pcm-s8 b/ffmpeg/tests/ref/acodec/pcm-s8 index 247c46c..a5a459a 100644 --- a/ffmpeg/tests/ref/acodec/pcm-s8 +++ b/ffmpeg/tests/ref/acodec/pcm-s8 @@ -1,4 +1,4 @@ -d931dc4fffa2d3398e0f31f97e7d6c3a *tests/data/fate/acodec-pcm-s8.mov +00a9d90e06e8ecb79e5dd4c6c8460836 *tests/data/fate/acodec-pcm-s8.mov 529853 tests/data/fate/acodec-pcm-s8.mov 651d4eb8d98dfcdda96ae6c43d8f156b *tests/data/fate/acodec-pcm-s8.out.wav stddev: 147.89 PSNR: 52.93 MAXDIFF: 255 bytes: 1058400/ 1058400 diff --git a/ffmpeg/tests/ref/fate/adpcm-ima-amv b/ffmpeg/tests/ref/fate/adpcm-ima-amv index ca7a168..4bd22af 100644 --- a/ffmpeg/tests/ref/fate/adpcm-ima-amv +++ b/ffmpeg/tests/ref/fate/adpcm-ima-amv @@ -158,4 +158,4 @@ 0, 215010, 215010, 1380, 2760, 0xb83548f4 0, 216390, 216390, 1378, 2756, 0x22647962 0, 217768, 217768, 1378, 2756, 0x14ca54d3 -0, 219146, 219146, 1378, 2756, 0x58754b3a +0, 219146, 219146, 1354, 2708, 0x85e82e8d diff --git a/ffmpeg/tests/ref/fate/adpcm-ms-mono b/ffmpeg/tests/ref/fate/adpcm-ms-mono index 3bf44f8..c456708 100644 --- a/ffmpeg/tests/ref/fate/adpcm-ms-mono +++ b/ffmpeg/tests/ref/fate/adpcm-ms-mono @@ -43,4 +43,4 @@ 0, 20500, 20500, 500, 1000, 0xf195eb44 0, 21000, 21000, 500, 1000, 0xa491f3ef 0, 21500, 21500, 500, 1000, 0x2c036e18 -0, 22000, 22000, 500, 1000, 0x52d65e2a +0, 22000, 22000, 50, 100, 0x0bd81f05 diff --git a/ffmpeg/tests/ref/fate/bethsoft-vid b/ffmpeg/tests/ref/fate/bethsoft-vid index f59823c..9f96da1 100644 --- a/ffmpeg/tests/ref/fate/bethsoft-vid +++ b/ffmpeg/tests/ref/fate/bethsoft-vid @@ -140,4 +140,4 @@ 0, 68, 68, 1, 192000, 0x3ec3cce1 1, 54760, 54760, 537, 1074, 0x142ce7ba 0, 69, 69, 1, 192000, 0x159313a8 -1, 55297, 55297, 925, 1850, 0x7ff682f7 +1, 55297, 55297, 258, 516, 0x98885b26 diff --git a/ffmpeg/tests/ref/fate/crc b/ffmpeg/tests/ref/fate/crc index 1c24aea..89273d8 100644 --- a/ffmpeg/tests/ref/fate/crc +++ b/ffmpeg/tests/ref/fate/crc @@ -1,4 +1,5 @@ crc EDB88320 = 3D5CDD04 crc 04C11DB7 = E0BAF5C0 +crc 00864CFB = 326039 crc 00008005 = BB1F crc 00000007 = E3 diff --git a/ffmpeg/tests/ref/fate/cyberia-c93 b/ffmpeg/tests/ref/fate/cyberia-c93 index 2c71e50..f02435c 100644 --- a/ffmpeg/tests/ref/fate/cyberia-c93 +++ b/ffmpeg/tests/ref/fate/cyberia-c93 @@ -36,7 +36,7 @@ 0, 30, 30, 1, 184320, 0x54975910 0, 31, 31, 1, 184320, 0xf4857db9 0, 32, 32, 1, 184320, 0x82d18161 -1, 42552, 42552, 14184, 28368, 0x9101e519 +1, 42552, 42552, 5835, 11670, 0x04aa0b1e 0, 33, 33, 1, 184320, 0x06d93bd0 0, 34, 34, 1, 184320, 0xa4304c00 0, 35, 35, 1, 184320, 0x5f77d9cd diff --git a/ffmpeg/tests/ref/fate/eval b/ffmpeg/tests/ref/fate/eval index 0e76fe5..97e0b20 100644 --- a/ffmpeg/tests/ref/fate/eval +++ b/ffmpeg/tests/ref/fate/eval @@ -259,5 +259,14 @@ Evaluating 'bitand(42, 12)' Evaluating 'bitand(NAN, 1)' 'bitand(NAN, 1)' -> nan +Evaluating 'between(10, -3, 10)' +'between(10, -3, 10)' -> 1.000000 + +Evaluating 'between(-4, -2, -1)' +'between(-4, -2, -1)' -> 0.000000 + +Evaluating 'between(1,2)' +'between(1,2)' -> nan + 12.700000 == 12.7 0.931323 == 0.931322575 diff --git a/ffmpeg/tests/ref/fate/ffprobe_compact b/ffmpeg/tests/ref/fate/ffprobe_compact index 36d19ce..c744544 100644 --- a/ffmpeg/tests/ref/fate/ffprobe_compact +++ b/ffmpeg/tests/ref/fate/ffprobe_compact @@ -1,32 +1,32 @@ packet|codec_type=audio|stream_index=0|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=572|flags=K -frame|media_type=audio|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=572|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=mono +frame|media_type=audio|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|best_effort_timestamp=0|best_effort_timestamp_time=0.000000|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=572|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown packet|codec_type=video|stream_index=1|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=2647|flags=K -frame|media_type=video|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=2647|pkt_size=N/A|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0 +frame|media_type=video|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|best_effort_timestamp=0|best_effort_timestamp_time=0.000000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=2647|pkt_size=N/A|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0 packet|codec_type=video|stream_index=2|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=233068|flags=K -frame|media_type=video|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=233068|pkt_size=N/A|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0 +frame|media_type=video|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|best_effort_timestamp=0|best_effort_timestamp_time=0.000000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=233068|pkt_size=N/A|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0 packet|codec_type=audio|stream_index=0|pts=1024|pts_time=0.023220|dts=1024|dts_time=0.023220|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=263073|flags=K -frame|media_type=audio|key_frame=1|pkt_pts=1024|pkt_pts_time=0.023220|pkt_dts=1024|pkt_dts_time=0.023220|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=263073|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=mono +frame|media_type=audio|key_frame=1|pkt_pts=1024|pkt_pts_time=0.023220|pkt_dts=1024|pkt_dts_time=0.023220|best_effort_timestamp=1024|best_effort_timestamp_time=0.023220|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=263073|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown packet|codec_type=video|stream_index=1|pts=2048|pts_time=0.040000|dts=2048|dts_time=0.040000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=265151|flags=K -frame|media_type=video|key_frame=1|pkt_pts=2048|pkt_pts_time=0.040000|pkt_dts=2048|pkt_dts_time=0.040000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=265151|pkt_size=N/A|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0 +frame|media_type=video|key_frame=1|pkt_pts=2048|pkt_pts_time=0.040000|pkt_dts=2048|pkt_dts_time=0.040000|best_effort_timestamp=2048|best_effort_timestamp_time=0.040000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=265151|pkt_size=N/A|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0 packet|codec_type=video|stream_index=2|pts=2048|pts_time=0.040000|dts=2048|dts_time=0.040000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=495575|flags=K -frame|media_type=video|key_frame=1|pkt_pts=2048|pkt_pts_time=0.040000|pkt_dts=2048|pkt_dts_time=0.040000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=495575|pkt_size=N/A|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0 +frame|media_type=video|key_frame=1|pkt_pts=2048|pkt_pts_time=0.040000|pkt_dts=2048|pkt_dts_time=0.040000|best_effort_timestamp=2048|best_effort_timestamp_time=0.040000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=495575|pkt_size=N/A|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0 packet|codec_type=audio|stream_index=0|pts=2048|pts_time=0.046440|dts=2048|dts_time=0.046440|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=525580|flags=K -frame|media_type=audio|key_frame=1|pkt_pts=2048|pkt_pts_time=0.046440|pkt_dts=2048|pkt_dts_time=0.046440|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=525580|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=mono +frame|media_type=audio|key_frame=1|pkt_pts=2048|pkt_pts_time=0.046440|pkt_dts=2048|pkt_dts_time=0.046440|best_effort_timestamp=2048|best_effort_timestamp_time=0.046440|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=525580|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown packet|codec_type=audio|stream_index=0|pts=3072|pts_time=0.069660|dts=3072|dts_time=0.069660|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=527651|flags=K -frame|media_type=audio|key_frame=1|pkt_pts=3072|pkt_pts_time=0.069660|pkt_dts=3072|pkt_dts_time=0.069660|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=527651|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=mono +frame|media_type=audio|key_frame=1|pkt_pts=3072|pkt_pts_time=0.069660|pkt_dts=3072|pkt_dts_time=0.069660|best_effort_timestamp=3072|best_effort_timestamp_time=0.069660|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=527651|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown packet|codec_type=video|stream_index=1|pts=4096|pts_time=0.080000|dts=4096|dts_time=0.080000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=529729|flags=K -frame|media_type=video|key_frame=1|pkt_pts=4096|pkt_pts_time=0.080000|pkt_dts=4096|pkt_dts_time=0.080000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=529729|pkt_size=N/A|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0 +frame|media_type=video|key_frame=1|pkt_pts=4096|pkt_pts_time=0.080000|pkt_dts=4096|pkt_dts_time=0.080000|best_effort_timestamp=4096|best_effort_timestamp_time=0.080000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=529729|pkt_size=N/A|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0 packet|codec_type=video|stream_index=2|pts=4096|pts_time=0.080000|dts=4096|dts_time=0.080000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=760153|flags=K -frame|media_type=video|key_frame=1|pkt_pts=4096|pkt_pts_time=0.080000|pkt_dts=4096|pkt_dts_time=0.080000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=760153|pkt_size=N/A|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0 +frame|media_type=video|key_frame=1|pkt_pts=4096|pkt_pts_time=0.080000|pkt_dts=4096|pkt_dts_time=0.080000|best_effort_timestamp=4096|best_effort_timestamp_time=0.080000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=760153|pkt_size=N/A|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0 packet|codec_type=audio|stream_index=0|pts=4096|pts_time=0.092880|dts=4096|dts_time=0.092880|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=790158|flags=K -frame|media_type=audio|key_frame=1|pkt_pts=4096|pkt_pts_time=0.092880|pkt_dts=4096|pkt_dts_time=0.092880|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=790158|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=mono +frame|media_type=audio|key_frame=1|pkt_pts=4096|pkt_pts_time=0.092880|pkt_dts=4096|pkt_dts_time=0.092880|best_effort_timestamp=4096|best_effort_timestamp_time=0.092880|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=790158|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown packet|codec_type=audio|stream_index=0|pts=5120|pts_time=0.116100|dts=5120|dts_time=0.116100|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=792229|flags=K -frame|media_type=audio|key_frame=1|pkt_pts=5120|pkt_pts_time=0.116100|pkt_dts=5120|pkt_dts_time=0.116100|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=792229|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=mono +frame|media_type=audio|key_frame=1|pkt_pts=5120|pkt_pts_time=0.116100|pkt_dts=5120|pkt_dts_time=0.116100|best_effort_timestamp=5120|best_effort_timestamp_time=0.116100|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=792229|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown packet|codec_type=video|stream_index=1|pts=6144|pts_time=0.120000|dts=6144|dts_time=0.120000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=794307|flags=K -frame|media_type=video|key_frame=1|pkt_pts=6144|pkt_pts_time=0.120000|pkt_dts=6144|pkt_dts_time=0.120000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=794307|pkt_size=N/A|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0 +frame|media_type=video|key_frame=1|pkt_pts=6144|pkt_pts_time=0.120000|pkt_dts=6144|pkt_dts_time=0.120000|best_effort_timestamp=6144|best_effort_timestamp_time=0.120000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=794307|pkt_size=N/A|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0 packet|codec_type=video|stream_index=2|pts=6144|pts_time=0.120000|dts=6144|dts_time=0.120000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=1024731|flags=K -frame|media_type=video|key_frame=1|pkt_pts=6144|pkt_pts_time=0.120000|pkt_dts=6144|pkt_dts_time=0.120000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=1024731|pkt_size=N/A|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0 -stream|index=0|codec_name=pcm_s16le|profile=unknown|codec_type=audio|codec_time_base=1/44100|codec_tag_string=PSD[16]|codec_tag=0x10445350|sample_fmt=s16|sample_rate=44100|channels=1|bits_per_sample=16|id=N/A|r_frame_rate=0/0|avg_frame_rate=0/0|time_base=1/44100|start_pts=0|start_time=0.000000|duration_ts=527406|duration=11.959320|bit_rate=705600|nb_frames=N/A|nb_read_frames=6|nb_read_packets=6|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|tag:E=mc² -stream|index=1|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/51200|codec_tag_string=RGB[24]|codec_tag=0x18424752|width=320|height=240|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=4:3|pix_fmt=rgb24|level=-99|timecode=N/A|id=N/A|r_frame_rate=25/1|avg_frame_rate=25/1|time_base=1/51200|start_pts=0|start_time=0.000000|duration_ts=612317|duration=11.959316|bit_rate=N/A|nb_frames=N/A|nb_read_frames=4|nb_read_packets=4|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|tag:title=foobar|tag:duration_ts=field-and-tags-conflict-attempt -stream|index=2|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/51200|codec_tag_string=RGB[24]|codec_tag=0x18424752|width=100|height=100|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=1:1|pix_fmt=rgb24|level=-99|timecode=N/A|id=N/A|r_frame_rate=25/1|avg_frame_rate=25/1|time_base=1/51200|start_pts=0|start_time=0.000000|duration_ts=612317|duration=11.959316|bit_rate=N/A|nb_frames=N/A|nb_read_frames=4|nb_read_packets=4|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0 -format|filename=tests/data/ffprobe-test.nut|nb_streams=3|format_name=nut|start_time=0.000000|duration=11.959320|size=1054812|bit_rate=705599|tag:title=ffprobe test file|tag:comment='A comment with CSV, XML & JSON special chars': <tag value="x">|tag:comment2=I ♥ Üñîçød€ +frame|media_type=video|key_frame=1|pkt_pts=6144|pkt_pts_time=0.120000|pkt_dts=6144|pkt_dts_time=0.120000|best_effort_timestamp=6144|best_effort_timestamp_time=0.120000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=1024731|pkt_size=N/A|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0 +stream|index=0|codec_name=pcm_s16le|profile=unknown|codec_type=audio|codec_time_base=1/44100|codec_tag_string=PSD[16]|codec_tag=0x10445350|sample_fmt=s16|sample_rate=44100|channels=1|channel_layout=unknown|bits_per_sample=16|id=N/A|r_frame_rate=0/0|avg_frame_rate=0/0|time_base=1/44100|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=705600|nb_frames=N/A|nb_read_frames=6|nb_read_packets=6|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|tag:E=mc² +stream|index=1|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/51200|codec_tag_string=RGB[24]|codec_tag=0x18424752|width=320|height=240|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=4:3|pix_fmt=rgb24|level=-99|timecode=N/A|id=N/A|r_frame_rate=25/1|avg_frame_rate=25/1|time_base=1/51200|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=N/A|nb_frames=N/A|nb_read_frames=4|nb_read_packets=4|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|tag:title=foobar|tag:duration_ts=field-and-tags-conflict-attempt +stream|index=2|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/51200|codec_tag_string=RGB[24]|codec_tag=0x18424752|width=100|height=100|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=1:1|pix_fmt=rgb24|level=-99|timecode=N/A|id=N/A|r_frame_rate=25/1|avg_frame_rate=25/1|time_base=1/51200|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=N/A|nb_frames=N/A|nb_read_frames=4|nb_read_packets=4|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0 +format|filename=tests/data/ffprobe-test.nut|nb_streams=3|nb_programs=0|format_name=nut|start_time=0.000000|duration=0.120000|size=1054812|bit_rate=70320800|probe_score=100|tag:title=ffprobe test file|tag:comment='A comment with CSV, XML & JSON special chars': <tag value="x">|tag:comment2=I ♥ Üñîçød€ diff --git a/ffmpeg/tests/ref/fate/ffprobe_csv b/ffmpeg/tests/ref/fate/ffprobe_csv index 575eb76..88ed221 100644 --- a/ffmpeg/tests/ref/fate/ffprobe_csv +++ b/ffmpeg/tests/ref/fate/ffprobe_csv @@ -1,32 +1,32 @@ packet,audio,0,0,0.000000,0,0.000000,1024,0.023220,N/A,N/A,2048,572,K -frame,audio,1,0,0.000000,0,0.000000,1024,0.023220,572,2048,s16,1024,1,mono +frame,audio,1,0,0.000000,0,0.000000,0,0.000000,1024,0.023220,572,2048,s16,1024,1,unknown packet,video,1,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,230400,2647,K -frame,video,1,0,0.000000,0,0.000000,2048,0.040000,2647,N/A,320,240,rgb24,1:1,I,0,0,0,0,0 +frame,video,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,2647,N/A,320,240,rgb24,1:1,I,0,0,0,0,0 packet,video,2,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,30000,233068,K -frame,video,1,0,0.000000,0,0.000000,2048,0.040000,233068,N/A,100,100,rgb24,1:1,I,0,0,0,0,0 +frame,video,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,233068,N/A,100,100,rgb24,1:1,I,0,0,0,0,0 packet,audio,0,1024,0.023220,1024,0.023220,1024,0.023220,N/A,N/A,2048,263073,K -frame,audio,1,1024,0.023220,1024,0.023220,1024,0.023220,263073,2048,s16,1024,1,mono +frame,audio,1,1024,0.023220,1024,0.023220,1024,0.023220,1024,0.023220,263073,2048,s16,1024,1,unknown packet,video,1,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,230400,265151,K -frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,265151,N/A,320,240,rgb24,1:1,I,0,0,0,0,0 +frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,265151,N/A,320,240,rgb24,1:1,I,0,0,0,0,0 packet,video,2,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,30000,495575,K -frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,495575,N/A,100,100,rgb24,1:1,I,0,0,0,0,0 +frame,video,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,495575,N/A,100,100,rgb24,1:1,I,0,0,0,0,0 packet,audio,0,2048,0.046440,2048,0.046440,1024,0.023220,N/A,N/A,2048,525580,K -frame,audio,1,2048,0.046440,2048,0.046440,1024,0.023220,525580,2048,s16,1024,1,mono +frame,audio,1,2048,0.046440,2048,0.046440,2048,0.046440,1024,0.023220,525580,2048,s16,1024,1,unknown packet,audio,0,3072,0.069660,3072,0.069660,1024,0.023220,N/A,N/A,2048,527651,K -frame,audio,1,3072,0.069660,3072,0.069660,1024,0.023220,527651,2048,s16,1024,1,mono +frame,audio,1,3072,0.069660,3072,0.069660,3072,0.069660,1024,0.023220,527651,2048,s16,1024,1,unknown packet,video,1,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,230400,529729,K -frame,video,1,4096,0.080000,4096,0.080000,2048,0.040000,529729,N/A,320,240,rgb24,1:1,I,0,0,0,0,0 +frame,video,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,529729,N/A,320,240,rgb24,1:1,I,0,0,0,0,0 packet,video,2,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,30000,760153,K -frame,video,1,4096,0.080000,4096,0.080000,2048,0.040000,760153,N/A,100,100,rgb24,1:1,I,0,0,0,0,0 +frame,video,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,760153,N/A,100,100,rgb24,1:1,I,0,0,0,0,0 packet,audio,0,4096,0.092880,4096,0.092880,1024,0.023220,N/A,N/A,2048,790158,K -frame,audio,1,4096,0.092880,4096,0.092880,1024,0.023220,790158,2048,s16,1024,1,mono +frame,audio,1,4096,0.092880,4096,0.092880,4096,0.092880,1024,0.023220,790158,2048,s16,1024,1,unknown packet,audio,0,5120,0.116100,5120,0.116100,1024,0.023220,N/A,N/A,2048,792229,K -frame,audio,1,5120,0.116100,5120,0.116100,1024,0.023220,792229,2048,s16,1024,1,mono +frame,audio,1,5120,0.116100,5120,0.116100,5120,0.116100,1024,0.023220,792229,2048,s16,1024,1,unknown packet,video,1,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,230400,794307,K -frame,video,1,6144,0.120000,6144,0.120000,2048,0.040000,794307,N/A,320,240,rgb24,1:1,I,0,0,0,0,0 +frame,video,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,794307,N/A,320,240,rgb24,1:1,I,0,0,0,0,0 packet,video,2,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,30000,1024731,K -frame,video,1,6144,0.120000,6144,0.120000,2048,0.040000,1024731,N/A,100,100,rgb24,1:1,I,0,0,0,0,0 -stream,0,pcm_s16le,unknown,audio,1/44100,PSD[16],0x10445350,s16,44100,1,16,N/A,0/0,0/0,1/44100,0,0.000000,527406,11.959320,705600,N/A,6,6,0,0,0,0,0,0,0,0,0,0,0,mc² -stream,1,rawvideo,unknown,video,1/51200,RGB[24],0x18424752,320,240,0,1:1,4:3,rgb24,-99,N/A,N/A,25/1,25/1,1/51200,0,0.000000,612317,11.959316,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0,foobar,field-and-tags-conflict-attempt -stream,2,rawvideo,unknown,video,1/51200,RGB[24],0x18424752,100,100,0,1:1,1:1,rgb24,-99,N/A,N/A,25/1,25/1,1/51200,0,0.000000,612317,11.959316,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0 -format,tests/data/ffprobe-test.nut,3,nut,0.000000,11.959320,1054812,705599,ffprobe test file,"'A comment with CSV, XML & JSON special chars': <tag value=""x"">",I ♥ Üñîçød€ +frame,video,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,1024731,N/A,100,100,rgb24,1:1,I,0,0,0,0,0 +stream,0,pcm_s16le,unknown,audio,1/44100,PSD[16],0x10445350,s16,44100,1,unknown,16,N/A,0/0,0/0,1/44100,0,0.000000,N/A,N/A,705600,N/A,6,6,0,0,0,0,0,0,0,0,0,0,0,mc² +stream,1,rawvideo,unknown,video,1/51200,RGB[24],0x18424752,320,240,0,1:1,4:3,rgb24,-99,N/A,N/A,25/1,25/1,1/51200,0,0.000000,N/A,N/A,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0,foobar,field-and-tags-conflict-attempt +stream,2,rawvideo,unknown,video,1/51200,RGB[24],0x18424752,100,100,0,1:1,1:1,rgb24,-99,N/A,N/A,25/1,25/1,1/51200,0,0.000000,N/A,N/A,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0 +format,tests/data/ffprobe-test.nut,3,0,nut,0.000000,0.120000,1054812,70320800,100,ffprobe test file,"'A comment with CSV, XML & JSON special chars': <tag value=""x"">",I ♥ Üñîçød€ diff --git a/ffmpeg/tests/ref/fate/ffprobe_default b/ffmpeg/tests/ref/fate/ffprobe_default index 26922c1..76b9ed8 100644 --- a/ffmpeg/tests/ref/fate/ffprobe_default +++ b/ffmpeg/tests/ref/fate/ffprobe_default @@ -20,6 +20,8 @@ pkt_pts=0 pkt_pts_time=0.000000 pkt_dts=0 pkt_dts_time=0.000000 +best_effort_timestamp=0 +best_effort_timestamp_time=0.000000 pkt_duration=1024 pkt_duration_time=0.023220 pkt_pos=572 @@ -27,7 +29,7 @@ pkt_size=2048 sample_fmt=s16 nb_samples=1024 channels=1 -channel_layout=mono +channel_layout=unknown [/FRAME] [PACKET] codec_type=video @@ -51,6 +53,8 @@ pkt_pts=0 pkt_pts_time=0.000000 pkt_dts=0 pkt_dts_time=0.000000 +best_effort_timestamp=0 +best_effort_timestamp_time=0.000000 pkt_duration=2048 pkt_duration_time=0.040000 pkt_pos=2647 @@ -88,6 +92,8 @@ pkt_pts=0 pkt_pts_time=0.000000 pkt_dts=0 pkt_dts_time=0.000000 +best_effort_timestamp=0 +best_effort_timestamp_time=0.000000 pkt_duration=2048 pkt_duration_time=0.040000 pkt_pos=233068 @@ -125,6 +131,8 @@ pkt_pts=1024 pkt_pts_time=0.023220 pkt_dts=1024 pkt_dts_time=0.023220 +best_effort_timestamp=1024 +best_effort_timestamp_time=0.023220 pkt_duration=1024 pkt_duration_time=0.023220 pkt_pos=263073 @@ -132,7 +140,7 @@ pkt_size=2048 sample_fmt=s16 nb_samples=1024 channels=1 -channel_layout=mono +channel_layout=unknown [/FRAME] [PACKET] codec_type=video @@ -156,6 +164,8 @@ pkt_pts=2048 pkt_pts_time=0.040000 pkt_dts=2048 pkt_dts_time=0.040000 +best_effort_timestamp=2048 +best_effort_timestamp_time=0.040000 pkt_duration=2048 pkt_duration_time=0.040000 pkt_pos=265151 @@ -193,6 +203,8 @@ pkt_pts=2048 pkt_pts_time=0.040000 pkt_dts=2048 pkt_dts_time=0.040000 +best_effort_timestamp=2048 +best_effort_timestamp_time=0.040000 pkt_duration=2048 pkt_duration_time=0.040000 pkt_pos=495575 @@ -230,6 +242,8 @@ pkt_pts=2048 pkt_pts_time=0.046440 pkt_dts=2048 pkt_dts_time=0.046440 +best_effort_timestamp=2048 +best_effort_timestamp_time=0.046440 pkt_duration=1024 pkt_duration_time=0.023220 pkt_pos=525580 @@ -237,7 +251,7 @@ pkt_size=2048 sample_fmt=s16 nb_samples=1024 channels=1 -channel_layout=mono +channel_layout=unknown [/FRAME] [PACKET] codec_type=audio @@ -261,6 +275,8 @@ pkt_pts=3072 pkt_pts_time=0.069660 pkt_dts=3072 pkt_dts_time=0.069660 +best_effort_timestamp=3072 +best_effort_timestamp_time=0.069660 pkt_duration=1024 pkt_duration_time=0.023220 pkt_pos=527651 @@ -268,7 +284,7 @@ pkt_size=2048 sample_fmt=s16 nb_samples=1024 channels=1 -channel_layout=mono +channel_layout=unknown [/FRAME] [PACKET] codec_type=video @@ -292,6 +308,8 @@ pkt_pts=4096 pkt_pts_time=0.080000 pkt_dts=4096 pkt_dts_time=0.080000 +best_effort_timestamp=4096 +best_effort_timestamp_time=0.080000 pkt_duration=2048 pkt_duration_time=0.040000 pkt_pos=529729 @@ -329,6 +347,8 @@ pkt_pts=4096 pkt_pts_time=0.080000 pkt_dts=4096 pkt_dts_time=0.080000 +best_effort_timestamp=4096 +best_effort_timestamp_time=0.080000 pkt_duration=2048 pkt_duration_time=0.040000 pkt_pos=760153 @@ -366,6 +386,8 @@ pkt_pts=4096 pkt_pts_time=0.092880 pkt_dts=4096 pkt_dts_time=0.092880 +best_effort_timestamp=4096 +best_effort_timestamp_time=0.092880 pkt_duration=1024 pkt_duration_time=0.023220 pkt_pos=790158 @@ -373,7 +395,7 @@ pkt_size=2048 sample_fmt=s16 nb_samples=1024 channels=1 -channel_layout=mono +channel_layout=unknown [/FRAME] [PACKET] codec_type=audio @@ -397,6 +419,8 @@ pkt_pts=5120 pkt_pts_time=0.116100 pkt_dts=5120 pkt_dts_time=0.116100 +best_effort_timestamp=5120 +best_effort_timestamp_time=0.116100 pkt_duration=1024 pkt_duration_time=0.023220 pkt_pos=792229 @@ -404,7 +428,7 @@ pkt_size=2048 sample_fmt=s16 nb_samples=1024 channels=1 -channel_layout=mono +channel_layout=unknown [/FRAME] [PACKET] codec_type=video @@ -428,6 +452,8 @@ pkt_pts=6144 pkt_pts_time=0.120000 pkt_dts=6144 pkt_dts_time=0.120000 +best_effort_timestamp=6144 +best_effort_timestamp_time=0.120000 pkt_duration=2048 pkt_duration_time=0.040000 pkt_pos=794307 @@ -465,6 +491,8 @@ pkt_pts=6144 pkt_pts_time=0.120000 pkt_dts=6144 pkt_dts_time=0.120000 +best_effort_timestamp=6144 +best_effort_timestamp_time=0.120000 pkt_duration=2048 pkt_duration_time=0.040000 pkt_pos=1024731 @@ -491,6 +519,7 @@ codec_tag=0x10445350 sample_fmt=s16 sample_rate=44100 channels=1 +channel_layout=unknown bits_per_sample=16 id=N/A r_frame_rate=0/0 @@ -498,8 +527,8 @@ avg_frame_rate=0/0 time_base=1/44100 start_pts=0 start_time=0.000000 -duration_ts=527406 -duration=11.959320 +duration_ts=N/A +duration=N/A bit_rate=705600 nb_frames=N/A nb_read_frames=6 @@ -539,8 +568,8 @@ avg_frame_rate=25/1 time_base=1/51200 start_pts=0 start_time=0.000000 -duration_ts=612317 -duration=11.959316 +duration_ts=N/A +duration=N/A bit_rate=N/A nb_frames=N/A nb_read_frames=4 @@ -581,8 +610,8 @@ avg_frame_rate=25/1 time_base=1/51200 start_pts=0 start_time=0.000000 -duration_ts=612317 -duration=11.959316 +duration_ts=N/A +duration=N/A bit_rate=N/A nb_frames=N/A nb_read_frames=4 @@ -602,11 +631,13 @@ DISPOSITION:attached_pic=0 [FORMAT] filename=tests/data/ffprobe-test.nut nb_streams=3 +nb_programs=0 format_name=nut start_time=0.000000 -duration=11.959320 +duration=0.120000 size=1054812 -bit_rate=705599 +bit_rate=70320800 +probe_score=100 TAG:title=ffprobe test file TAG:comment='A comment with CSV, XML & JSON special chars': <tag value="x"> TAG:comment2=I ♥ Üñîçød€ diff --git a/ffmpeg/tests/ref/fate/ffprobe_flat b/ffmpeg/tests/ref/fate/ffprobe_flat index d62127a..44a1dcf 100644 --- a/ffmpeg/tests/ref/fate/ffprobe_flat +++ b/ffmpeg/tests/ref/fate/ffprobe_flat @@ -17,6 +17,8 @@ packets_and_frames.frame.0.pkt_pts=0 packets_and_frames.frame.0.pkt_pts_time="0.000000" packets_and_frames.frame.0.pkt_dts=0 packets_and_frames.frame.0.pkt_dts_time="0.000000" +packets_and_frames.frame.0.best_effort_timestamp=0 +packets_and_frames.frame.0.best_effort_timestamp_time="0.000000" packets_and_frames.frame.0.pkt_duration=1024 packets_and_frames.frame.0.pkt_duration_time="0.023220" packets_and_frames.frame.0.pkt_pos="572" @@ -24,7 +26,7 @@ packets_and_frames.frame.0.pkt_size="2048" packets_and_frames.frame.0.sample_fmt="s16" packets_and_frames.frame.0.nb_samples=1024 packets_and_frames.frame.0.channels=1 -packets_and_frames.frame.0.channel_layout="mono" +packets_and_frames.frame.0.channel_layout="unknown" packets_and_frames.packet.1.codec_type="video" packets_and_frames.packet.1.stream_index=1 packets_and_frames.packet.1.pts=0 @@ -44,6 +46,8 @@ packets_and_frames.frame.1.pkt_pts=0 packets_and_frames.frame.1.pkt_pts_time="0.000000" packets_and_frames.frame.1.pkt_dts=0 packets_and_frames.frame.1.pkt_dts_time="0.000000" +packets_and_frames.frame.1.best_effort_timestamp=0 +packets_and_frames.frame.1.best_effort_timestamp_time="0.000000" packets_and_frames.frame.1.pkt_duration=2048 packets_and_frames.frame.1.pkt_duration_time="0.040000" packets_and_frames.frame.1.pkt_pos="2647" @@ -77,6 +81,8 @@ packets_and_frames.frame.2.pkt_pts=0 packets_and_frames.frame.2.pkt_pts_time="0.000000" packets_and_frames.frame.2.pkt_dts=0 packets_and_frames.frame.2.pkt_dts_time="0.000000" +packets_and_frames.frame.2.best_effort_timestamp=0 +packets_and_frames.frame.2.best_effort_timestamp_time="0.000000" packets_and_frames.frame.2.pkt_duration=2048 packets_and_frames.frame.2.pkt_duration_time="0.040000" packets_and_frames.frame.2.pkt_pos="233068" @@ -110,6 +116,8 @@ packets_and_frames.frame.3.pkt_pts=1024 packets_and_frames.frame.3.pkt_pts_time="0.023220" packets_and_frames.frame.3.pkt_dts=1024 packets_and_frames.frame.3.pkt_dts_time="0.023220" +packets_and_frames.frame.3.best_effort_timestamp=1024 +packets_and_frames.frame.3.best_effort_timestamp_time="0.023220" packets_and_frames.frame.3.pkt_duration=1024 packets_and_frames.frame.3.pkt_duration_time="0.023220" packets_and_frames.frame.3.pkt_pos="263073" @@ -117,7 +125,7 @@ packets_and_frames.frame.3.pkt_size="2048" packets_and_frames.frame.3.sample_fmt="s16" packets_and_frames.frame.3.nb_samples=1024 packets_and_frames.frame.3.channels=1 -packets_and_frames.frame.3.channel_layout="mono" +packets_and_frames.frame.3.channel_layout="unknown" packets_and_frames.packet.4.codec_type="video" packets_and_frames.packet.4.stream_index=1 packets_and_frames.packet.4.pts=2048 @@ -137,6 +145,8 @@ packets_and_frames.frame.4.pkt_pts=2048 packets_and_frames.frame.4.pkt_pts_time="0.040000" packets_and_frames.frame.4.pkt_dts=2048 packets_and_frames.frame.4.pkt_dts_time="0.040000" +packets_and_frames.frame.4.best_effort_timestamp=2048 +packets_and_frames.frame.4.best_effort_timestamp_time="0.040000" packets_and_frames.frame.4.pkt_duration=2048 packets_and_frames.frame.4.pkt_duration_time="0.040000" packets_and_frames.frame.4.pkt_pos="265151" @@ -170,6 +180,8 @@ packets_and_frames.frame.5.pkt_pts=2048 packets_and_frames.frame.5.pkt_pts_time="0.040000" packets_and_frames.frame.5.pkt_dts=2048 packets_and_frames.frame.5.pkt_dts_time="0.040000" +packets_and_frames.frame.5.best_effort_timestamp=2048 +packets_and_frames.frame.5.best_effort_timestamp_time="0.040000" packets_and_frames.frame.5.pkt_duration=2048 packets_and_frames.frame.5.pkt_duration_time="0.040000" packets_and_frames.frame.5.pkt_pos="495575" @@ -203,6 +215,8 @@ packets_and_frames.frame.6.pkt_pts=2048 packets_and_frames.frame.6.pkt_pts_time="0.046440" packets_and_frames.frame.6.pkt_dts=2048 packets_and_frames.frame.6.pkt_dts_time="0.046440" +packets_and_frames.frame.6.best_effort_timestamp=2048 +packets_and_frames.frame.6.best_effort_timestamp_time="0.046440" packets_and_frames.frame.6.pkt_duration=1024 packets_and_frames.frame.6.pkt_duration_time="0.023220" packets_and_frames.frame.6.pkt_pos="525580" @@ -210,7 +224,7 @@ packets_and_frames.frame.6.pkt_size="2048" packets_and_frames.frame.6.sample_fmt="s16" packets_and_frames.frame.6.nb_samples=1024 packets_and_frames.frame.6.channels=1 -packets_and_frames.frame.6.channel_layout="mono" +packets_and_frames.frame.6.channel_layout="unknown" packets_and_frames.packet.7.codec_type="audio" packets_and_frames.packet.7.stream_index=0 packets_and_frames.packet.7.pts=3072 @@ -230,6 +244,8 @@ packets_and_frames.frame.7.pkt_pts=3072 packets_and_frames.frame.7.pkt_pts_time="0.069660" packets_and_frames.frame.7.pkt_dts=3072 packets_and_frames.frame.7.pkt_dts_time="0.069660" +packets_and_frames.frame.7.best_effort_timestamp=3072 +packets_and_frames.frame.7.best_effort_timestamp_time="0.069660" packets_and_frames.frame.7.pkt_duration=1024 packets_and_frames.frame.7.pkt_duration_time="0.023220" packets_and_frames.frame.7.pkt_pos="527651" @@ -237,7 +253,7 @@ packets_and_frames.frame.7.pkt_size="2048" packets_and_frames.frame.7.sample_fmt="s16" packets_and_frames.frame.7.nb_samples=1024 packets_and_frames.frame.7.channels=1 -packets_and_frames.frame.7.channel_layout="mono" +packets_and_frames.frame.7.channel_layout="unknown" packets_and_frames.packet.8.codec_type="video" packets_and_frames.packet.8.stream_index=1 packets_and_frames.packet.8.pts=4096 @@ -257,6 +273,8 @@ packets_and_frames.frame.8.pkt_pts=4096 packets_and_frames.frame.8.pkt_pts_time="0.080000" packets_and_frames.frame.8.pkt_dts=4096 packets_and_frames.frame.8.pkt_dts_time="0.080000" +packets_and_frames.frame.8.best_effort_timestamp=4096 +packets_and_frames.frame.8.best_effort_timestamp_time="0.080000" packets_and_frames.frame.8.pkt_duration=2048 packets_and_frames.frame.8.pkt_duration_time="0.040000" packets_and_frames.frame.8.pkt_pos="529729" @@ -290,6 +308,8 @@ packets_and_frames.frame.9.pkt_pts=4096 packets_and_frames.frame.9.pkt_pts_time="0.080000" packets_and_frames.frame.9.pkt_dts=4096 packets_and_frames.frame.9.pkt_dts_time="0.080000" +packets_and_frames.frame.9.best_effort_timestamp=4096 +packets_and_frames.frame.9.best_effort_timestamp_time="0.080000" packets_and_frames.frame.9.pkt_duration=2048 packets_and_frames.frame.9.pkt_duration_time="0.040000" packets_and_frames.frame.9.pkt_pos="760153" @@ -323,6 +343,8 @@ packets_and_frames.frame.10.pkt_pts=4096 packets_and_frames.frame.10.pkt_pts_time="0.092880" packets_and_frames.frame.10.pkt_dts=4096 packets_and_frames.frame.10.pkt_dts_time="0.092880" +packets_and_frames.frame.10.best_effort_timestamp=4096 +packets_and_frames.frame.10.best_effort_timestamp_time="0.092880" packets_and_frames.frame.10.pkt_duration=1024 packets_and_frames.frame.10.pkt_duration_time="0.023220" packets_and_frames.frame.10.pkt_pos="790158" @@ -330,7 +352,7 @@ packets_and_frames.frame.10.pkt_size="2048" packets_and_frames.frame.10.sample_fmt="s16" packets_and_frames.frame.10.nb_samples=1024 packets_and_frames.frame.10.channels=1 -packets_and_frames.frame.10.channel_layout="mono" +packets_and_frames.frame.10.channel_layout="unknown" packets_and_frames.packet.11.codec_type="audio" packets_and_frames.packet.11.stream_index=0 packets_and_frames.packet.11.pts=5120 @@ -350,6 +372,8 @@ packets_and_frames.frame.11.pkt_pts=5120 packets_and_frames.frame.11.pkt_pts_time="0.116100" packets_and_frames.frame.11.pkt_dts=5120 packets_and_frames.frame.11.pkt_dts_time="0.116100" +packets_and_frames.frame.11.best_effort_timestamp=5120 +packets_and_frames.frame.11.best_effort_timestamp_time="0.116100" packets_and_frames.frame.11.pkt_duration=1024 packets_and_frames.frame.11.pkt_duration_time="0.023220" packets_and_frames.frame.11.pkt_pos="792229" @@ -357,7 +381,7 @@ packets_and_frames.frame.11.pkt_size="2048" packets_and_frames.frame.11.sample_fmt="s16" packets_and_frames.frame.11.nb_samples=1024 packets_and_frames.frame.11.channels=1 -packets_and_frames.frame.11.channel_layout="mono" +packets_and_frames.frame.11.channel_layout="unknown" packets_and_frames.packet.12.codec_type="video" packets_and_frames.packet.12.stream_index=1 packets_and_frames.packet.12.pts=6144 @@ -377,6 +401,8 @@ packets_and_frames.frame.12.pkt_pts=6144 packets_and_frames.frame.12.pkt_pts_time="0.120000" packets_and_frames.frame.12.pkt_dts=6144 packets_and_frames.frame.12.pkt_dts_time="0.120000" +packets_and_frames.frame.12.best_effort_timestamp=6144 +packets_and_frames.frame.12.best_effort_timestamp_time="0.120000" packets_and_frames.frame.12.pkt_duration=2048 packets_and_frames.frame.12.pkt_duration_time="0.040000" packets_and_frames.frame.12.pkt_pos="794307" @@ -410,6 +436,8 @@ packets_and_frames.frame.13.pkt_pts=6144 packets_and_frames.frame.13.pkt_pts_time="0.120000" packets_and_frames.frame.13.pkt_dts=6144 packets_and_frames.frame.13.pkt_dts_time="0.120000" +packets_and_frames.frame.13.best_effort_timestamp=6144 +packets_and_frames.frame.13.best_effort_timestamp_time="0.120000" packets_and_frames.frame.13.pkt_duration=2048 packets_and_frames.frame.13.pkt_duration_time="0.040000" packets_and_frames.frame.13.pkt_pos="1024731" @@ -434,6 +462,7 @@ streams.stream.0.codec_tag="0x10445350" streams.stream.0.sample_fmt="s16" streams.stream.0.sample_rate="44100" streams.stream.0.channels=1 +streams.stream.0.channel_layout="unknown" streams.stream.0.bits_per_sample=16 streams.stream.0.id="N/A" streams.stream.0.r_frame_rate="0/0" @@ -441,8 +470,8 @@ streams.stream.0.avg_frame_rate="0/0" streams.stream.0.time_base="1/44100" streams.stream.0.start_pts=0 streams.stream.0.start_time="0.000000" -streams.stream.0.duration_ts=527406 -streams.stream.0.duration="11.959320" +streams.stream.0.duration_ts="N/A" +streams.stream.0.duration="N/A" streams.stream.0.bit_rate="705600" streams.stream.0.nb_frames="N/A" streams.stream.0.nb_read_frames="6" @@ -480,8 +509,8 @@ streams.stream.1.avg_frame_rate="25/1" streams.stream.1.time_base="1/51200" streams.stream.1.start_pts=0 streams.stream.1.start_time="0.000000" -streams.stream.1.duration_ts=612317 -streams.stream.1.duration="11.959316" +streams.stream.1.duration_ts="N/A" +streams.stream.1.duration="N/A" streams.stream.1.bit_rate="N/A" streams.stream.1.nb_frames="N/A" streams.stream.1.nb_read_frames="4" @@ -520,8 +549,8 @@ streams.stream.2.avg_frame_rate="25/1" streams.stream.2.time_base="1/51200" streams.stream.2.start_pts=0 streams.stream.2.start_time="0.000000" -streams.stream.2.duration_ts=612317 -streams.stream.2.duration="11.959316" +streams.stream.2.duration_ts="N/A" +streams.stream.2.duration="N/A" streams.stream.2.bit_rate="N/A" streams.stream.2.nb_frames="N/A" streams.stream.2.nb_read_frames="4" @@ -539,11 +568,13 @@ streams.stream.2.disposition.clean_effects=0 streams.stream.2.disposition.attached_pic=0 format.filename="tests/data/ffprobe-test.nut" format.nb_streams=3 +format.nb_programs=0 format.format_name="nut" format.start_time="0.000000" -format.duration="11.959320" +format.duration="0.120000" format.size="1054812" -format.bit_rate="705599" +format.bit_rate="70320800" +format.probe_score=100 format.tags.title="ffprobe test file" format.tags.comment="'A comment with CSV, XML & JSON special chars': <tag value=\"x\">" format.tags.comment2="I ♥ Üñîçød€" diff --git a/ffmpeg/tests/ref/fate/ffprobe_ini b/ffmpeg/tests/ref/fate/ffprobe_ini index 476b1fe..77f84e8 100644 --- a/ffmpeg/tests/ref/fate/ffprobe_ini +++ b/ffmpeg/tests/ref/fate/ffprobe_ini @@ -22,6 +22,8 @@ pkt_pts=0 pkt_pts_time=0.000000 pkt_dts=0 pkt_dts_time=0.000000 +best_effort_timestamp=0 +best_effort_timestamp_time=0.000000 pkt_duration=1024 pkt_duration_time=0.023220 pkt_pos=572 @@ -29,7 +31,7 @@ pkt_size=2048 sample_fmt=s16 nb_samples=1024 channels=1 -channel_layout=mono +channel_layout=unknown [packets_and_frames.packet.1] codec_type=video @@ -53,6 +55,8 @@ pkt_pts=0 pkt_pts_time=0.000000 pkt_dts=0 pkt_dts_time=0.000000 +best_effort_timestamp=0 +best_effort_timestamp_time=0.000000 pkt_duration=2048 pkt_duration_time=0.040000 pkt_pos=2647 @@ -90,6 +94,8 @@ pkt_pts=0 pkt_pts_time=0.000000 pkt_dts=0 pkt_dts_time=0.000000 +best_effort_timestamp=0 +best_effort_timestamp_time=0.000000 pkt_duration=2048 pkt_duration_time=0.040000 pkt_pos=233068 @@ -127,6 +133,8 @@ pkt_pts=1024 pkt_pts_time=0.023220 pkt_dts=1024 pkt_dts_time=0.023220 +best_effort_timestamp=1024 +best_effort_timestamp_time=0.023220 pkt_duration=1024 pkt_duration_time=0.023220 pkt_pos=263073 @@ -134,7 +142,7 @@ pkt_size=2048 sample_fmt=s16 nb_samples=1024 channels=1 -channel_layout=mono +channel_layout=unknown [packets_and_frames.packet.4] codec_type=video @@ -158,6 +166,8 @@ pkt_pts=2048 pkt_pts_time=0.040000 pkt_dts=2048 pkt_dts_time=0.040000 +best_effort_timestamp=2048 +best_effort_timestamp_time=0.040000 pkt_duration=2048 pkt_duration_time=0.040000 pkt_pos=265151 @@ -195,6 +205,8 @@ pkt_pts=2048 pkt_pts_time=0.040000 pkt_dts=2048 pkt_dts_time=0.040000 +best_effort_timestamp=2048 +best_effort_timestamp_time=0.040000 pkt_duration=2048 pkt_duration_time=0.040000 pkt_pos=495575 @@ -232,6 +244,8 @@ pkt_pts=2048 pkt_pts_time=0.046440 pkt_dts=2048 pkt_dts_time=0.046440 +best_effort_timestamp=2048 +best_effort_timestamp_time=0.046440 pkt_duration=1024 pkt_duration_time=0.023220 pkt_pos=525580 @@ -239,7 +253,7 @@ pkt_size=2048 sample_fmt=s16 nb_samples=1024 channels=1 -channel_layout=mono +channel_layout=unknown [packets_and_frames.packet.7] codec_type=audio @@ -263,6 +277,8 @@ pkt_pts=3072 pkt_pts_time=0.069660 pkt_dts=3072 pkt_dts_time=0.069660 +best_effort_timestamp=3072 +best_effort_timestamp_time=0.069660 pkt_duration=1024 pkt_duration_time=0.023220 pkt_pos=527651 @@ -270,7 +286,7 @@ pkt_size=2048 sample_fmt=s16 nb_samples=1024 channels=1 -channel_layout=mono +channel_layout=unknown [packets_and_frames.packet.8] codec_type=video @@ -294,6 +310,8 @@ pkt_pts=4096 pkt_pts_time=0.080000 pkt_dts=4096 pkt_dts_time=0.080000 +best_effort_timestamp=4096 +best_effort_timestamp_time=0.080000 pkt_duration=2048 pkt_duration_time=0.040000 pkt_pos=529729 @@ -331,6 +349,8 @@ pkt_pts=4096 pkt_pts_time=0.080000 pkt_dts=4096 pkt_dts_time=0.080000 +best_effort_timestamp=4096 +best_effort_timestamp_time=0.080000 pkt_duration=2048 pkt_duration_time=0.040000 pkt_pos=760153 @@ -368,6 +388,8 @@ pkt_pts=4096 pkt_pts_time=0.092880 pkt_dts=4096 pkt_dts_time=0.092880 +best_effort_timestamp=4096 +best_effort_timestamp_time=0.092880 pkt_duration=1024 pkt_duration_time=0.023220 pkt_pos=790158 @@ -375,7 +397,7 @@ pkt_size=2048 sample_fmt=s16 nb_samples=1024 channels=1 -channel_layout=mono +channel_layout=unknown [packets_and_frames.packet.11] codec_type=audio @@ -399,6 +421,8 @@ pkt_pts=5120 pkt_pts_time=0.116100 pkt_dts=5120 pkt_dts_time=0.116100 +best_effort_timestamp=5120 +best_effort_timestamp_time=0.116100 pkt_duration=1024 pkt_duration_time=0.023220 pkt_pos=792229 @@ -406,7 +430,7 @@ pkt_size=2048 sample_fmt=s16 nb_samples=1024 channels=1 -channel_layout=mono +channel_layout=unknown [packets_and_frames.packet.12] codec_type=video @@ -430,6 +454,8 @@ pkt_pts=6144 pkt_pts_time=0.120000 pkt_dts=6144 pkt_dts_time=0.120000 +best_effort_timestamp=6144 +best_effort_timestamp_time=0.120000 pkt_duration=2048 pkt_duration_time=0.040000 pkt_pos=794307 @@ -467,6 +493,8 @@ pkt_pts=6144 pkt_pts_time=0.120000 pkt_dts=6144 pkt_dts_time=0.120000 +best_effort_timestamp=6144 +best_effort_timestamp_time=0.120000 pkt_duration=2048 pkt_duration_time=0.040000 pkt_pos=1024731 @@ -493,6 +521,7 @@ codec_tag=0x10445350 sample_fmt=s16 sample_rate=44100 channels=1 +channel_layout=unknown bits_per_sample=16 id=N/A r_frame_rate=0/0 @@ -500,8 +529,8 @@ avg_frame_rate=0/0 time_base=1/44100 start_pts=0 start_time=0.000000 -duration_ts=527406 -duration=11.959320 +duration_ts=N/A +duration=N/A bit_rate=705600 nb_frames=N/A nb_read_frames=6 @@ -545,8 +574,8 @@ avg_frame_rate=25/1 time_base=1/51200 start_pts=0 start_time=0.000000 -duration_ts=612317 -duration=11.959316 +duration_ts=N/A +duration=N/A bit_rate=N/A nb_frames=N/A nb_read_frames=4 @@ -591,8 +620,8 @@ avg_frame_rate=25/1 time_base=1/51200 start_pts=0 start_time=0.000000 -duration_ts=612317 -duration=11.959316 +duration_ts=N/A +duration=N/A bit_rate=N/A nb_frames=N/A nb_read_frames=4 @@ -614,11 +643,13 @@ attached_pic=0 [format] filename=tests/data/ffprobe-test.nut nb_streams=3 +nb_programs=0 format_name=nut start_time=0.000000 -duration=11.959320 +duration=0.120000 size=1054812 -bit_rate=705599 +bit_rate=70320800 +probe_score=100 [format.tags] title=ffprobe test file diff --git a/ffmpeg/tests/ref/fate/ffprobe_json b/ffmpeg/tests/ref/fate/ffprobe_json index 393ef46..12bd1a2 100644 --- a/ffmpeg/tests/ref/fate/ffprobe_json +++ b/ffmpeg/tests/ref/fate/ffprobe_json @@ -22,14 +22,15 @@ "pkt_pts_time": "0.000000", "pkt_dts": 0, "pkt_dts_time": "0.000000", + "best_effort_timestamp": 0, + "best_effort_timestamp_time": "0.000000", "pkt_duration": 1024, "pkt_duration_time": "0.023220", "pkt_pos": "572", "pkt_size": "2048", "sample_fmt": "s16", "nb_samples": 1024, - "channels": 1, - "channel_layout": "mono" + "channels": 1 }, { "type": "packet", @@ -53,6 +54,8 @@ "pkt_pts_time": "0.000000", "pkt_dts": 0, "pkt_dts_time": "0.000000", + "best_effort_timestamp": 0, + "best_effort_timestamp_time": "0.000000", "pkt_duration": 2048, "pkt_duration_time": "0.040000", "pkt_pos": "2647", @@ -89,6 +92,8 @@ "pkt_pts_time": "0.000000", "pkt_dts": 0, "pkt_dts_time": "0.000000", + "best_effort_timestamp": 0, + "best_effort_timestamp_time": "0.000000", "pkt_duration": 2048, "pkt_duration_time": "0.040000", "pkt_pos": "233068", @@ -125,14 +130,15 @@ "pkt_pts_time": "0.023220", "pkt_dts": 1024, "pkt_dts_time": "0.023220", + "best_effort_timestamp": 1024, + "best_effort_timestamp_time": "0.023220", "pkt_duration": 1024, "pkt_duration_time": "0.023220", "pkt_pos": "263073", "pkt_size": "2048", "sample_fmt": "s16", "nb_samples": 1024, - "channels": 1, - "channel_layout": "mono" + "channels": 1 }, { "type": "packet", @@ -156,6 +162,8 @@ "pkt_pts_time": "0.040000", "pkt_dts": 2048, "pkt_dts_time": "0.040000", + "best_effort_timestamp": 2048, + "best_effort_timestamp_time": "0.040000", "pkt_duration": 2048, "pkt_duration_time": "0.040000", "pkt_pos": "265151", @@ -192,6 +200,8 @@ "pkt_pts_time": "0.040000", "pkt_dts": 2048, "pkt_dts_time": "0.040000", + "best_effort_timestamp": 2048, + "best_effort_timestamp_time": "0.040000", "pkt_duration": 2048, "pkt_duration_time": "0.040000", "pkt_pos": "495575", @@ -228,14 +238,15 @@ "pkt_pts_time": "0.046440", "pkt_dts": 2048, "pkt_dts_time": "0.046440", + "best_effort_timestamp": 2048, + "best_effort_timestamp_time": "0.046440", "pkt_duration": 1024, "pkt_duration_time": "0.023220", "pkt_pos": "525580", "pkt_size": "2048", "sample_fmt": "s16", "nb_samples": 1024, - "channels": 1, - "channel_layout": "mono" + "channels": 1 }, { "type": "packet", @@ -259,14 +270,15 @@ "pkt_pts_time": "0.069660", "pkt_dts": 3072, "pkt_dts_time": "0.069660", + "best_effort_timestamp": 3072, + "best_effort_timestamp_time": "0.069660", "pkt_duration": 1024, "pkt_duration_time": "0.023220", "pkt_pos": "527651", "pkt_size": "2048", "sample_fmt": "s16", "nb_samples": 1024, - "channels": 1, - "channel_layout": "mono" + "channels": 1 }, { "type": "packet", @@ -290,6 +302,8 @@ "pkt_pts_time": "0.080000", "pkt_dts": 4096, "pkt_dts_time": "0.080000", + "best_effort_timestamp": 4096, + "best_effort_timestamp_time": "0.080000", "pkt_duration": 2048, "pkt_duration_time": "0.040000", "pkt_pos": "529729", @@ -326,6 +340,8 @@ "pkt_pts_time": "0.080000", "pkt_dts": 4096, "pkt_dts_time": "0.080000", + "best_effort_timestamp": 4096, + "best_effort_timestamp_time": "0.080000", "pkt_duration": 2048, "pkt_duration_time": "0.040000", "pkt_pos": "760153", @@ -362,14 +378,15 @@ "pkt_pts_time": "0.092880", "pkt_dts": 4096, "pkt_dts_time": "0.092880", + "best_effort_timestamp": 4096, + "best_effort_timestamp_time": "0.092880", "pkt_duration": 1024, "pkt_duration_time": "0.023220", "pkt_pos": "790158", "pkt_size": "2048", "sample_fmt": "s16", "nb_samples": 1024, - "channels": 1, - "channel_layout": "mono" + "channels": 1 }, { "type": "packet", @@ -393,14 +410,15 @@ "pkt_pts_time": "0.116100", "pkt_dts": 5120, "pkt_dts_time": "0.116100", + "best_effort_timestamp": 5120, + "best_effort_timestamp_time": "0.116100", "pkt_duration": 1024, "pkt_duration_time": "0.023220", "pkt_pos": "792229", "pkt_size": "2048", "sample_fmt": "s16", "nb_samples": 1024, - "channels": 1, - "channel_layout": "mono" + "channels": 1 }, { "type": "packet", @@ -424,6 +442,8 @@ "pkt_pts_time": "0.120000", "pkt_dts": 6144, "pkt_dts_time": "0.120000", + "best_effort_timestamp": 6144, + "best_effort_timestamp_time": "0.120000", "pkt_duration": 2048, "pkt_duration_time": "0.040000", "pkt_pos": "794307", @@ -460,6 +480,8 @@ "pkt_pts_time": "0.120000", "pkt_dts": 6144, "pkt_dts_time": "0.120000", + "best_effort_timestamp": 6144, + "best_effort_timestamp_time": "0.120000", "pkt_duration": 2048, "pkt_duration_time": "0.040000", "pkt_pos": "1024731", @@ -492,8 +514,6 @@ "time_base": "1/44100", "start_pts": 0, "start_time": "0.000000", - "duration_ts": 527406, - "duration": "11.959320", "bit_rate": "705600", "nb_read_frames": "6", "nb_read_packets": "6", @@ -533,8 +553,6 @@ "time_base": "1/51200", "start_pts": 0, "start_time": "0.000000", - "duration_ts": 612317, - "duration": "11.959316", "nb_read_frames": "4", "nb_read_packets": "4", "disposition": { @@ -574,8 +592,6 @@ "time_base": "1/51200", "start_pts": 0, "start_time": "0.000000", - "duration_ts": 612317, - "duration": "11.959316", "nb_read_frames": "4", "nb_read_packets": "4", "disposition": { @@ -596,11 +612,13 @@ "format": { "filename": "tests/data/ffprobe-test.nut", "nb_streams": 3, + "nb_programs": 0, "format_name": "nut", "start_time": "0.000000", - "duration": "11.959320", + "duration": "0.120000", "size": "1054812", - "bit_rate": "705599", + "bit_rate": "70320800", + "probe_score": 100, "tags": { "title": "ffprobe test file", "comment": "'A comment with CSV, XML & JSON special chars': <tag value=\"x\">", diff --git a/ffmpeg/tests/ref/fate/ffprobe_xml b/ffmpeg/tests/ref/fate/ffprobe_xml index 8cec7ad..1da25d7 100644 --- a/ffmpeg/tests/ref/fate/ffprobe_xml +++ b/ffmpeg/tests/ref/fate/ffprobe_xml @@ -2,51 +2,51 @@ <ffprobe> <packets_and_frames> <packet codec_type="audio" stream_index="0" pts="0" pts_time="0.000000" dts="0" dts_time="0.000000" duration="1024" duration_time="0.023220" size="2048" pos="572" flags="K"/> - <frame media_type="audio" key_frame="1" pkt_pts="0" pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="572" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1" channel_layout="mono"/> + <frame media_type="audio" key_frame="1" pkt_pts="0" pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000" best_effort_timestamp="0" best_effort_timestamp_time="0.000000" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="572" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/> <packet codec_type="video" stream_index="1" pts="0" pts_time="0.000000" dts="0" dts_time="0.000000" duration="2048" duration_time="0.040000" size="230400" pos="2647" flags="K"/> - <frame media_type="video" key_frame="1" pkt_pts="0" pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="2647" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/> + <frame media_type="video" key_frame="1" pkt_pts="0" pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000" best_effort_timestamp="0" best_effort_timestamp_time="0.000000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="2647" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/> <packet codec_type="video" stream_index="2" pts="0" pts_time="0.000000" dts="0" dts_time="0.000000" duration="2048" duration_time="0.040000" size="30000" pos="233068" flags="K"/> - <frame media_type="video" key_frame="1" pkt_pts="0" pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="233068" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/> + <frame media_type="video" key_frame="1" pkt_pts="0" pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000" best_effort_timestamp="0" best_effort_timestamp_time="0.000000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="233068" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/> <packet codec_type="audio" stream_index="0" pts="1024" pts_time="0.023220" dts="1024" dts_time="0.023220" duration="1024" duration_time="0.023220" size="2048" pos="263073" flags="K"/> - <frame media_type="audio" key_frame="1" pkt_pts="1024" pkt_pts_time="0.023220" pkt_dts="1024" pkt_dts_time="0.023220" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="263073" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1" channel_layout="mono"/> + <frame media_type="audio" key_frame="1" pkt_pts="1024" pkt_pts_time="0.023220" pkt_dts="1024" pkt_dts_time="0.023220" best_effort_timestamp="1024" best_effort_timestamp_time="0.023220" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="263073" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/> <packet codec_type="video" stream_index="1" pts="2048" pts_time="0.040000" dts="2048" dts_time="0.040000" duration="2048" duration_time="0.040000" size="230400" pos="265151" flags="K"/> - <frame media_type="video" key_frame="1" pkt_pts="2048" pkt_pts_time="0.040000" pkt_dts="2048" pkt_dts_time="0.040000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="265151" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/> + <frame media_type="video" key_frame="1" pkt_pts="2048" pkt_pts_time="0.040000" pkt_dts="2048" pkt_dts_time="0.040000" best_effort_timestamp="2048" best_effort_timestamp_time="0.040000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="265151" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/> <packet codec_type="video" stream_index="2" pts="2048" pts_time="0.040000" dts="2048" dts_time="0.040000" duration="2048" duration_time="0.040000" size="30000" pos="495575" flags="K"/> - <frame media_type="video" key_frame="1" pkt_pts="2048" pkt_pts_time="0.040000" pkt_dts="2048" pkt_dts_time="0.040000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="495575" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/> + <frame media_type="video" key_frame="1" pkt_pts="2048" pkt_pts_time="0.040000" pkt_dts="2048" pkt_dts_time="0.040000" best_effort_timestamp="2048" best_effort_timestamp_time="0.040000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="495575" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/> <packet codec_type="audio" stream_index="0" pts="2048" pts_time="0.046440" dts="2048" dts_time="0.046440" duration="1024" duration_time="0.023220" size="2048" pos="525580" flags="K"/> - <frame media_type="audio" key_frame="1" pkt_pts="2048" pkt_pts_time="0.046440" pkt_dts="2048" pkt_dts_time="0.046440" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="525580" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1" channel_layout="mono"/> + <frame media_type="audio" key_frame="1" pkt_pts="2048" pkt_pts_time="0.046440" pkt_dts="2048" pkt_dts_time="0.046440" best_effort_timestamp="2048" best_effort_timestamp_time="0.046440" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="525580" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/> <packet codec_type="audio" stream_index="0" pts="3072" pts_time="0.069660" dts="3072" dts_time="0.069660" duration="1024" duration_time="0.023220" size="2048" pos="527651" flags="K"/> - <frame media_type="audio" key_frame="1" pkt_pts="3072" pkt_pts_time="0.069660" pkt_dts="3072" pkt_dts_time="0.069660" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="527651" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1" channel_layout="mono"/> + <frame media_type="audio" key_frame="1" pkt_pts="3072" pkt_pts_time="0.069660" pkt_dts="3072" pkt_dts_time="0.069660" best_effort_timestamp="3072" best_effort_timestamp_time="0.069660" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="527651" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/> <packet codec_type="video" stream_index="1" pts="4096" pts_time="0.080000" dts="4096" dts_time="0.080000" duration="2048" duration_time="0.040000" size="230400" pos="529729" flags="K"/> - <frame media_type="video" key_frame="1" pkt_pts="4096" pkt_pts_time="0.080000" pkt_dts="4096" pkt_dts_time="0.080000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="529729" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/> + <frame media_type="video" key_frame="1" pkt_pts="4096" pkt_pts_time="0.080000" pkt_dts="4096" pkt_dts_time="0.080000" best_effort_timestamp="4096" best_effort_timestamp_time="0.080000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="529729" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/> <packet codec_type="video" stream_index="2" pts="4096" pts_time="0.080000" dts="4096" dts_time="0.080000" duration="2048" duration_time="0.040000" size="30000" pos="760153" flags="K"/> - <frame media_type="video" key_frame="1" pkt_pts="4096" pkt_pts_time="0.080000" pkt_dts="4096" pkt_dts_time="0.080000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="760153" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/> + <frame media_type="video" key_frame="1" pkt_pts="4096" pkt_pts_time="0.080000" pkt_dts="4096" pkt_dts_time="0.080000" best_effort_timestamp="4096" best_effort_timestamp_time="0.080000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="760153" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/> <packet codec_type="audio" stream_index="0" pts="4096" pts_time="0.092880" dts="4096" dts_time="0.092880" duration="1024" duration_time="0.023220" size="2048" pos="790158" flags="K"/> - <frame media_type="audio" key_frame="1" pkt_pts="4096" pkt_pts_time="0.092880" pkt_dts="4096" pkt_dts_time="0.092880" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="790158" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1" channel_layout="mono"/> + <frame media_type="audio" key_frame="1" pkt_pts="4096" pkt_pts_time="0.092880" pkt_dts="4096" pkt_dts_time="0.092880" best_effort_timestamp="4096" best_effort_timestamp_time="0.092880" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="790158" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/> <packet codec_type="audio" stream_index="0" pts="5120" pts_time="0.116100" dts="5120" dts_time="0.116100" duration="1024" duration_time="0.023220" size="2048" pos="792229" flags="K"/> - <frame media_type="audio" key_frame="1" pkt_pts="5120" pkt_pts_time="0.116100" pkt_dts="5120" pkt_dts_time="0.116100" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="792229" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1" channel_layout="mono"/> + <frame media_type="audio" key_frame="1" pkt_pts="5120" pkt_pts_time="0.116100" pkt_dts="5120" pkt_dts_time="0.116100" best_effort_timestamp="5120" best_effort_timestamp_time="0.116100" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="792229" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/> <packet codec_type="video" stream_index="1" pts="6144" pts_time="0.120000" dts="6144" dts_time="0.120000" duration="2048" duration_time="0.040000" size="230400" pos="794307" flags="K"/> - <frame media_type="video" key_frame="1" pkt_pts="6144" pkt_pts_time="0.120000" pkt_dts="6144" pkt_dts_time="0.120000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="794307" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/> + <frame media_type="video" key_frame="1" pkt_pts="6144" pkt_pts_time="0.120000" pkt_dts="6144" pkt_dts_time="0.120000" best_effort_timestamp="6144" best_effort_timestamp_time="0.120000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="794307" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/> <packet codec_type="video" stream_index="2" pts="6144" pts_time="0.120000" dts="6144" dts_time="0.120000" duration="2048" duration_time="0.040000" size="30000" pos="1024731" flags="K"/> - <frame media_type="video" key_frame="1" pkt_pts="6144" pkt_pts_time="0.120000" pkt_dts="6144" pkt_dts_time="0.120000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="1024731" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/> + <frame media_type="video" key_frame="1" pkt_pts="6144" pkt_pts_time="0.120000" pkt_dts="6144" pkt_dts_time="0.120000" best_effort_timestamp="6144" best_effort_timestamp_time="0.120000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="1024731" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/> </packets_and_frames> <streams> - <stream index="0" codec_name="pcm_s16le" codec_type="audio" codec_time_base="1/44100" codec_tag_string="PSD[16]" codec_tag="0x10445350" sample_fmt="s16" sample_rate="44100" channels="1" bits_per_sample="16" r_frame_rate="0/0" avg_frame_rate="0/0" time_base="1/44100" start_pts="0" start_time="0.000000" duration_ts="527406" duration="11.959320" bit_rate="705600" nb_read_frames="6" nb_read_packets="6"> + <stream index="0" codec_name="pcm_s16le" codec_type="audio" codec_time_base="1/44100" codec_tag_string="PSD[16]" codec_tag="0x10445350" sample_fmt="s16" sample_rate="44100" channels="1" bits_per_sample="16" r_frame_rate="0/0" avg_frame_rate="0/0" time_base="1/44100" start_pts="0" start_time="0.000000" bit_rate="705600" nb_read_frames="6" nb_read_packets="6"> <disposition default="0" dub="0" original="0" comment="0" lyrics="0" karaoke="0" forced="0" hearing_impaired="0" visual_impaired="0" clean_effects="0" attached_pic="0"/> <tag key="E" value="mc²"/> </stream> - <stream index="1" codec_name="rawvideo" codec_type="video" codec_time_base="1/51200" codec_tag_string="RGB[24]" codec_tag="0x18424752" width="320" height="240" has_b_frames="0" sample_aspect_ratio="1:1" display_aspect_ratio="4:3" pix_fmt="rgb24" level="-99" r_frame_rate="25/1" avg_frame_rate="25/1" time_base="1/51200" start_pts="0" start_time="0.000000" duration_ts="612317" duration="11.959316" nb_read_frames="4" nb_read_packets="4"> + <stream index="1" codec_name="rawvideo" codec_type="video" codec_time_base="1/51200" codec_tag_string="RGB[24]" codec_tag="0x18424752" width="320" height="240" has_b_frames="0" sample_aspect_ratio="1:1" display_aspect_ratio="4:3" pix_fmt="rgb24" level="-99" r_frame_rate="25/1" avg_frame_rate="25/1" time_base="1/51200" start_pts="0" start_time="0.000000" nb_read_frames="4" nb_read_packets="4"> <disposition default="0" dub="0" original="0" comment="0" lyrics="0" karaoke="0" forced="0" hearing_impaired="0" visual_impaired="0" clean_effects="0" attached_pic="0"/> <tag key="title" value="foobar"/> <tag key="duration_ts" value="field-and-tags-conflict-attempt"/> </stream> - <stream index="2" codec_name="rawvideo" codec_type="video" codec_time_base="1/51200" codec_tag_string="RGB[24]" codec_tag="0x18424752" width="100" height="100" has_b_frames="0" sample_aspect_ratio="1:1" display_aspect_ratio="1:1" pix_fmt="rgb24" level="-99" r_frame_rate="25/1" avg_frame_rate="25/1" time_base="1/51200" start_pts="0" start_time="0.000000" duration_ts="612317" duration="11.959316" nb_read_frames="4" nb_read_packets="4"> + <stream index="2" codec_name="rawvideo" codec_type="video" codec_time_base="1/51200" codec_tag_string="RGB[24]" codec_tag="0x18424752" width="100" height="100" has_b_frames="0" sample_aspect_ratio="1:1" display_aspect_ratio="1:1" pix_fmt="rgb24" level="-99" r_frame_rate="25/1" avg_frame_rate="25/1" time_base="1/51200" start_pts="0" start_time="0.000000" nb_read_frames="4" nb_read_packets="4"> <disposition default="0" dub="0" original="0" comment="0" lyrics="0" karaoke="0" forced="0" hearing_impaired="0" visual_impaired="0" clean_effects="0" attached_pic="0"/> </stream> </streams> - <format filename="tests/data/ffprobe-test.nut" nb_streams="3" format_name="nut" start_time="0.000000" duration="11.959320" size="1054812" bit_rate="705599"> + <format filename="tests/data/ffprobe-test.nut" nb_streams="3" nb_programs="0" format_name="nut" start_time="0.000000" duration="0.120000" size="1054812" bit_rate="70320800" probe_score="100"> <tag key="title" value="ffprobe test file"/> <tag key="comment" value="'A comment with CSV, XML & JSON special chars': <tag value="x">"/> <tag key="comment2" value="I ♥ Üñîçød€"/> diff --git a/ffmpeg/tests/ref/fate/filter-delogo b/ffmpeg/tests/ref/fate/filter-delogo index bc58777..80342ee 100644 --- a/ffmpeg/tests/ref/fate/filter-delogo +++ b/ffmpeg/tests/ref/fate/filter-delogo @@ -1,110 +1,110 @@ #tb 0: 32768/982057 -0, 0, 0, 1, 126720, 0x689de87e -0, 1, 1, 1, 126720, 0x3db9e91c -0, 2, 2, 1, 126720, 0x3db9e91c -0, 3, 3, 1, 126720, 0x3db9e91c -0, 4, 4, 1, 126720, 0xfa6ae95e -0, 5, 5, 1, 126720, 0x5bcbf0e6 -0, 6, 6, 1, 126720, 0x94a0f126 -0, 7, 7, 1, 126720, 0x0250f106 -0, 8, 8, 1, 126720, 0xcf6ab4bc -0, 9, 9, 1, 126720, 0x429eb57c -0, 10, 10, 1, 126720, 0x3bf0b5bc -0, 11, 11, 1, 126720, 0xcaedb591 -0, 12, 12, 1, 126720, 0xa492b5ec -0, 13, 13, 1, 126720, 0x2431b85c -0, 14, 14, 1, 126720, 0x8283b8dc -0, 15, 15, 1, 126720, 0xd71bb871 -0, 16, 16, 1, 126720, 0x698eb5cc -0, 17, 17, 1, 126720, 0x4719aa98 -0, 18, 18, 1, 126720, 0x9ca1962c -0, 19, 19, 1, 126720, 0x18cda460 -0, 20, 20, 1, 126720, 0xc230b716 -0, 21, 21, 1, 126720, 0x8451a4e2 -0, 22, 22, 1, 126720, 0x59e9a7ea -0, 23, 23, 1, 126720, 0xc77ca73d -0, 24, 24, 1, 126720, 0x725fb976 -0, 25, 25, 1, 126720, 0xb30da3b3 -0, 26, 26, 1, 126720, 0x7af2ea86 -0, 27, 27, 1, 126720, 0x40d4b4eb -0, 28, 28, 1, 126720, 0x49d00307 -0, 29, 29, 1, 126720, 0x0654849c -0, 30, 30, 1, 126720, 0xe46d0107 -0, 31, 31, 1, 126720, 0xa483b963 -0, 32, 32, 1, 126720, 0xd0e903f0 -0, 33, 33, 1, 126720, 0x964ed592 -0, 34, 34, 1, 126720, 0x23fbdb3c -0, 35, 35, 1, 126720, 0x59fdace5 -0, 36, 36, 1, 126720, 0xb1e37954 -0, 37, 37, 1, 126720, 0x8ed9c554 -0, 38, 38, 1, 126720, 0xe3c4b39f -0, 39, 39, 1, 126720, 0xfd17e0ce -0, 40, 40, 1, 126720, 0xf26e1dcc -0, 41, 41, 1, 126720, 0x13cc783c -0, 42, 42, 1, 126720, 0x47ad47a1 -0, 43, 43, 1, 126720, 0x427c8b0d -0, 44, 44, 1, 126720, 0x59d99901 -0, 45, 45, 1, 126720, 0xc40707da -0, 46, 46, 1, 126720, 0xcd060dce -0, 47, 47, 1, 126720, 0xed4024f6 -0, 48, 48, 1, 126720, 0x7decd2b4 -0, 49, 49, 1, 126720, 0xd1d2e730 -0, 50, 50, 1, 126720, 0x77cee457 -0, 51, 51, 1, 126720, 0xe78d02c0 -0, 52, 52, 1, 126720, 0xad0beb29 -0, 53, 53, 1, 126720, 0xc414eea2 -0, 54, 54, 1, 126720, 0x6a15f17d -0, 55, 55, 1, 126720, 0x516027f6 -0, 56, 56, 1, 126720, 0x4eda9dce -0, 57, 57, 1, 126720, 0x7d9bdba3 -0, 58, 58, 1, 126720, 0x7aa3d5c0 -0, 59, 59, 1, 126720, 0x7c7a04f9 -0, 60, 60, 1, 126720, 0x3e8fb6cc -0, 61, 61, 1, 126720, 0xd5474916 -0, 62, 62, 1, 126720, 0xf3f62bab -0, 63, 63, 1, 126720, 0x2f054987 -0, 64, 64, 1, 126720, 0x974c2e81 -0, 65, 65, 1, 126720, 0xe7e28a97 -0, 66, 66, 1, 126720, 0x45e38b41 -0, 67, 67, 1, 126720, 0x169c7f19 -0, 68, 68, 1, 126720, 0x91d90ee8 -0, 69, 69, 1, 126720, 0xdd653e24 -0, 70, 70, 1, 126720, 0x0da598c4 -0, 71, 71, 1, 126720, 0x687e62cc -0, 72, 72, 1, 126720, 0x7631232d -0, 73, 73, 1, 126720, 0xbd1ea826 -0, 74, 74, 1, 126720, 0xb55f7f4b -0, 75, 75, 1, 126720, 0x923f3fc9 -0, 76, 76, 1, 126720, 0x15515301 -0, 77, 77, 1, 126720, 0x9ee066e5 -0, 78, 78, 1, 126720, 0x7c21664b -0, 79, 79, 1, 126720, 0x36849100 -0, 80, 80, 1, 126720, 0x08b1f61a -0, 81, 81, 1, 126720, 0x5bfca6e2 -0, 82, 82, 1, 126720, 0x929f60e3 -0, 83, 83, 1, 126720, 0xa2b55c29 -0, 84, 84, 1, 126720, 0x68bd3ff3 -0, 85, 85, 1, 126720, 0x30db5b29 -0, 86, 86, 1, 126720, 0x00578f9b -0, 87, 87, 1, 126720, 0x18368642 -0, 88, 88, 1, 126720, 0xbcb83a80 -0, 89, 89, 1, 126720, 0x90f36b72 -0, 90, 90, 1, 126720, 0x85e46522 -0, 91, 91, 1, 126720, 0x2429660a -0, 92, 92, 1, 126720, 0xf283dfe2 -0, 93, 93, 1, 126720, 0x896b27dc -0, 94, 94, 1, 126720, 0x5af4f961 -0, 95, 95, 1, 126720, 0x31897085 -0, 96, 96, 1, 126720, 0x441ce33e -0, 97, 97, 1, 126720, 0x903f8009 -0, 98, 98, 1, 126720, 0xbdf33dba -0, 99, 99, 1, 126720, 0x8a364f36 -0, 100, 100, 1, 126720, 0xda5513f6 -0, 101, 101, 1, 126720, 0xd60012b3 -0, 102, 102, 1, 126720, 0x67bce7be -0, 103, 103, 1, 126720, 0x697e6174 -0, 104, 104, 1, 126720, 0xbe3e3e90 -0, 105, 105, 1, 126720, 0xf3e4bba6 -0, 106, 106, 1, 126720, 0x8124a679 -0, 107, 107, 1, 126720, 0x58d1acde -0, 108, 108, 1, 126720, 0xd8a15ba3 +0, 0, 0, 1, 126720, 0x77a5ebed +0, 1, 1, 1, 126720, 0x4cc1ec8b +0, 2, 2, 1, 126720, 0x4cc1ec8b +0, 3, 3, 1, 126720, 0x4cc1ec8b +0, 4, 4, 1, 126720, 0x0981eccd +0, 5, 5, 1, 126720, 0x04fef463 +0, 6, 6, 1, 126720, 0x3dd3f4a3 +0, 7, 7, 1, 126720, 0xab74f483 +0, 8, 8, 1, 126720, 0x5ed7b7db +0, 9, 9, 1, 126720, 0xd1fcb89b +0, 10, 10, 1, 126720, 0xcb4eb8db +0, 11, 11, 1, 126720, 0xdcc5b8a7 +0, 12, 12, 1, 126720, 0x33ffb90b +0, 13, 13, 1, 126720, 0xb38fbb7b +0, 14, 14, 1, 126720, 0x11f0bbfb +0, 15, 15, 1, 126720, 0xe8f3bb87 +0, 16, 16, 1, 126720, 0xf8ecb8eb +0, 17, 17, 1, 126720, 0x5db2ae48 +0, 18, 18, 1, 126720, 0x4e7999a6 +0, 19, 19, 1, 126720, 0xdb84a7a6 +0, 20, 20, 1, 126720, 0x9c4fba45 +0, 21, 21, 1, 126720, 0xe635a858 +0, 22, 22, 1, 126720, 0xd4eeab35 +0, 23, 23, 1, 126720, 0xc416aa56 +0, 24, 24, 1, 126720, 0x4c7ebca5 +0, 25, 25, 1, 126720, 0x2887a70e +0, 26, 26, 1, 126720, 0xc978eaf1 +0, 27, 27, 1, 126720, 0x8a29b563 +0, 28, 28, 1, 126720, 0x275a0352 +0, 29, 29, 1, 126720, 0x446484bb +0, 30, 30, 1, 126720, 0xdbe00151 +0, 31, 31, 1, 126720, 0x5874b9aa +0, 32, 32, 1, 126720, 0xdeb30460 +0, 33, 33, 1, 126720, 0xc6d2d62a +0, 34, 34, 1, 126720, 0x9270dbc7 +0, 35, 35, 1, 126720, 0x30e4ad59 +0, 36, 36, 1, 126720, 0x117479cd +0, 37, 37, 1, 126720, 0x0567c5d2 +0, 38, 38, 1, 126720, 0x87c8b4a5 +0, 39, 39, 1, 126720, 0xe5c5e0d1 +0, 40, 40, 1, 126720, 0x78d61e3f +0, 41, 41, 1, 126720, 0xda8d787f +0, 42, 42, 1, 126720, 0xf32547f7 +0, 43, 43, 1, 126720, 0x70bc8b60 +0, 44, 44, 1, 126720, 0x3ad09927 +0, 45, 45, 1, 126720, 0x5d9607d6 +0, 46, 46, 1, 126720, 0x348a0e02 +0, 47, 47, 1, 126720, 0x7d21255c +0, 48, 48, 1, 126720, 0x308ed32b +0, 49, 49, 1, 126720, 0x79fbe734 +0, 50, 50, 1, 126720, 0xdc5de409 +0, 51, 51, 1, 126720, 0x4ee00283 +0, 52, 52, 1, 126720, 0x2697ea2e +0, 53, 53, 1, 126720, 0x0885edeb +0, 54, 54, 1, 126720, 0xc041f0d8 +0, 55, 55, 1, 126720, 0xa893272e +0, 56, 56, 1, 126720, 0x55419d4e +0, 57, 57, 1, 126720, 0xbc47dbb5 +0, 58, 58, 1, 126720, 0x9666d60b +0, 59, 59, 1, 126720, 0xac5c054a +0, 60, 60, 1, 126720, 0x4affb780 +0, 61, 61, 1, 126720, 0x2b7349eb +0, 62, 62, 1, 126720, 0x75592d02 +0, 63, 63, 1, 126720, 0xdb904a83 +0, 64, 64, 1, 126720, 0xf85e2f93 +0, 65, 65, 1, 126720, 0x632f8be8 +0, 66, 66, 1, 126720, 0x96108ce4 +0, 67, 67, 1, 126720, 0xb68e816b +0, 68, 68, 1, 126720, 0x89ca112f +0, 69, 69, 1, 126720, 0x4bed40d3 +0, 70, 70, 1, 126720, 0xe4cb9b12 +0, 71, 71, 1, 126720, 0xa4f164ec +0, 72, 72, 1, 126720, 0xd1aa2554 +0, 73, 73, 1, 126720, 0x0277aa01 +0, 74, 74, 1, 126720, 0x8ea280fd +0, 75, 75, 1, 126720, 0xbae64170 +0, 76, 76, 1, 126720, 0xaf9b543b +0, 77, 77, 1, 126720, 0x1b31680a +0, 78, 78, 1, 126720, 0x7da4671e +0, 79, 79, 1, 126720, 0x82b791cb +0, 80, 80, 1, 126720, 0xd2fff6bb +0, 81, 81, 1, 126720, 0x2395a793 +0, 82, 82, 1, 126720, 0x66586185 +0, 83, 83, 1, 126720, 0x99c55c63 +0, 84, 84, 1, 126720, 0x7e3f403e +0, 85, 85, 1, 126720, 0x9eda5b9a +0, 86, 86, 1, 126720, 0x27469047 +0, 87, 87, 1, 126720, 0xaa5b870e +0, 88, 88, 1, 126720, 0x70423b2a +0, 89, 89, 1, 126720, 0x70d86c0a +0, 90, 90, 1, 126720, 0x4bd065f3 +0, 91, 91, 1, 126720, 0xd71f66bb +0, 92, 92, 1, 126720, 0x5333e081 +0, 93, 93, 1, 126720, 0xdf0b28d6 +0, 94, 94, 1, 126720, 0x6c48fa53 +0, 95, 95, 1, 126720, 0x9438712d +0, 96, 96, 1, 126720, 0x9910e3ec +0, 97, 97, 1, 126720, 0xb0ea80dd +0, 98, 98, 1, 126720, 0x71983e67 +0, 99, 99, 1, 126720, 0x18924fe6 +0, 100, 100, 1, 126720, 0x9ca014b9 +0, 101, 101, 1, 126720, 0x45f013a0 +0, 102, 102, 1, 126720, 0xf697e8a9 +0, 103, 103, 1, 126720, 0x214a626a +0, 104, 104, 1, 126720, 0xb2873fb5 +0, 105, 105, 1, 126720, 0xfb47bc52 +0, 106, 106, 1, 126720, 0x63b7a708 +0, 107, 107, 1, 126720, 0x1904ad40 +0, 108, 108, 1, 126720, 0x80015b91 diff --git a/ffmpeg/tests/ref/fate/filter-gradfun b/ffmpeg/tests/ref/fate/filter-gradfun index dca442f..794fae9 100644 --- a/ffmpeg/tests/ref/fate/filter-gradfun +++ b/ffmpeg/tests/ref/fate/filter-gradfun @@ -1,21 +1,51 @@ -#tb 0: 1/10 -0, 0, 0, 1, 76800, 0xc87b6728 -0, 1, 1, 1, 76800, 0xb0b24bc8 -0, 2, 2, 1, 76800, 0x45a22d68 -0, 3, 3, 1, 76800, 0x1821013b -0, 4, 4, 1, 76800, 0xfb17dc4f -0, 5, 5, 1, 76800, 0x8e7eb458 -0, 6, 6, 1, 76800, 0x0df37d02 -0, 7, 7, 1, 76800, 0x18e4500d -0, 8, 8, 1, 76800, 0x639316b0 -0, 9, 9, 1, 76800, 0xce00e560 -0, 10, 10, 1, 76800, 0xd533b42c -0, 11, 11, 1, 76800, 0x0772794c -0, 12, 12, 1, 76800, 0x99544be0 -0, 13, 13, 1, 76800, 0x5f1a16c1 -0, 14, 14, 1, 76800, 0x90bfe8ac -0, 15, 15, 1, 76800, 0xbd9bb834 -0, 16, 16, 1, 76800, 0x658d8053 -0, 17, 17, 1, 76800, 0x21cc5656 -0, 18, 18, 1, 76800, 0x6d39208b -0, 19, 19, 1, 76800, 0x17b0f8cb +#tb 0: 1/25 +0, 0, 0, 1, 152064, 0xaebf898f +0, 1, 1, 1, 152064, 0x217b6560 +0, 2, 2, 1, 152064, 0x0269f62d +0, 3, 3, 1, 152064, 0x12168087 +0, 4, 4, 1, 152064, 0x42f9b5fb +0, 5, 5, 1, 152064, 0xa653a8b3 +0, 6, 6, 1, 152064, 0x2e317bc3 +0, 7, 7, 1, 152064, 0xf3c28b63 +0, 8, 8, 1, 152064, 0x12e57fce +0, 9, 9, 1, 152064, 0xeac238dd +0, 10, 10, 1, 152064, 0x8fe74772 +0, 11, 11, 1, 152064, 0x982afc9c +0, 12, 12, 1, 152064, 0xd82ead51 +0, 13, 13, 1, 152064, 0xf83ca211 +0, 14, 14, 1, 152064, 0xc01f8de2 +0, 15, 15, 1, 152064, 0x7ec60ec6 +0, 16, 16, 1, 152064, 0x1beb4dd3 +0, 17, 17, 1, 152064, 0x5a513899 +0, 18, 18, 1, 152064, 0x8c766a7b +0, 19, 19, 1, 152064, 0x8bcddbb0 +0, 20, 20, 1, 152064, 0x01f6f558 +0, 21, 21, 1, 152064, 0xac7e240f +0, 22, 22, 1, 152064, 0xe8811d38 +0, 23, 23, 1, 152064, 0x4ea268c9 +0, 24, 24, 1, 152064, 0xadc5f950 +0, 25, 25, 1, 152064, 0xdbf498fb +0, 26, 26, 1, 152064, 0x1b999678 +0, 27, 27, 1, 152064, 0x085dd810 +0, 28, 28, 1, 152064, 0x4665a44f +0, 29, 29, 1, 152064, 0x674764cf +0, 30, 30, 1, 152064, 0x65e96a72 +0, 31, 31, 1, 152064, 0x44e0c539 +0, 32, 32, 1, 152064, 0xb124fc9e +0, 33, 33, 1, 152064, 0x5cff79e3 +0, 34, 34, 1, 152064, 0x7dd94359 +0, 35, 35, 1, 152064, 0x3ec294b6 +0, 36, 36, 1, 152064, 0x675d3767 +0, 37, 37, 1, 152064, 0x9efa01cb +0, 38, 38, 1, 152064, 0x321058d2 +0, 39, 39, 1, 152064, 0xe0d04e9c +0, 40, 40, 1, 152064, 0xa4dd58d4 +0, 41, 41, 1, 152064, 0x4cc19dc5 +0, 42, 42, 1, 152064, 0x30a1bf77 +0, 43, 43, 1, 152064, 0x2c9d20f2 +0, 44, 44, 1, 152064, 0x55cb0447 +0, 45, 45, 1, 152064, 0x4daa7e4f +0, 46, 46, 1, 152064, 0x2a4f53c7 +0, 47, 47, 1, 152064, 0x9fb8c583 +0, 48, 48, 1, 152064, 0x072eb401 +0, 49, 49, 1, 152064, 0xa203d8b7 diff --git a/ffmpeg/tests/ref/fate/filter-hqdn3d b/ffmpeg/tests/ref/fate/filter-hqdn3d index d69e6db..6f121c3 100644 --- a/ffmpeg/tests/ref/fate/filter-hqdn3d +++ b/ffmpeg/tests/ref/fate/filter-hqdn3d @@ -1,74 +1,51 @@ -#tb 0: 1/9 -0, 0, 0, 1, 115200, 0x2c810465 -0, 1, 1, 1, 115200, 0x957c0563 -0, 2, 2, 1, 115200, 0x786c6d5b -0, 3, 3, 1, 115200, 0xd5ef87d3 -0, 4, 4, 1, 115200, 0x3a2158e2 -0, 5, 5, 1, 115200, 0x19d7d048 -0, 6, 6, 1, 115200, 0x16d5e09a -0, 7, 7, 1, 115200, 0x73cca454 -0, 8, 8, 1, 115200, 0x4d6be3bc -0, 9, 9, 1, 115200, 0x672aad0f -0, 10, 10, 1, 115200, 0x1bd103b7 -0, 11, 11, 1, 115200, 0xbc3a9c02 -0, 12, 12, 1, 115200, 0xa19cb68c -0, 13, 13, 1, 115200, 0x83477b6c -0, 14, 14, 1, 115200, 0x68b6898e -0, 15, 15, 1, 115200, 0xebbc5701 -0, 16, 16, 1, 115200, 0x37e873db -0, 17, 17, 1, 115200, 0xcf9e7ad1 -0, 18, 18, 1, 115200, 0x3fdffd3a -0, 19, 19, 1, 115200, 0x413da058 -0, 20, 20, 1, 115200, 0xa432b2f6 -0, 21, 21, 1, 115200, 0x9c532b61 -0, 22, 22, 1, 115200, 0x40c03856 -0, 23, 23, 1, 115200, 0xf8310ec7 -0, 24, 24, 1, 115200, 0x89246da7 -0, 25, 25, 1, 115200, 0x501d4dd0 -0, 26, 26, 1, 115200, 0xe5151ebf -0, 27, 27, 1, 115200, 0xc166e201 -0, 28, 28, 1, 115200, 0xded25b69 -0, 29, 29, 1, 115200, 0xb51ec43f -0, 30, 30, 1, 115200, 0x9bba20eb -0, 31, 31, 1, 115200, 0x7a7b9278 -0, 32, 32, 1, 115200, 0xe98475d0 -0, 33, 33, 1, 115200, 0x960dc933 -0, 34, 34, 1, 115200, 0xe93f558b -0, 35, 35, 1, 115200, 0x37ae3e42 -0, 36, 36, 1, 115200, 0x0ecaf64a -0, 37, 37, 1, 115200, 0xd5938191 -0, 38, 38, 1, 115200, 0xeb04510a -0, 39, 39, 1, 115200, 0xf5729201 -0, 40, 40, 1, 115200, 0xb2c04015 -0, 41, 41, 1, 115200, 0xd883143e -0, 42, 42, 1, 115200, 0x5e04197b -0, 43, 43, 1, 115200, 0x6b846e24 -0, 44, 44, 1, 115200, 0x026e7a0b -0, 45, 45, 1, 115200, 0xf8c6708b -0, 46, 46, 1, 115200, 0x3fe75c63 -0, 47, 47, 1, 115200, 0xf56467b1 -0, 48, 48, 1, 115200, 0xf1230483 -0, 49, 49, 1, 115200, 0x35a615ce -0, 50, 50, 1, 115200, 0x30b42d7b -0, 51, 51, 1, 115200, 0x8b7f22a1 -0, 52, 52, 1, 115200, 0x03a2e789 -0, 53, 53, 1, 115200, 0x15532e9e -0, 54, 54, 1, 115200, 0xbe85f37a -0, 55, 55, 1, 115200, 0x2c581d60 -0, 56, 56, 1, 115200, 0xd7a506ed -0, 57, 57, 1, 115200, 0x35e09799 -0, 58, 58, 1, 115200, 0x2d4f5499 -0, 59, 59, 1, 115200, 0x92fdc85b -0, 60, 60, 1, 115200, 0x33f4888a -0, 61, 61, 1, 115200, 0x65e04e05 -0, 62, 62, 1, 115200, 0x14766728 -0, 63, 63, 1, 115200, 0x2a432c3f -0, 64, 64, 1, 115200, 0x136a1362 -0, 65, 65, 1, 115200, 0xfbf4cb01 -0, 66, 66, 1, 115200, 0x7dcaff69 -0, 67, 67, 1, 115200, 0x5afd3b9e -0, 68, 68, 1, 115200, 0x86fcb122 -0, 69, 69, 1, 115200, 0xc988b519 -0, 70, 70, 1, 115200, 0x48fd3e75 -0, 71, 71, 1, 115200, 0x2728a2d7 -0, 72, 72, 1, 115200, 0xa2ac6418 +#tb 0: 1/25 +0, 0, 0, 1, 152064, 0x0c09883a +0, 1, 1, 1, 152064, 0xfc2748a0 +0, 2, 2, 1, 152064, 0xb746eea8 +0, 3, 3, 1, 152064, 0xf14192d7 +0, 4, 4, 1, 152064, 0xae26db7f +0, 5, 5, 1, 152064, 0xe1a7da48 +0, 6, 6, 1, 152064, 0x5196b387 +0, 7, 7, 1, 152064, 0x20eac7ff +0, 8, 8, 1, 152064, 0x4896c7f5 +0, 9, 9, 1, 152064, 0x97ba6468 +0, 10, 10, 1, 152064, 0x29b19884 +0, 11, 11, 1, 152064, 0x591e4e14 +0, 12, 12, 1, 152064, 0xb692fc98 +0, 13, 13, 1, 152064, 0x3457ed57 +0, 14, 14, 1, 152064, 0xbb10d71d +0, 15, 15, 1, 152064, 0x47f45b57 +0, 16, 16, 1, 152064, 0xddbd8bc6 +0, 17, 17, 1, 152064, 0x1ef36e02 +0, 18, 18, 1, 152064, 0x55a363d2 +0, 19, 19, 1, 152064, 0x11c1c2f4 +0, 20, 20, 1, 152064, 0x553bdc2b +0, 21, 21, 1, 152064, 0x2101d886 +0, 22, 22, 1, 152064, 0xe8f77998 +0, 23, 23, 1, 152064, 0x39bac7ff +0, 24, 24, 1, 152064, 0x09a4172e +0, 25, 25, 1, 152064, 0x6121f57f +0, 26, 26, 1, 152064, 0x60e7525c +0, 27, 27, 1, 152064, 0xd7895259 +0, 28, 28, 1, 152064, 0x12b2153b +0, 29, 29, 1, 152064, 0x6119a22e +0, 30, 30, 1, 152064, 0xf1969bd5 +0, 31, 31, 1, 152064, 0x7b03fc83 +0, 32, 32, 1, 152064, 0x17383667 +0, 33, 33, 1, 152064, 0x332bbfba +0, 34, 34, 1, 152064, 0x253998a8 +0, 35, 35, 1, 152064, 0x2614c984 +0, 36, 36, 1, 152064, 0x50c86e8d +0, 37, 37, 1, 152064, 0x9ff23b55 +0, 38, 38, 1, 152064, 0xc4589665 +0, 39, 39, 1, 152064, 0x5e7d86c7 +0, 40, 40, 1, 152064, 0xdda07f2f +0, 41, 41, 1, 152064, 0xa1dacf4a +0, 42, 42, 1, 152064, 0x3c83fb32 +0, 43, 43, 1, 152064, 0xa43da916 +0, 44, 44, 1, 152064, 0x0e767b80 +0, 45, 45, 1, 152064, 0xa18c5f82 +0, 46, 46, 1, 152064, 0xdb21c249 +0, 47, 47, 1, 152064, 0xb126341e +0, 48, 48, 1, 152064, 0xc14742be +0, 49, 49, 1, 152064, 0x582f631d diff --git a/ffmpeg/tests/ref/fate/filter-yadif-mode0 b/ffmpeg/tests/ref/fate/filter-yadif-mode0 index 162ba96..4d42890 100644 --- a/ffmpeg/tests/ref/fate/filter-yadif-mode0 +++ b/ffmpeg/tests/ref/fate/filter-yadif-mode0 @@ -29,4 +29,3 @@ 0, 36, 36, 1, 622080, 0x58afbd5e 0, 37, 37, 1, 622080, 0xb972f716 0, 38, 38, 1, 622080, 0x6a6df129 -0, 39, 39, 1, 622080, 0x28b1373d diff --git a/ffmpeg/tests/ref/fate/filter-yadif-mode1 b/ffmpeg/tests/ref/fate/filter-yadif-mode1 index f1f513e..08cd518 100644 --- a/ffmpeg/tests/ref/fate/filter-yadif-mode1 +++ b/ffmpeg/tests/ref/fate/filter-yadif-mode1 @@ -58,6 +58,3 @@ 0, 74, 74, 1, 622080, 0xb972f716 0, 75, 75, 1, 622080, 0xbb5d01a2 0, 76, 76, 1, 622080, 0x6a6df129 -0, 77, 77, 1, 622080, 0x9e45371e -0, 78, 78, 1, 622080, 0x28b1373d -0, 79, 79, 1, 622080, 0xa1cdb1f2 diff --git a/ffmpeg/tests/ref/fate/h264-extreme-plane-pred b/ffmpeg/tests/ref/fate/h264-extreme-plane-pred index db85e99..96c2bf4 100644 --- a/ffmpeg/tests/ref/fate/h264-extreme-plane-pred +++ b/ffmpeg/tests/ref/fate/h264-extreme-plane-pred @@ -1,4 +1,8 @@ +#format: frame checksums +#version: 1 +#hash: MD5 #tb 0: 1/25 +#stream#, dts, pts, duration, size, hash 0, 0, 0, 1, 152064, 1e857d2dfeea75297e090ffe9e37a249 0, 1, 1, 1, 152064, 29d8336b4e9b77298025074dbad641d1 0, 2, 2, 1, 152064, 3f1a87d2088a7708f4ed06890c8cd018 diff --git a/ffmpeg/tests/ref/fate/hmac b/ffmpeg/tests/ref/fate/hmac index 7d2a437..27b95ba 100644 --- a/ffmpeg/tests/ref/fate/hmac +++ b/ffmpeg/tests/ref/fate/hmac @@ -1,6 +1,30 @@ 9294727a3638bb1c13f48ef8158bfc9d 750c783e6ab0b503eaa86e310a5db738 56be34521d144c88dbb8c733f0e8b3f6 -467cb2560355d7fa3ab2d6b939e6e47c -5a6ffd741d3e23b12f78b1baee9e609a -8b4b9d11c9e186c58f2a53b08ddfa436 +6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd +6f630fad67cda0ee1fb1f562db3aa53e +b617318655057264e28bc0b6fb378c8ef146be00 +effcdf6ae5eb2fa2d27416d5f184df9c259a7c79 +125d7342b9ac11cd91a39af48aa17b4f63f175d3 +aa4ae5e15272d00e95705637ce8a3b55ed402112 +e8e99d0f45237d786d6bbaa7965c7808bbff1a91 +896fb1128abbdf196832107cd49df33f47b4b1169912ba4f53684b22 +a30e01098bc6dbbf45690f3a7e9e6d0f8bbea2a39e6148008fd05e44 +7fb3cb3588c6c1f6ffa9694d7d6ad2649365b0c1f65d69d1ec8333ea +95e9a0db962095adaebe9b2d6f0dbce2d499f112f2d2b7273fa6870e +3a854166ac5d9f023f54d517d0b39dbd946770db9c2b95c9f6f565d1 +b0344c61d8db38535ca8afceaf0bf12b881dc200c9833da726e9376c2e32cff7 +5bdcc146bf60754e6a042426089575c75a003f089d2739839dec58b964ec3843 +773ea91e36800e46854db8ebd09181a72959098b3ef8c122d9635514ced565fe +60e431591ee0b67f0d8a26aacbf5b77f8e0bc6213728c5140546040f0ee37f54 +9b09ffa71b942fcb27635fbcd5b0e944bfdc63644f0713938a7f51535c3a35e2 +afd03944d84895626b0825f4ab46907f15f9dadbe4101ec682aa034c7cebc59cfaea9ea9076ede7f4af152e8b2fa9cb6 +af45d2e376484031617f78d2b58a6b1b9c7ef464f5a01b47e42ec3736322445e8e2240ca5e69e2c78b3239ecfab21649 +88062608d3e6ad8a0aa2ace014c8a86f0aa635d947ac9febe83ef4e55966144b2a5ab39dc13814b94e3ab6e101a34f27 +4ece084485813e9088d2c63a041bc5b44f9ef1012a2b588f3cd11f05033ac4c60c2ef6ab4030fe8296248df163f44952 +6617178e941f020d351e2f254e8fd32c602420feb0b8fb9adccebb82461e99c5a678cc31e799176d3860e6110c46523e +87aa7cdea5ef619d4ff0b4241a1d6cb02379f4e2ce4ec2787ad0b30545e17cdedaa833b7d6b8a702038b274eaea3f4e4be9d914eeb61f1702e696c203a126854 +164b7a7bfcf819e2e395fbe73b56e0a387bd64222e831fd610270cd7ea2505549758bf75c05a994a6d034f65f8f0e6fdcaeab1a34d4a6b4b636e070a38bce737 +fa73b0089d56a284efb0f0756c890be9b1b5dbdd8ee81a3655f83e33b2279d39bf3e848279a722c806b485a47e67c807b946a337bee8942674278859e13292fb +80b24263c7c1a3ebb71493c1dd7be8b49b46d1f41b4aeec1121b013783f8f3526b56d037e05f2598bd0fd2215d6a1e5295e64f73f63f0aec8b915a985d786598 +e37b6a775dc87dbaa4dfa9f96e5e3ffddebd71f8867289865df5a32d20cdc944b6022cac3c4982b10d5eeb55c3e4de15134676fb6de0446065c97440fa8c6a58 diff --git a/ffmpeg/tests/ref/fate/lossless-monkeysaudio b/ffmpeg/tests/ref/fate/lossless-monkeysaudio deleted file mode 100644 index 4b8caa1..0000000 --- a/ffmpeg/tests/ref/fate/lossless-monkeysaudio +++ /dev/null @@ -1 +0,0 @@ -a28d4e5f2192057f7d4bece870f40bd0 diff --git a/ffmpeg/tests/ref/fate/msvideo1-8bit b/ffmpeg/tests/ref/fate/msvideo1-8bit index 6e6bc0b..74d54e8 100644 --- a/ffmpeg/tests/ref/fate/msvideo1-8bit +++ b/ffmpeg/tests/ref/fate/msvideo1-8bit @@ -29,4 +29,3 @@ 0, 27, 27, 1, 57600, 0x4ec4a868 0, 28, 28, 1, 57600, 0x7db370a1 0, 29, 29, 1, 57600, 0x2b1e52f6 -0, 30, 30, 1, 57600, 0x2141467c diff --git a/ffmpeg/tests/ref/fate/nuv-rtjpeg b/ffmpeg/tests/ref/fate/nuv-rtjpeg index 8838fbb..96ead33 100644 --- a/ffmpeg/tests/ref/fate/nuv-rtjpeg +++ b/ffmpeg/tests/ref/fate/nuv-rtjpeg @@ -7,4 +7,3 @@ 0, 9, 9, 1, 460800, 0x4e091ee2 0, 10, 10, 1, 460800, 0x2ea88828 0, 11, 11, 1, 460800, 0x4b7f4df0 -0, 12, 12, 1, 460800, 0xa57f20d0 diff --git a/ffmpeg/tests/ref/fate/parseutils b/ffmpeg/tests/ref/fate/parseutils index 5fa3bf4..1482452 100644 --- a/ffmpeg/tests/ref/fate/parseutils +++ b/ffmpeg/tests/ref/fate/parseutils @@ -21,7 +21,7 @@ Testing av_parse_video_rate() '.23' -> 23/100 OK '-.23' -> -23/100 ERROR '-0.234' -> -117/500 ERROR -'-0.0000001' -> 0/1 ERROR +'-0.0000001' -> -1/10000000 ERROR ' 21332.2324 ' -> 917286/43 OK ' -21332.2324 ' -> -917286/43 ERROR diff --git a/ffmpeg/tests/ref/fate/prores-alpha b/ffmpeg/tests/ref/fate/prores-alpha index bdb5c6e..9a8b9ee 100644 --- a/ffmpeg/tests/ref/fate/prores-alpha +++ b/ffmpeg/tests/ref/fate/prores-alpha @@ -1,3 +1,3 @@ #tb 0: 100/2997 -0, 0, 0, 1, 12441600, 0x254d8f95 -0, 1, 1, 1, 12441600, 0x254d8f95 +0, 0, 0, 1, 16588800, 0x8dcdb600 +0, 1, 1, 1, 16588800, 0x8dcdb600 diff --git a/ffmpeg/tests/ref/fate/sierra-vmd-video b/ffmpeg/tests/ref/fate/sierra-vmd-video index 5b9dde1..668faee 100644 --- a/ffmpeg/tests/ref/fate/sierra-vmd-video +++ b/ffmpeg/tests/ref/fate/sierra-vmd-video @@ -1,118 +1,118 @@ #tb 0: 1/10 -0, 0, 0, 1, 230400, 0x0224ab01 -0, 1, 1, 1, 230400, 0x449e4d81 -0, 2, 2, 1, 230400, 0x3e15e07a -0, 3, 3, 1, 230400, 0xdabe4172 -0, 4, 4, 1, 230400, 0x0947b7db -0, 5, 5, 1, 230400, 0x934e243b -0, 6, 6, 1, 230400, 0x6b5c5b6c -0, 7, 7, 1, 230400, 0x4bf7bbb5 -0, 8, 8, 1, 230400, 0x423eec8e -0, 9, 9, 1, 230400, 0x63663b5e -0, 10, 10, 1, 230400, 0x9c258a67 -0, 11, 11, 1, 230400, 0x1c92b6e0 -0, 12, 12, 1, 230400, 0xdd0a0e28 -0, 13, 13, 1, 230400, 0x51d64af1 -0, 14, 14, 1, 230400, 0x5776ac12 -0, 15, 15, 1, 230400, 0x49070132 -0, 16, 16, 1, 230400, 0xa59635ab -0, 17, 17, 1, 230400, 0xb1f99504 -0, 18, 18, 1, 230400, 0x61fac725 -0, 19, 19, 1, 230400, 0xc32c28d5 -0, 20, 20, 1, 230400, 0x2b7a91d6 -0, 21, 21, 1, 230400, 0x917be717 -0, 22, 22, 1, 230400, 0xd3c5a2ff -0, 23, 23, 1, 230400, 0x0678a707 -0, 24, 24, 1, 230400, 0x122504e6 -0, 25, 25, 1, 230400, 0x76aebdae -0, 26, 26, 1, 230400, 0x81357545 -0, 27, 27, 1, 230400, 0x38baeebd -0, 28, 28, 1, 230400, 0x1c5c44d4 -0, 29, 29, 1, 230400, 0x60e189cc -0, 30, 30, 1, 230400, 0xb1f4381c -0, 31, 31, 1, 230400, 0xb5048fed -0, 32, 32, 1, 230400, 0xc947c30e -0, 33, 33, 1, 230400, 0xe8e31c07 -0, 34, 34, 1, 230400, 0x6d49dd02 -0, 35, 35, 1, 230400, 0x293e15d3 -0, 36, 36, 1, 230400, 0x354d792e -0, 37, 37, 1, 230400, 0x35468780 -0, 38, 38, 1, 230400, 0x365d3991 -0, 39, 39, 1, 230400, 0xc9debef2 -0, 40, 40, 1, 230400, 0x4c4634c2 -0, 41, 41, 1, 230400, 0x347c2dca -0, 42, 42, 1, 230400, 0x1efa0aaa -0, 43, 43, 1, 230400, 0xa79a0b5a -0, 44, 44, 1, 230400, 0xfdb2dcdb -0, 45, 45, 1, 230400, 0x42dbea33 -0, 46, 46, 1, 230400, 0x2a207e43 -0, 47, 47, 1, 230400, 0x86573783 -0, 48, 48, 1, 230400, 0xc3968473 -0, 49, 49, 1, 230400, 0x8f62a7b4 -0, 50, 50, 1, 230400, 0x5a2e3073 -0, 51, 51, 1, 230400, 0xd24f5e2c -0, 52, 52, 1, 230400, 0x1df3c67d -0, 53, 53, 1, 230400, 0xe4fd884d -0, 57, 57, 1, 230400, 0x9a228555 -0, 58, 58, 1, 230400, 0x9eba8ed5 -0, 59, 59, 1, 230400, 0x3d808a3d -0, 60, 60, 1, 230400, 0xf57e866d -0, 61, 61, 1, 230400, 0x85f594f5 -0, 62, 62, 1, 230400, 0xb09f99dd -0, 63, 63, 1, 230400, 0x2b368475 -0, 64, 64, 1, 230400, 0xa2417afd -0, 65, 65, 1, 230400, 0x590b709d -0, 66, 66, 1, 230400, 0x5d617705 -0, 67, 67, 1, 230400, 0xabf981ad -0, 68, 68, 1, 230400, 0x5a8590cd -0, 69, 69, 1, 230400, 0x1bff853d -0, 70, 70, 1, 230400, 0x71d08055 -0, 71, 71, 1, 230400, 0x2ebd817d -0, 72, 72, 1, 230400, 0x6e838255 -0, 73, 73, 1, 230400, 0x043984cd -0, 74, 74, 1, 230400, 0x7ff18495 -0, 75, 75, 1, 230400, 0xa43b8385 -0, 76, 76, 1, 230400, 0x72b5825d -0, 77, 77, 1, 230400, 0x3a178085 -0, 78, 78, 1, 230400, 0x67748245 -0, 79, 79, 1, 230400, 0xeddf81d5 -0, 80, 80, 1, 230400, 0x8b088665 -0, 81, 81, 1, 230400, 0x6c408e15 -0, 82, 82, 1, 230400, 0x81f196dd -0, 83, 83, 1, 230400, 0xab9f953d -0, 84, 84, 1, 230400, 0xa5f69795 -0, 85, 85, 1, 230400, 0xa772950d -0, 86, 86, 1, 230400, 0x6a5596d5 -0, 87, 87, 1, 230400, 0x1355958d -0, 88, 88, 1, 230400, 0x4134981d -0, 89, 89, 1, 230400, 0x8b929515 -0, 90, 90, 1, 230400, 0x482f95c5 -0, 91, 91, 1, 230400, 0x7a9795d5 -0, 92, 92, 1, 230400, 0x21c29abd -0, 93, 93, 1, 230400, 0x9ae6a475 -0, 94, 94, 1, 230400, 0x3734aee5 -0, 95, 95, 1, 230400, 0xa0a1b365 -0, 96, 96, 1, 230400, 0x2dcab1c5 -0, 97, 97, 1, 230400, 0x9c8b6c44 -0, 98, 98, 1, 230400, 0x5da75feb -0, 99, 99, 1, 230400, 0x4d02f8e3 -0, 100, 100, 1, 230400, 0x66824f3a -0, 101, 101, 1, 230400, 0x0c9257e2 -0, 102, 102, 1, 230400, 0xb2927092 -0, 103, 103, 1, 230400, 0xb5dc6e9a -0, 104, 104, 1, 230400, 0x6e567bc6 -0, 105, 105, 1, 230400, 0xbf9e0f7a -0, 106, 106, 1, 230400, 0xb16f684a -0, 107, 107, 1, 230400, 0xf9e55e81 -0, 108, 108, 1, 230400, 0xd8d0bcba -0, 109, 109, 1, 230400, 0x44720ac0 -0, 110, 110, 1, 230400, 0x7d4c2058 -0, 113, 113, 1, 230400, 0xb0973eb9 -0, 114, 114, 1, 230400, 0x405a13ce -0, 115, 115, 1, 230400, 0x6422f00a -0, 116, 116, 1, 230400, 0x924b6c1e -0, 145, 145, 1, 230400, 0xcf7809c0 -0, 146, 146, 1, 230400, 0x883a3863 -0, 147, 147, 1, 230400, 0x6adc9e03 -0, 148, 148, 1, 230400, 0x4f5ab7a8 -0, 214, 214, 1, 230400, 0xdc0aab94 +0, 0, 0, 1, 230400, 0x54b4bfe2 +0, 1, 1, 1, 230400, 0x9e1460e3 +0, 2, 2, 1, 230400, 0x8136f21c +0, 3, 3, 1, 230400, 0xadfc5089 +0, 4, 4, 1, 230400, 0x76f2c4bc +0, 5, 5, 1, 230400, 0x73862ec8 +0, 6, 6, 1, 230400, 0xba2562e3 +0, 7, 7, 1, 230400, 0xf908c0b6 +0, 8, 8, 1, 230400, 0x3596ee56 +0, 9, 9, 1, 230400, 0x97cc3a1e +0, 10, 10, 1, 230400, 0xe2c585f9 +0, 11, 11, 1, 230400, 0x1732aedb +0, 12, 12, 1, 230400, 0xa6d20354 +0, 13, 13, 1, 230400, 0x0e1e3d11 +0, 14, 14, 1, 230400, 0xe4f09bbd +0, 15, 15, 1, 230400, 0x5c15ee1a +0, 16, 16, 1, 230400, 0x33f51f69 +0, 17, 17, 1, 230400, 0xb6067c26 +0, 18, 18, 1, 230400, 0x985faab2 +0, 19, 19, 1, 230400, 0x3f0a09ae +0, 20, 20, 1, 230400, 0x4052702f +0, 21, 21, 1, 230400, 0xcd7fc29c +0, 22, 22, 1, 230400, 0x73c97d9f +0, 23, 23, 1, 230400, 0xf0fb8235 +0, 24, 24, 1, 230400, 0x7651e231 +0, 25, 25, 1, 230400, 0x3e749ecf +0, 26, 26, 1, 230400, 0x20515985 +0, 27, 27, 1, 230400, 0xd086d4b0 +0, 28, 28, 1, 230400, 0x343c2c77 +0, 29, 29, 1, 230400, 0xb9a47309 +0, 30, 30, 1, 230400, 0x39de2037 +0, 31, 31, 1, 230400, 0x9fc2745a +0, 32, 32, 1, 230400, 0x0868a2f3 +0, 33, 33, 1, 230400, 0xfe53f34d +0, 34, 34, 1, 230400, 0xf2abaa57 +0, 35, 35, 1, 230400, 0x2dafdc4b +0, 36, 36, 1, 230400, 0xf7d6353a +0, 37, 37, 1, 230400, 0x8aa63c0a +0, 38, 38, 1, 230400, 0xd1afe885 +0, 39, 39, 1, 230400, 0x64626c50 +0, 40, 40, 1, 230400, 0x2654dfca +0, 41, 41, 1, 230400, 0x6183d8c7 +0, 42, 42, 1, 230400, 0xededb578 +0, 43, 43, 1, 230400, 0xadeeb629 +0, 44, 44, 1, 230400, 0x0009873a +0, 45, 45, 1, 230400, 0xe2ec94eb +0, 46, 46, 1, 230400, 0x62132788 +0, 47, 47, 1, 230400, 0x8cc5e014 +0, 48, 48, 1, 230400, 0x2ded2ecd +0, 49, 49, 1, 230400, 0x81204eec +0, 50, 50, 1, 230400, 0x4f9fda58 +0, 51, 51, 1, 230400, 0x9d7f073b +0, 52, 52, 1, 230400, 0x607a6ee6 +0, 53, 53, 1, 230400, 0xed1c305c +0, 57, 57, 1, 230400, 0x52b52d62 +0, 58, 58, 1, 230400, 0x4ae0370a +0, 59, 59, 1, 230400, 0xe437326a +0, 60, 60, 1, 230400, 0xefb82e8c +0, 61, 61, 1, 230400, 0xa0f13d4b +0, 62, 62, 1, 230400, 0x473a424a +0, 63, 63, 1, 230400, 0x205a2c84 +0, 64, 64, 1, 230400, 0xe83022e5 +0, 65, 65, 1, 230400, 0x5db21854 +0, 66, 66, 1, 230400, 0x11991ed7 +0, 67, 67, 1, 230400, 0x649429b1 +0, 68, 68, 1, 230400, 0x840a3912 +0, 69, 69, 1, 230400, 0x8bb72d49 +0, 70, 70, 1, 230400, 0xedfc2850 +0, 71, 71, 1, 230400, 0x1b9b2977 +0, 72, 72, 1, 230400, 0x63912a4f +0, 73, 73, 1, 230400, 0x971c2ccc +0, 74, 74, 1, 230400, 0x1f022c98 +0, 75, 75, 1, 230400, 0x5dc42b8c +0, 76, 76, 1, 230400, 0x25172a53 +0, 77, 77, 1, 230400, 0x31fd287f +0, 78, 78, 1, 230400, 0x95182a44 +0, 79, 79, 1, 230400, 0xbf7d29ea +0, 80, 80, 1, 230400, 0xdeb82e84 +0, 81, 81, 1, 230400, 0xc3ad3659 +0, 82, 82, 1, 230400, 0xfef23f36 +0, 83, 83, 1, 230400, 0xf4a23d8c +0, 84, 84, 1, 230400, 0x90713fef +0, 85, 85, 1, 230400, 0x5fad3d58 +0, 86, 86, 1, 230400, 0x69283f2e +0, 87, 87, 1, 230400, 0x8f3d3dde +0, 88, 88, 1, 230400, 0x3129407a +0, 89, 89, 1, 230400, 0x266e3d64 +0, 90, 90, 1, 230400, 0xc41b3e19 +0, 91, 91, 1, 230400, 0x64203e29 +0, 92, 92, 1, 230400, 0x3f7e4328 +0, 93, 93, 1, 230400, 0xacef4d0e +0, 94, 94, 1, 230400, 0xf0ca57a7 +0, 95, 95, 1, 230400, 0x87c75c41 +0, 96, 96, 1, 230400, 0x9db75a9c +0, 97, 97, 1, 230400, 0x4152164c +0, 98, 98, 1, 230400, 0x8a330ac8 +0, 99, 99, 1, 230400, 0x5113a45d +0, 100, 100, 1, 230400, 0x60effb12 +0, 101, 101, 1, 230400, 0x01dc03c5 +0, 102, 102, 1, 230400, 0x7ae81caf +0, 103, 103, 1, 230400, 0x35c31ab0 +0, 104, 104, 1, 230400, 0xd59e171e +0, 105, 105, 1, 230400, 0x35c3989e +0, 106, 106, 1, 230400, 0xf93656a5 +0, 107, 107, 1, 230400, 0x0962745c +0, 108, 108, 1, 230400, 0x6a90cdb2 +0, 109, 109, 1, 230400, 0x4bc2216d +0, 110, 110, 1, 230400, 0x7a6d3744 +0, 113, 113, 1, 230400, 0xf16a5742 +0, 114, 114, 1, 230400, 0x1495ce79 +0, 115, 115, 1, 230400, 0x3b4397b0 +0, 116, 116, 1, 230400, 0x33ed8506 +0, 145, 145, 1, 230400, 0xf953256d +0, 146, 146, 1, 230400, 0xd7faaef9 +0, 147, 147, 1, 230400, 0xb37e6161 +0, 148, 148, 1, 230400, 0x526b6797 +0, 214, 214, 1, 230400, 0x8ec35bc5 diff --git a/ffmpeg/tests/ref/fate/sub-aqtitle b/ffmpeg/tests/ref/fate/sub-aqtitle index f6900e7..c477b0a 100644 --- a/ffmpeg/tests/ref/fate/sub-aqtitle +++ b/ffmpeg/tests/ref/fate/sub-aqtitle @@ -1 +1 @@ -e888e1354cd0968895ab89cb169fec31 +1c68def68db6536c235819cbe0638e00 diff --git a/ffmpeg/tests/ref/fate/sub-charenc b/ffmpeg/tests/ref/fate/sub-charenc index 3c4825e..ef72754 100644 --- a/ffmpeg/tests/ref/fate/sub-charenc +++ b/ffmpeg/tests/ref/fate/sub-charenc @@ -1 +1 @@ -a39d7e299a8e25b4ffece0f8d64bf19e +9615088d613931b50fd5016c7535b99a diff --git a/ffmpeg/tests/ref/fate/sub-movtextenc b/ffmpeg/tests/ref/fate/sub-movtextenc index 8f97497..fef4a97 100644 --- a/ffmpeg/tests/ref/fate/sub-movtextenc +++ b/ffmpeg/tests/ref/fate/sub-movtextenc @@ -1 +1 @@ -0435265a76ab2f6e66627089d76845f4 +8cb21f3632e1c86358429fb9402d19d4 diff --git a/ffmpeg/tests/ref/fate/sub-subviewer1 b/ffmpeg/tests/ref/fate/sub-subviewer1 index 116fce7..052431a 100644 --- a/ffmpeg/tests/ref/fate/sub-subviewer1 +++ b/ffmpeg/tests/ref/fate/sub-subviewer1 @@ -1 +1 @@ -0c2096fedf7c971742b2e879bb303ce9 +cbeb015b1125757eed814f212cfc6c9c diff --git a/ffmpeg/tests/ref/fate/sub2video b/ffmpeg/tests/ref/fate/sub2video index f866c21..39d00c7 100644 --- a/ffmpeg/tests/ref/fate/sub2video +++ b/ffmpeg/tests/ref/fate/sub2video @@ -1,60 +1,60 @@ #tb 0: 1/5 #tb 1: 1/1000 -0, 0, 0, 1, 518400, 0x46c47f38 -0, 1, 1, 1, 518400, 0xa814ca60 -0, 2, 2, 1, 518400, 0xa771e1af +0, 0, 0, 1, 518400, 0x83c27b82 +0, 1, 1, 1, 518400, 0x4051c7f9 +0, 2, 2, 1, 518400, 0xfb00e17e 1, 499, 499, 4960, 1015, 0x19e092d2, F=0x0 -0, 3, 3, 1, 518400, 0x267abb76 -0, 4, 4, 1, 518400, 0x184ca91f -0, 5, 5, 1, 518400, 0xc348bfee -0, 6, 6, 1, 518400, 0x80451196 -0, 7, 7, 1, 518400, 0xfeb1781b -0, 8, 8, 1, 518400, 0xa7e1b76c -0, 9, 9, 1, 518400, 0x1fa10b77 -0, 10, 10, 1, 518400, 0xbbeaa20e -0, 11, 11, 1, 518400, 0x5b5ba97f -0, 12, 12, 1, 518400, 0xe189fbdd -0, 13, 13, 1, 518400, 0xe143a932 -0, 14, 14, 1, 518400, 0x13f18190 -0, 15, 15, 1, 518400, 0x7eed3662 -0, 16, 16, 1, 518400, 0x2c79137b -0, 17, 17, 1, 518400, 0xe08c0c5b -0, 18, 18, 1, 518400, 0x87b62f9d -0, 19, 19, 1, 518400, 0xe93d71ae -0, 20, 20, 1, 518400, 0x3038eca5 -0, 21, 21, 1, 518400, 0xd77054bb -0, 22, 22, 1, 518400, 0x077ca600 -0, 23, 23, 1, 518400, 0xf0ceba79 -0, 24, 24, 1, 518400, 0x4acb661d -0, 25, 25, 1, 518400, 0xc28ae50a -0, 26, 26, 1, 518400, 0xa5381dd1 -0, 27, 27, 1, 518400, 0x259f15e5 -0, 28, 28, 1, 518400, 0xe1487038 -0, 29, 29, 1, 518400, 0x7b5e5ec3 -0, 30, 30, 1, 518400, 0x6b638cee -0, 31, 31, 1, 518400, 0x791da218 -0, 32, 32, 1, 518400, 0xd1e4980c -0, 33, 33, 1, 518400, 0xce9aa6f8 -0, 34, 34, 1, 518400, 0x9abe6cac -0, 35, 35, 1, 518400, 0xb472272a -0, 36, 36, 1, 518400, 0x730bfc44 -0, 37, 37, 1, 518400, 0xf3e0b969 -0, 38, 38, 1, 518400, 0x96a77064 -0, 39, 39, 1, 518400, 0x16e94bf0 -0, 40, 40, 1, 518400, 0x0ba93871 -0, 41, 41, 1, 518400, 0x5e004779 -0, 42, 42, 1, 518400, 0xc87864d5 -0, 43, 43, 1, 518400, 0xa4b7c331 -0, 44, 44, 1, 518400, 0xb8ec424a -0, 45, 45, 1, 518400, 0x4fa12b83 -0, 46, 46, 1, 518400, 0x55acfb38 -0, 47, 47, 1, 518400, 0xa4d66b64 -0, 48, 48, 1, 518400, 0xd4008e86 -0, 49, 49, 1, 518400, 0x88729869 +0, 3, 3, 1, 518400, 0x192abb74 +0, 4, 4, 1, 518400, 0x4669a88b +0, 5, 5, 1, 518400, 0xaababe00 +0, 6, 6, 1, 518400, 0x98a211a5 +0, 7, 7, 1, 518400, 0x440e7547 +0, 8, 8, 1, 518400, 0xca5bb496 +0, 9, 9, 1, 518400, 0xf86e0b0a +0, 10, 10, 1, 518400, 0xb80fa020 +0, 11, 11, 1, 518400, 0x41c2a54b +0, 12, 12, 1, 518400, 0x51baf353 +0, 13, 13, 1, 518400, 0x967ea7f3 +0, 14, 14, 1, 518400, 0x819e7f89 +0, 15, 15, 1, 518400, 0x192233e1 +0, 16, 16, 1, 518400, 0xc80a0eb3 +0, 17, 17, 1, 518400, 0x08260a23 +0, 18, 18, 1, 518400, 0xc92e2caf +0, 19, 19, 1, 518400, 0x3fe36eea +0, 20, 20, 1, 518400, 0x0891e8d5 +0, 21, 21, 1, 518400, 0x84655095 +0, 22, 22, 1, 518400, 0x9c7fa014 +0, 23, 23, 1, 518400, 0x9c43b656 +0, 24, 24, 1, 518400, 0x2cf46221 +0, 25, 25, 1, 518400, 0x7322e11c +0, 26, 26, 1, 518400, 0x45af1a84 +0, 27, 27, 1, 518400, 0x7b781071 +0, 28, 28, 1, 518400, 0x4f7c706c +0, 29, 29, 1, 518400, 0xb227603b +0, 30, 30, 1, 518400, 0x7b4b89c2 +0, 31, 31, 1, 518400, 0x456da21e +0, 32, 32, 1, 518400, 0xb691979f +0, 33, 33, 1, 518400, 0x0dfaa66d +0, 34, 34, 1, 518400, 0x191a6f23 +0, 35, 35, 1, 518400, 0xa03b2605 +0, 36, 36, 1, 518400, 0xb36aff87 +0, 37, 37, 1, 518400, 0xf5f0bc4a +0, 38, 38, 1, 518400, 0x863d701a +0, 39, 39, 1, 518400, 0xd11b4dce +0, 40, 40, 1, 518400, 0x969236bd +0, 41, 41, 1, 518400, 0xb60a485c +0, 42, 42, 1, 518400, 0xe9796621 +0, 43, 43, 1, 518400, 0x3e8fc04b +0, 44, 44, 1, 518400, 0xac9944e3 +0, 45, 45, 1, 518400, 0x01452b4d +0, 46, 46, 1, 518400, 0xb384f6d2 +0, 47, 47, 1, 518400, 0xde69683f +0, 48, 48, 1, 518400, 0x7df08fba +0, 49, 49, 1, 518400, 0xbab197ea 1, 15355, 15355, 4733, 2094, 0x3c171425, F=0x0 1, 48797, 48797, 2560, 2480, 0x7c0edf21, F=0x0 1, 51433, 51433, 2366, 3059, 0xc95b8a05, F=0x0 -1, 53919, 53919, 2696, 2095, 0x61bb15ed, F=0x0 +1, 53910, 53910, 2696, 2095, 0x61bb15ed, F=0x0 1, 56663, 56663, 1262, 1013, 0xc9ae89b7, F=0x0 1, 58014, 58014, 1661, 969, 0xe01878f0, F=0x0 1, 67724, 67724, 1365, 844, 0xe7db4fc1, F=0x0 @@ -77,6 +77,7 @@ 1, 141556, 141556, 1661, 1088, 0xde20aa20, F=0x0 1, 163445, 163445, 1331, 339, 0x8bd186ef, F=0x0 1, 168049, 168049, 1900, 1312, 0x0bf20e8d, F=0x0 +1, 170035, 170035, 1524, 1279, 0xb6c2dafe, F=0x0 1, 172203, 172203, 1695, 1826, 0x9a1ac769, F=0x0 1, 173947, 173947, 1934, 1474, 0xa9b03cdc, F=0x0 1, 175957, 175957, 1763, 1019, 0x20409355, F=0x0 @@ -84,7 +85,7 @@ 1, 191356, 191356, 1228, 1517, 0xae8c5c2b, F=0x0 1, 192640, 192640, 1763, 2506, 0xa458d6d4, F=0x0 1, 195193, 195193, 1092, 1074, 0x397ba9a8, F=0x0 -1, 196369, 196369, 1524, 1715, 0x695ca41e, F=0x0 +1, 196361, 196361, 1524, 1715, 0x695ca41e, F=0x0 1, 197946, 197946, 1160, 789, 0xc63a189e, F=0x0 1, 199230, 199230, 1627, 1846, 0xeea8c599, F=0x0 1, 200924, 200924, 1763, 922, 0xd4a87222, F=0x0 diff --git a/ffmpeg/tests/ref/fate/utvideoenc_rgb_left b/ffmpeg/tests/ref/fate/utvideoenc_rgb_left index 99d1182..87d5f27 100644 --- a/ffmpeg/tests/ref/fate/utvideoenc_rgb_left +++ b/ffmpeg/tests/ref/fate/utvideoenc_rgb_left @@ -1,4 +1,8 @@ +#format: frame checksums +#version: 1 +#hash: MD5 #tb 0: 1/25 +#stream#, dts, pts, duration, size, hash 0, 0, 0, 1, 182328, cd084b244939d7e0008d8e5ab3429dc1 0, 1, 1, 1, 182336, c9c40672750f372134185901147fb776 0, 2, 2, 1, 182956, c728911ca73225f2dc7453533c9be95e diff --git a/ffmpeg/tests/ref/fate/utvideoenc_rgb_median b/ffmpeg/tests/ref/fate/utvideoenc_rgb_median index 5983ddf..3d4c22b 100644 --- a/ffmpeg/tests/ref/fate/utvideoenc_rgb_median +++ b/ffmpeg/tests/ref/fate/utvideoenc_rgb_median @@ -1,4 +1,8 @@ +#format: frame checksums +#version: 1 +#hash: MD5 #tb 0: 1/25 +#stream#, dts, pts, duration, size, hash 0, 0, 0, 1, 182160, abcf4f477f74b696faca2fcff1f62aa9 0, 1, 1, 1, 182104, 7cbcf339fa40c24522067295b39d637f 0, 2, 2, 1, 183108, dfc2c418f4379a89654c16b34ff19446 diff --git a/ffmpeg/tests/ref/fate/utvideoenc_rgb_none b/ffmpeg/tests/ref/fate/utvideoenc_rgb_none index d6c6962..207c688 100644 --- a/ffmpeg/tests/ref/fate/utvideoenc_rgb_none +++ b/ffmpeg/tests/ref/fate/utvideoenc_rgb_none @@ -1,4 +1,8 @@ +#format: frame checksums +#version: 1 +#hash: MD5 #tb 0: 1/25 +#stream#, dts, pts, duration, size, hash 0, 0, 0, 1, 301052, 8645cb98470205cceea3c2026223b69f 0, 1, 1, 1, 301068, 9123c3c31ac0bc0832bb07e8c6d5b372 0, 2, 2, 1, 300840, 394aa034eba2b306efa8171efc5fb960 diff --git a/ffmpeg/tests/ref/fate/utvideoenc_rgba_left b/ffmpeg/tests/ref/fate/utvideoenc_rgba_left index 757febe..79a4ba7 100644 --- a/ffmpeg/tests/ref/fate/utvideoenc_rgba_left +++ b/ffmpeg/tests/ref/fate/utvideoenc_rgba_left @@ -1,4 +1,8 @@ +#format: frame checksums +#version: 1 +#hash: MD5 #tb 0: 1/25 +#stream#, dts, pts, duration, size, hash 0, 0, 0, 1, 195264, 5869dee2126d98ecc1fab1e69720906a 0, 1, 1, 1, 195272, 1bd08dcde1061b0d9273bdc6dd901382 0, 2, 2, 1, 195892, 2b3fc3632bcd1cc44f777fb97a56f79b diff --git a/ffmpeg/tests/ref/fate/utvideoenc_rgba_median b/ffmpeg/tests/ref/fate/utvideoenc_rgba_median index 1198a33..88adb0c 100644 --- a/ffmpeg/tests/ref/fate/utvideoenc_rgba_median +++ b/ffmpeg/tests/ref/fate/utvideoenc_rgba_median @@ -1,4 +1,8 @@ +#format: frame checksums +#version: 1 +#hash: MD5 #tb 0: 1/25 +#stream#, dts, pts, duration, size, hash 0, 0, 0, 1, 195096, 29ad3287ab4d7f4d46968c6d38ba049b 0, 1, 1, 1, 195040, 2c7b4f5f0aee96dca6dc30ce01b3c74d 0, 2, 2, 1, 196044, 7ffc6ab3c4a2eee436ef6a59c72ffb04 diff --git a/ffmpeg/tests/ref/fate/utvideoenc_rgba_none b/ffmpeg/tests/ref/fate/utvideoenc_rgba_none index 555409f..3221277 100644 --- a/ffmpeg/tests/ref/fate/utvideoenc_rgba_none +++ b/ffmpeg/tests/ref/fate/utvideoenc_rgba_none @@ -1,4 +1,8 @@ +#format: frame checksums +#version: 1 +#hash: MD5 #tb 0: 1/25 +#stream#, dts, pts, duration, size, hash 0, 0, 0, 1, 301312, 6912d70f7c20db0b5079a99443ffe65c 0, 1, 1, 1, 301328, 53f1b7d3c2f87ecfe9c9d305771421c5 0, 2, 2, 1, 301100, 7040f2b50dc10b2565fa899ba007983d diff --git a/ffmpeg/tests/ref/fate/utvideoenc_yuv420_left b/ffmpeg/tests/ref/fate/utvideoenc_yuv420_left index cec5a28..0ce4f9d 100644 --- a/ffmpeg/tests/ref/fate/utvideoenc_yuv420_left +++ b/ffmpeg/tests/ref/fate/utvideoenc_yuv420_left @@ -1,4 +1,8 @@ +#format: frame checksums +#version: 1 +#hash: MD5 #tb 0: 1/25 +#stream#, dts, pts, duration, size, hash 0, 0, 0, 1, 59796, a7136363bc4b9ac663178e5c7f24bae7 0, 1, 1, 1, 60012, d296cf24776234599e22526598de838c 0, 2, 2, 1, 61040, e889f81df51b75acf8131de97f9da4e3 diff --git a/ffmpeg/tests/ref/fate/utvideoenc_yuv420_median b/ffmpeg/tests/ref/fate/utvideoenc_yuv420_median index ddd074b..a730f48 100644 --- a/ffmpeg/tests/ref/fate/utvideoenc_yuv420_median +++ b/ffmpeg/tests/ref/fate/utvideoenc_yuv420_median @@ -1,4 +1,8 @@ +#format: frame checksums +#version: 1 +#hash: MD5 #tb 0: 1/25 +#stream#, dts, pts, duration, size, hash 0, 0, 0, 1, 62876, c21650baa099fb2dfd35d4f8ddce16d1 0, 1, 1, 1, 62832, 034a1996d13c15ee0bf482ddc398aac9 0, 2, 2, 1, 64076, 1f39fd5fc926195b90a3374682a80eac diff --git a/ffmpeg/tests/ref/fate/utvideoenc_yuv420_none b/ffmpeg/tests/ref/fate/utvideoenc_yuv420_none index 555eee2..b960760 100644 --- a/ffmpeg/tests/ref/fate/utvideoenc_yuv420_none +++ b/ffmpeg/tests/ref/fate/utvideoenc_yuv420_none @@ -1,4 +1,8 @@ +#format: frame checksums +#version: 1 +#hash: MD5 #tb 0: 1/25 +#stream#, dts, pts, duration, size, hash 0, 0, 0, 1, 144508, 83af3948090ebb44a0091815e4edc61e 0, 1, 1, 1, 144496, 950742e357ee489fcda4f783b8df3b4c 0, 2, 2, 1, 144376, 4b818cf0a50e9338fea26101073e445e diff --git a/ffmpeg/tests/ref/fate/utvideoenc_yuv422_left b/ffmpeg/tests/ref/fate/utvideoenc_yuv422_left index d9afc2c..069a221 100644 --- a/ffmpeg/tests/ref/fate/utvideoenc_yuv422_left +++ b/ffmpeg/tests/ref/fate/utvideoenc_yuv422_left @@ -1,4 +1,8 @@ +#format: frame checksums +#version: 1 +#hash: MD5 #tb 0: 1/25 +#stream#, dts, pts, duration, size, hash 0, 0, 0, 1, 91788, e14e576f1f9abd095f13ceca627adb59 0, 1, 1, 1, 92140, 4b7db11c2d35fa91ff1b6f65c184e3fa 0, 2, 2, 1, 93268, 6ef5cb83a4db2afbf14467cbc4b6c4f7 diff --git a/ffmpeg/tests/ref/fate/utvideoenc_yuv422_median b/ffmpeg/tests/ref/fate/utvideoenc_yuv422_median index e1c8fcd..cb9ca44 100644 --- a/ffmpeg/tests/ref/fate/utvideoenc_yuv422_median +++ b/ffmpeg/tests/ref/fate/utvideoenc_yuv422_median @@ -1,4 +1,8 @@ +#format: frame checksums +#version: 1 +#hash: MD5 #tb 0: 1/25 +#stream#, dts, pts, duration, size, hash 0, 0, 0, 1, 89732, 698174b0d0d68e98774363ca7926f6e1 0, 1, 1, 1, 89652, f0789b7c32ef44207dfc5a454bb5ccee 0, 2, 2, 1, 90868, 6df1dcb1957efca736e88adfbad8557b diff --git a/ffmpeg/tests/ref/fate/utvideoenc_yuv422_none b/ffmpeg/tests/ref/fate/utvideoenc_yuv422_none index ca77177..d15235c 100644 --- a/ffmpeg/tests/ref/fate/utvideoenc_yuv422_none +++ b/ffmpeg/tests/ref/fate/utvideoenc_yuv422_none @@ -1,4 +1,8 @@ +#format: frame checksums +#version: 1 +#hash: MD5 #tb 0: 1/25 +#stream#, dts, pts, duration, size, hash 0, 0, 0, 1, 191800, 0e1d199f87997ba47e98596b6087d7d4 0, 1, 1, 1, 191820, b35714d0635214095ac06d35da00ed32 0, 2, 2, 1, 191668, 8336829e44f5b90034e5da33dcd27f1f diff --git a/ffmpeg/tests/ref/fate/vp8-alpha b/ffmpeg/tests/ref/fate/vp8-alpha index f857a87..2b89817 100644 --- a/ffmpeg/tests/ref/fate/vp8-alpha +++ b/ffmpeg/tests/ref/fate/vp8-alpha @@ -1,121 +1,121 @@ #tb 0: 1/1000 -0, 1, 1, 0, 2108, 0x59b92a34, S=1, 1900, 0x8fb3adc5 -0, 33, 33, 0, 142, 0x2f2a3fed, F=0x0, S=1, 160, 0xa13346af -0, 66, 66, 0, 157, 0x17804767, F=0x0, S=1, 209, 0x64115f15 -0, 100, 100, 0, 206, 0x537262ca, F=0x0, S=1, 317, 0x44a09dd0 -0, 133, 133, 0, 259, 0x73ff74b6, F=0x0, S=1, 384, 0x2ee2c588 -0, 166, 166, 0, 320, 0x0fcf8ce4, F=0x0, S=1, 415, 0xff68c953 -0, 200, 200, 0, 377, 0x8fffb5f5, F=0x0, S=1, 475, 0x4166f3eb -0, 233, 233, 0, 407, 0xe476c19e, F=0x0, S=1, 193, 0x3ff75489 -0, 266, 266, 0, 539, 0x90202334, F=0x0, S=1, 681, 0x776656b0 -0, 300, 300, 0, 560, 0xc6e2168d, F=0x0, S=1, 585, 0xddc81b8a -0, 333, 333, 0, 597, 0x201a32a7, F=0x0, S=1, 574, 0x8baa1d65 -0, 366, 366, 0, 770, 0xab2b8891, F=0x0, S=1, 666, 0xcd8e51eb -0, 400, 400, 0, 708, 0xc2386711, F=0x0, S=1, 706, 0x046b6444 -0, 433, 433, 0, 905, 0x7211c52d, F=0x0, S=1, 814, 0x5e288def -0, 466, 466, 0, 770, 0xda4f8574, F=0x0, S=1, 829, 0xa0e8a949 -0, 500, 500, 0, 955, 0xf9a1d77a, F=0x0, S=1, 857, 0x9b63b955 -0, 533, 533, 0, 970, 0xff4de39a, F=0x0, S=1, 153, 0x3b00416c -0, 566, 566, 0, 978, 0x12bcf81f, F=0x0, S=1, 1181, 0xce175555 -0, 600, 600, 0, 1233, 0x2903744a, F=0x0, S=1, 860, 0x737eb566 -0, 633, 633, 0, 1118, 0x7f274f50, F=0x0, S=1, 933, 0xb669c6b6 -0, 666, 666, 0, 941, 0x6bffd4b1, F=0x0, S=1, 1058, 0x07581cee -0, 700, 700, 0, 1598, 0xc007219f, F=0x0, S=1, 939, 0x2c0bdc45 -0, 733, 733, 0, 1218, 0x25d962b6, F=0x0, S=1, 1090, 0x96482341 -0, 766, 766, 0, 1200, 0x86b85be3, F=0x0, S=1, 189, 0x3f085309 -0, 800, 800, 0, 1329, 0x298a848a, F=0x0, S=1, 1426, 0x6ea3df12 -0, 833, 833, 0, 1500, 0xe437edec, F=0x0, S=1, 1244, 0x32836b8d -0, 866, 866, 0, 1288, 0xc4447dd5, F=0x0, S=1, 1289, 0x06a57b0f -0, 900, 900, 0, 1281, 0xb5bf7e9f, F=0x0, S=1, 1227, 0xd96d5697 -0, 933, 933, 0, 1372, 0x09be9014, F=0x0, S=1, 1556, 0x2630fbff -0, 966, 966, 0, 1238, 0x42ce6316, F=0x0, S=1, 1287, 0x1d3084f6 -0, 1000, 1000, 0, 1655, 0xb94b45c2, F=0x0, S=1, 1494, 0x34dbd1a4 -0, 1033, 1033, 0, 1164, 0xf6b93ad0, F=0x0, S=1, 1337, 0xba6d9673 -0, 1066, 1066, 0, 1084, 0x58c50fb5, F=0x0, S=1, 1384, 0x3fabb82b -0, 1100, 1100, 0, 1151, 0x0b3f3359, F=0x0, S=1, 1353, 0x08e2a1d7 -0, 1133, 1133, 0, 1277, 0xa3ae77e1, F=0x0, S=1, 1409, 0xf65cb9f7 -0, 1166, 1166, 0, 782, 0xdcf671ff, F=0x0, S=1, 1408, 0x01e2ac53 -0, 1200, 1200, 0, 926, 0xe913c286, F=0x0, S=1, 1320, 0x32e38e42 -0, 1233, 1233, 0, 970, 0x3d86e5ae, F=0x0, S=1, 1608, 0x40b52618 -0, 1266, 1266, 0, 1353, 0xe4f197b2, F=0x0, S=1, 1272, 0xf1d272a5 -0, 1300, 1300, 0, 685, 0x629b4ce4, F=0x0, S=1, 1257, 0x14845de9 -0, 1333, 1333, 0, 743, 0x6f1172a3, F=0x0, S=1, 1260, 0xa6c66fda -0, 1366, 1366, 0, 789, 0x94fc84cd, F=0x0, S=1, 1009, 0x7daaf2b0 -0, 1400, 1400, 0, 1460, 0x668adb82, F=0x0, S=1, 944, 0x44b6ccf5 -0, 1433, 1433, 0, 766, 0x49c884ef, F=0x0, S=1, 996, 0x8646e6dd -0, 1466, 1466, 0, 1037, 0x24831498, F=0x0, S=1, 983, 0x14a9e7a6 -0, 1500, 1500, 0, 943, 0x1f53d180, F=0x0, S=1, 1107, 0x02f72acb -0, 1533, 1533, 0, 1152, 0xbf6a35ae, F=0x0, S=1, 1026, 0xd57afda0 -0, 1566, 1566, 0, 730, 0x42806abf, F=0x0, S=1, 1029, 0xfb0402d5 -0, 1600, 1600, 0, 975, 0xa5ffec57, F=0x0, S=1, 1081, 0xe2890cea -0, 1633, 1633, 0, 970, 0xbe8ee224, F=0x0, S=1, 1151, 0x7b0d3b20 -0, 1666, 1666, 0, 1012, 0x20c6f0d8, F=0x0, S=1, 979, 0xc25cd69c -0, 1700, 1700, 0, 874, 0x1a2fb4da, F=0x0, S=1, 943, 0xdb2dc9f8 -0, 1733, 1733, 0, 869, 0xab0caf3d, F=0x0, S=1, 934, 0x48b9bfcc -0, 1766, 1766, 0, 863, 0xd8caa2e5, F=0x0, S=1, 874, 0x0b34b026 -0, 1800, 1800, 0, 1246, 0x47866cdc, F=0x0, S=1, 818, 0x0c908eeb -0, 1833, 1833, 0, 742, 0xa6296ac1, F=0x0, S=1, 921, 0x97b6b053 -0, 1866, 1866, 0, 828, 0x0b568d7a, F=0x0, S=1, 969, 0x3314dbfa -0, 1900, 1900, 0, 825, 0x6d329394, F=0x0, S=1, 982, 0x5f66e68c -0, 1933, 1933, 0, 836, 0x8ace8dfb, F=0x0, S=1, 929, 0x9ffdc2fd -0, 1966, 1966, 0, 1774, 0xd4686726, F=0x0, S=1, 909, 0x11a9c07a -0, 2000, 2000, 0, 1803, 0x08c879ce, F=0x0, S=1, 1525, 0x1e11f02f -0, 2033, 2033, 0, 518, 0x7c32fc72, F=0x0, S=1, 785, 0xfc1f792a -0, 2066, 2066, 0, 790, 0x3dac8aa0, F=0x0, S=1, 876, 0x0918c88d -0, 2100, 2100, 0, 927, 0x4feccb24, F=0x0, S=1, 1059, 0xbcaa05c7 -0, 2133, 2133, 0, 835, 0x29d39266, F=0x0, S=1, 980, 0x4913e409 -0, 2166, 2166, 0, 951, 0xc1dddd12, F=0x0, S=1, 1041, 0x0541047e -0, 2200, 2200, 0, 876, 0x2f6eb89d, F=0x0, S=1, 949, 0x2d56c53b -0, 2233, 2233, 0, 959, 0xf0dedabd, F=0x0, S=1, 1022, 0x8d33f5fa -0, 2266, 2266, 0, 860, 0x9274ab39, F=0x0, S=1, 1061, 0x289c0132 -0, 2300, 2300, 0, 863, 0x7058ba30, F=0x0, S=1, 940, 0x1f32d4a3 -0, 2333, 2333, 0, 1021, 0xcabdf84f, F=0x0, S=1, 887, 0xda8ab95e -0, 2366, 2366, 0, 897, 0x9867c8e8, F=0x0, S=1, 840, 0xd93eaaf5 -0, 2400, 2400, 0, 897, 0x6a16b5db, F=0x0, S=1, 977, 0x7b77dc9b -0, 2433, 2433, 0, 953, 0xe9b4cf1f, F=0x0, S=1, 921, 0x75a8ca45 -0, 2466, 2466, 0, 847, 0x0335ad37, F=0x0, S=1, 1000, 0x2691f3bd -0, 2500, 2500, 0, 902, 0x3360b315, F=0x0, S=1, 1008, 0xd5e1deb6 -0, 2533, 2533, 0, 881, 0xf5309d59, F=0x0, S=1, 1113, 0xdbef3065 -0, 2566, 2566, 0, 974, 0x7c2de3ce, F=0x0, S=1, 1086, 0x365626bb -0, 2600, 2600, 0, 974, 0xf42bd9f5, F=0x0, S=1, 1039, 0xa7e9060d -0, 2633, 2633, 0, 1029, 0x7c33f4d0, F=0x0, S=1, 1041, 0xf4affa59 -0, 2666, 2666, 0, 881, 0x9021a565, F=0x0, S=1, 1039, 0xc1e00521 -0, 2700, 2700, 0, 1157, 0xe1c136f7, F=0x0, S=1, 917, 0x357ac7d3 -0, 2733, 2733, 0, 649, 0xdffb3cb7, F=0x0, S=1, 976, 0xa386e05e -0, 2766, 2766, 0, 758, 0xb67875f3, F=0x0, S=1, 1041, 0xae4e0a63 -0, 2800, 2800, 0, 1105, 0x8ffb1a26, F=0x0, S=1, 962, 0x211ddc5e -0, 2833, 2833, 0, 866, 0xa60eb2d9, F=0x0, S=1, 929, 0xe9e4c84b -0, 2866, 2866, 0, 912, 0xcd34bf9b, F=0x0, S=1, 946, 0xfce9d359 -0, 2900, 2900, 0, 868, 0x5651a343, F=0x0, S=1, 809, 0x624a8ef9 -0, 2933, 2933, 0, 997, 0xfa66eaeb, F=0x0, S=1, 992, 0xc913e5e2 -0, 2966, 2966, 0, 1111, 0x3f272497, F=0x0, S=1, 1007, 0xf78ee6a7 -0, 3000, 3000, 0, 842, 0xe442999f, F=0x0, S=1, 972, 0x25a0d25c -0, 3033, 3033, 0, 1030, 0x6f97ffad, F=0x0, S=1, 993, 0x4059fd6b -0, 3066, 3066, 0, 1176, 0x66e64926, F=0x0, S=1, 951, 0x2762cdf1 -0, 3100, 3100, 0, 803, 0xfd1699cb, F=0x0, S=1, 959, 0x5cf9d56c -0, 3133, 3133, 0, 972, 0x1cdff00e, F=0x0, S=1, 1023, 0xeaf20900 -0, 3166, 3166, 0, 907, 0x17f8acca, F=0x0, S=1, 1054, 0xeb010c4d -0, 3200, 3200, 0, 915, 0x3569b545, F=0x0, S=1, 987, 0x73b2e159 -0, 3233, 3233, 0, 1021, 0x14c5076a, F=0x0, S=1, 1007, 0x6c4bf7f0 -0, 3266, 3266, 0, 837, 0xbf86b0ef, F=0x0, S=1, 963, 0xf472d31a -0, 3300, 3300, 0, 885, 0x1caac123, F=0x0, S=1, 1052, 0x2b7bfd20 -0, 3333, 3333, 0, 1355, 0x299e8d3c, F=0x0, S=1, 858, 0x2bbca3f0 -0, 3366, 3366, 0, 784, 0xb0bd7e9d, F=0x0, S=1, 969, 0xc865dc00 -0, 3400, 3400, 0, 991, 0xbc7ddda9, F=0x0, S=1, 1028, 0x801b00a6 -0, 3433, 3433, 0, 986, 0xb356f6b1, F=0x0, S=1, 1056, 0x8b840add -0, 3466, 3466, 0, 978, 0x94a3e87e, F=0x0, S=1, 1018, 0xe766fa52 -0, 3500, 3500, 0, 976, 0x55ddd14a, F=0x0, S=1, 992, 0x58a9ddfe -0, 3533, 3533, 0, 1241, 0x1ec867f7, F=0x0, S=1, 966, 0xa329e84f -0, 3566, 3566, 0, 975, 0xecf5dbb3, F=0x0, S=1, 899, 0xa7539f4d -0, 3600, 3600, 0, 1129, 0xb7243037, F=0x0, S=1, 1057, 0xbd0d10bd -0, 3633, 3633, 0, 913, 0xe5f1d03d, F=0x0, S=1, 1092, 0xeb9621f8 -0, 3666, 3666, 0, 943, 0x87d0ed78, F=0x0, S=1, 1057, 0x079c1054 -0, 3700, 3700, 0, 917, 0x536cc3fd, F=0x0, S=1, 946, 0xd2b9d0e2 -0, 3733, 3733, 0, 892, 0x4dffb1e2, F=0x0, S=1, 930, 0x70c9cc40 -0, 3766, 3766, 0, 957, 0x1a98e71c, F=0x0, S=1, 719, 0x6fec614a -0, 3800, 3800, 0, 893, 0xf405b2c3, F=0x0, S=1, 821, 0x63529cab -0, 3833, 3833, 0, 978, 0xa0a8d5f6, F=0x0, S=1, 745, 0x3c616219 -0, 3866, 3866, 0, 887, 0xfa7cb65d, F=0x0, S=1, 768, 0xb8f07885 -0, 3900, 3900, 0, 867, 0xd808ade7, F=0x0, S=1, 783, 0xf82b6b9a -0, 3933, 3933, 0, 1068, 0x6f8b135a, F=0x0, S=1, 807, 0x52028d50 -0, 3966, 3966, 0, 2010, 0x536fe0b6, F=0x0, S=1, 1512, 0x690aeb55 +0, 0, 0, 0, 2108, 0x59b92a34, S=1, 1900, 0x8fb3adc5 +0, 32, 32, 0, 142, 0x2f2a3fed, F=0x0, S=1, 160, 0xa13346af +0, 65, 65, 0, 157, 0x17804767, F=0x0, S=1, 209, 0x64115f15 +0, 99, 99, 0, 206, 0x537262ca, F=0x0, S=1, 317, 0x44a09dd0 +0, 132, 132, 0, 259, 0x73ff74b6, F=0x0, S=1, 384, 0x2ee2c588 +0, 165, 165, 0, 320, 0x0fcf8ce4, F=0x0, S=1, 415, 0xff68c953 +0, 199, 199, 0, 377, 0x8fffb5f5, F=0x0, S=1, 475, 0x4166f3eb +0, 232, 232, 0, 407, 0xe476c19e, F=0x0, S=1, 193, 0x3ff75489 +0, 265, 265, 0, 539, 0x90202334, F=0x0, S=1, 681, 0x776656b0 +0, 299, 299, 0, 560, 0xc6e2168d, F=0x0, S=1, 585, 0xddc81b8a +0, 332, 332, 0, 597, 0x201a32a7, F=0x0, S=1, 574, 0x8baa1d65 +0, 365, 365, 0, 770, 0xab2b8891, F=0x0, S=1, 666, 0xcd8e51eb +0, 399, 399, 0, 708, 0xc2386711, F=0x0, S=1, 706, 0x046b6444 +0, 432, 432, 0, 905, 0x7211c52d, F=0x0, S=1, 814, 0x5e288def +0, 465, 465, 0, 770, 0xda4f8574, F=0x0, S=1, 829, 0xa0e8a949 +0, 499, 499, 0, 955, 0xf9a1d77a, F=0x0, S=1, 857, 0x9b63b955 +0, 532, 532, 0, 970, 0xff4de39a, F=0x0, S=1, 153, 0x3b00416c +0, 565, 565, 0, 978, 0x12bcf81f, F=0x0, S=1, 1181, 0xce175555 +0, 599, 599, 0, 1233, 0x2903744a, F=0x0, S=1, 860, 0x737eb566 +0, 632, 632, 0, 1118, 0x7f274f50, F=0x0, S=1, 933, 0xb669c6b6 +0, 665, 665, 0, 941, 0x6bffd4b1, F=0x0, S=1, 1058, 0x07581cee +0, 699, 699, 0, 1598, 0xc007219f, F=0x0, S=1, 939, 0x2c0bdc45 +0, 732, 732, 0, 1218, 0x25d962b6, F=0x0, S=1, 1090, 0x96482341 +0, 765, 765, 0, 1200, 0x86b85be3, F=0x0, S=1, 189, 0x3f085309 +0, 799, 799, 0, 1329, 0x298a848a, F=0x0, S=1, 1426, 0x6ea3df12 +0, 832, 832, 0, 1500, 0xe437edec, F=0x0, S=1, 1244, 0x32836b8d +0, 865, 865, 0, 1288, 0xc4447dd5, F=0x0, S=1, 1289, 0x06a57b0f +0, 899, 899, 0, 1281, 0xb5bf7e9f, F=0x0, S=1, 1227, 0xd96d5697 +0, 932, 932, 0, 1372, 0x09be9014, F=0x0, S=1, 1556, 0x2630fbff +0, 965, 965, 0, 1238, 0x42ce6316, F=0x0, S=1, 1287, 0x1d3084f6 +0, 999, 999, 0, 1655, 0xb94b45c2, F=0x0, S=1, 1494, 0x34dbd1a4 +0, 1032, 1032, 0, 1164, 0xf6b93ad0, F=0x0, S=1, 1337, 0xba6d9673 +0, 1065, 1065, 0, 1084, 0x58c50fb5, F=0x0, S=1, 1384, 0x3fabb82b +0, 1099, 1099, 0, 1151, 0x0b3f3359, F=0x0, S=1, 1353, 0x08e2a1d7 +0, 1132, 1132, 0, 1277, 0xa3ae77e1, F=0x0, S=1, 1409, 0xf65cb9f7 +0, 1165, 1165, 0, 782, 0xdcf671ff, F=0x0, S=1, 1408, 0x01e2ac53 +0, 1199, 1199, 0, 926, 0xe913c286, F=0x0, S=1, 1320, 0x32e38e42 +0, 1232, 1232, 0, 970, 0x3d86e5ae, F=0x0, S=1, 1608, 0x40b52618 +0, 1265, 1265, 0, 1353, 0xe4f197b2, F=0x0, S=1, 1272, 0xf1d272a5 +0, 1299, 1299, 0, 685, 0x629b4ce4, F=0x0, S=1, 1257, 0x14845de9 +0, 1332, 1332, 0, 743, 0x6f1172a3, F=0x0, S=1, 1260, 0xa6c66fda +0, 1365, 1365, 0, 789, 0x94fc84cd, F=0x0, S=1, 1009, 0x7daaf2b0 +0, 1399, 1399, 0, 1460, 0x668adb82, F=0x0, S=1, 944, 0x44b6ccf5 +0, 1432, 1432, 0, 766, 0x49c884ef, F=0x0, S=1, 996, 0x8646e6dd +0, 1465, 1465, 0, 1037, 0x24831498, F=0x0, S=1, 983, 0x14a9e7a6 +0, 1499, 1499, 0, 943, 0x1f53d180, F=0x0, S=1, 1107, 0x02f72acb +0, 1532, 1532, 0, 1152, 0xbf6a35ae, F=0x0, S=1, 1026, 0xd57afda0 +0, 1565, 1565, 0, 730, 0x42806abf, F=0x0, S=1, 1029, 0xfb0402d5 +0, 1599, 1599, 0, 975, 0xa5ffec57, F=0x0, S=1, 1081, 0xe2890cea +0, 1632, 1632, 0, 970, 0xbe8ee224, F=0x0, S=1, 1151, 0x7b0d3b20 +0, 1665, 1665, 0, 1012, 0x20c6f0d8, F=0x0, S=1, 979, 0xc25cd69c +0, 1699, 1699, 0, 874, 0x1a2fb4da, F=0x0, S=1, 943, 0xdb2dc9f8 +0, 1732, 1732, 0, 869, 0xab0caf3d, F=0x0, S=1, 934, 0x48b9bfcc +0, 1765, 1765, 0, 863, 0xd8caa2e5, F=0x0, S=1, 874, 0x0b34b026 +0, 1799, 1799, 0, 1246, 0x47866cdc, F=0x0, S=1, 818, 0x0c908eeb +0, 1832, 1832, 0, 742, 0xa6296ac1, F=0x0, S=1, 921, 0x97b6b053 +0, 1865, 1865, 0, 828, 0x0b568d7a, F=0x0, S=1, 969, 0x3314dbfa +0, 1899, 1899, 0, 825, 0x6d329394, F=0x0, S=1, 982, 0x5f66e68c +0, 1932, 1932, 0, 836, 0x8ace8dfb, F=0x0, S=1, 929, 0x9ffdc2fd +0, 1965, 1965, 0, 1774, 0xd4686726, F=0x0, S=1, 909, 0x11a9c07a +0, 1999, 1999, 0, 1803, 0x08c879ce, F=0x0, S=1, 1525, 0x1e11f02f +0, 2032, 2032, 0, 518, 0x7c32fc72, F=0x0, S=1, 785, 0xfc1f792a +0, 2065, 2065, 0, 790, 0x3dac8aa0, F=0x0, S=1, 876, 0x0918c88d +0, 2099, 2099, 0, 927, 0x4feccb24, F=0x0, S=1, 1059, 0xbcaa05c7 +0, 2132, 2132, 0, 835, 0x29d39266, F=0x0, S=1, 980, 0x4913e409 +0, 2165, 2165, 0, 951, 0xc1dddd12, F=0x0, S=1, 1041, 0x0541047e +0, 2199, 2199, 0, 876, 0x2f6eb89d, F=0x0, S=1, 949, 0x2d56c53b +0, 2232, 2232, 0, 959, 0xf0dedabd, F=0x0, S=1, 1022, 0x8d33f5fa +0, 2265, 2265, 0, 860, 0x9274ab39, F=0x0, S=1, 1061, 0x289c0132 +0, 2299, 2299, 0, 863, 0x7058ba30, F=0x0, S=1, 940, 0x1f32d4a3 +0, 2332, 2332, 0, 1021, 0xcabdf84f, F=0x0, S=1, 887, 0xda8ab95e +0, 2365, 2365, 0, 897, 0x9867c8e8, F=0x0, S=1, 840, 0xd93eaaf5 +0, 2399, 2399, 0, 897, 0x6a16b5db, F=0x0, S=1, 977, 0x7b77dc9b +0, 2432, 2432, 0, 953, 0xe9b4cf1f, F=0x0, S=1, 921, 0x75a8ca45 +0, 2465, 2465, 0, 847, 0x0335ad37, F=0x0, S=1, 1000, 0x2691f3bd +0, 2499, 2499, 0, 902, 0x3360b315, F=0x0, S=1, 1008, 0xd5e1deb6 +0, 2532, 2532, 0, 881, 0xf5309d59, F=0x0, S=1, 1113, 0xdbef3065 +0, 2565, 2565, 0, 974, 0x7c2de3ce, F=0x0, S=1, 1086, 0x365626bb +0, 2599, 2599, 0, 974, 0xf42bd9f5, F=0x0, S=1, 1039, 0xa7e9060d +0, 2632, 2632, 0, 1029, 0x7c33f4d0, F=0x0, S=1, 1041, 0xf4affa59 +0, 2665, 2665, 0, 881, 0x9021a565, F=0x0, S=1, 1039, 0xc1e00521 +0, 2699, 2699, 0, 1157, 0xe1c136f7, F=0x0, S=1, 917, 0x357ac7d3 +0, 2732, 2732, 0, 649, 0xdffb3cb7, F=0x0, S=1, 976, 0xa386e05e +0, 2765, 2765, 0, 758, 0xb67875f3, F=0x0, S=1, 1041, 0xae4e0a63 +0, 2799, 2799, 0, 1105, 0x8ffb1a26, F=0x0, S=1, 962, 0x211ddc5e +0, 2832, 2832, 0, 866, 0xa60eb2d9, F=0x0, S=1, 929, 0xe9e4c84b +0, 2865, 2865, 0, 912, 0xcd34bf9b, F=0x0, S=1, 946, 0xfce9d359 +0, 2899, 2899, 0, 868, 0x5651a343, F=0x0, S=1, 809, 0x624a8ef9 +0, 2932, 2932, 0, 997, 0xfa66eaeb, F=0x0, S=1, 992, 0xc913e5e2 +0, 2965, 2965, 0, 1111, 0x3f272497, F=0x0, S=1, 1007, 0xf78ee6a7 +0, 2999, 2999, 0, 842, 0xe442999f, F=0x0, S=1, 972, 0x25a0d25c +0, 3032, 3032, 0, 1030, 0x6f97ffad, F=0x0, S=1, 993, 0x4059fd6b +0, 3065, 3065, 0, 1176, 0x66e64926, F=0x0, S=1, 951, 0x2762cdf1 +0, 3099, 3099, 0, 803, 0xfd1699cb, F=0x0, S=1, 959, 0x5cf9d56c +0, 3132, 3132, 0, 972, 0x1cdff00e, F=0x0, S=1, 1023, 0xeaf20900 +0, 3165, 3165, 0, 907, 0x17f8acca, F=0x0, S=1, 1054, 0xeb010c4d +0, 3199, 3199, 0, 915, 0x3569b545, F=0x0, S=1, 987, 0x73b2e159 +0, 3232, 3232, 0, 1021, 0x14c5076a, F=0x0, S=1, 1007, 0x6c4bf7f0 +0, 3265, 3265, 0, 837, 0xbf86b0ef, F=0x0, S=1, 963, 0xf472d31a +0, 3299, 3299, 0, 885, 0x1caac123, F=0x0, S=1, 1052, 0x2b7bfd20 +0, 3332, 3332, 0, 1355, 0x299e8d3c, F=0x0, S=1, 858, 0x2bbca3f0 +0, 3365, 3365, 0, 784, 0xb0bd7e9d, F=0x0, S=1, 969, 0xc865dc00 +0, 3399, 3399, 0, 991, 0xbc7ddda9, F=0x0, S=1, 1028, 0x801b00a6 +0, 3432, 3432, 0, 986, 0xb356f6b1, F=0x0, S=1, 1056, 0x8b840add +0, 3465, 3465, 0, 978, 0x94a3e87e, F=0x0, S=1, 1018, 0xe766fa52 +0, 3499, 3499, 0, 976, 0x55ddd14a, F=0x0, S=1, 992, 0x58a9ddfe +0, 3532, 3532, 0, 1241, 0x1ec867f7, F=0x0, S=1, 966, 0xa329e84f +0, 3565, 3565, 0, 975, 0xecf5dbb3, F=0x0, S=1, 899, 0xa7539f4d +0, 3599, 3599, 0, 1129, 0xb7243037, F=0x0, S=1, 1057, 0xbd0d10bd +0, 3632, 3632, 0, 913, 0xe5f1d03d, F=0x0, S=1, 1092, 0xeb9621f8 +0, 3665, 3665, 0, 943, 0x87d0ed78, F=0x0, S=1, 1057, 0x079c1054 +0, 3699, 3699, 0, 917, 0x536cc3fd, F=0x0, S=1, 946, 0xd2b9d0e2 +0, 3732, 3732, 0, 892, 0x4dffb1e2, F=0x0, S=1, 930, 0x70c9cc40 +0, 3765, 3765, 0, 957, 0x1a98e71c, F=0x0, S=1, 719, 0x6fec614a +0, 3799, 3799, 0, 893, 0xf405b2c3, F=0x0, S=1, 821, 0x63529cab +0, 3832, 3832, 0, 978, 0xa0a8d5f6, F=0x0, S=1, 745, 0x3c616219 +0, 3865, 3865, 0, 887, 0xfa7cb65d, F=0x0, S=1, 768, 0xb8f07885 +0, 3899, 3899, 0, 867, 0xd808ade7, F=0x0, S=1, 783, 0xf82b6b9a +0, 3932, 3932, 0, 1068, 0x6f8b135a, F=0x0, S=1, 807, 0x52028d50 +0, 3965, 3965, 0, 2010, 0x536fe0b6, F=0x0, S=1, 1512, 0x690aeb55 diff --git a/ffmpeg/tests/ref/fate/vp8-sign-bias b/ffmpeg/tests/ref/fate/vp8-sign-bias index 38843c0..b503de8 100644 --- a/ffmpeg/tests/ref/fate/vp8-sign-bias +++ b/ffmpeg/tests/ref/fate/vp8-sign-bias @@ -1,4 +1,8 @@ +#format: frame checksums +#version: 1 +#hash: MD5 #tb 0: 1/24 +#stream#, dts, pts, duration, size, hash 0, 0, 0, 1, 614880, 12ce23b288485be3ddbc1db28c21517f 0, 2, 2, 1, 614880, ce352e1079535ea058c0e9ad50f7cdb8 0, 3, 3, 1, 614880, 9f6bf2739a027dfd12c81586cf75d3a3 diff --git a/ffmpeg/tests/ref/fate/vp8-size-change b/ffmpeg/tests/ref/fate/vp8-size-change index 1fba74e..f581c99 100644 --- a/ffmpeg/tests/ref/fate/vp8-size-change +++ b/ffmpeg/tests/ref/fate/vp8-size-change @@ -1,4 +1,8 @@ +#format: frame checksums +#version: 1 +#hash: MD5 #tb 0: 1/30 +#stream#, dts, pts, duration, size, hash 0, 0, 0, 1, 3110400, 7dde8cd136ab4b04a95d9856b941697e 0, 1, 1, 1, 3110400, aa885f78cb6374b5bfcc66a4fc57026f 0, 2, 2, 1, 3110400, b69b7b56f549a3f9b0a603940bac85ed diff --git a/ffmpeg/tests/ref/fate/vp8-test-vector-001 b/ffmpeg/tests/ref/fate/vp8-test-vector-001 index 64accc4..ef38aa8 100644 --- a/ffmpeg/tests/ref/fate/vp8-test-vector-001 +++ b/ffmpeg/tests/ref/fate/vp8-test-vector-001 @@ -1,4 +1,8 @@ +#format: frame checksums +#version: 1 +#hash: MD5 #tb 0: 1/30 +#stream#, dts, pts, duration, size, hash 0, 0, 0, 1, 38016, 83c78b5db579710f61f9354d5c51e8c8 0, 1, 1, 1, 38016, 8d089d226f52d6cdaffdb3fcc080b75b 0, 2, 2, 1, 38016, acaae81ca812145e85e0be83bdf54226 diff --git a/ffmpeg/tests/ref/fate/vp8-test-vector-002 b/ffmpeg/tests/ref/fate/vp8-test-vector-002 index d42674a..55149b0 100644 --- a/ffmpeg/tests/ref/fate/vp8-test-vector-002 +++ b/ffmpeg/tests/ref/fate/vp8-test-vector-002 @@ -1,4 +1,8 @@ +#format: frame checksums +#version: 1 +#hash: MD5 #tb 0: 1/24 +#stream#, dts, pts, duration, size, hash 0, 0, 0, 1, 38016, 872e9922f37f0e92c767d33e0a15b8e0 0, 1, 1, 1, 38016, ea5ad6c6ee4355018fc0ba83b5172836 0, 2, 2, 1, 38016, fe744612b2167c9ba6e1dc81c031e16a diff --git a/ffmpeg/tests/ref/fate/vp8-test-vector-003 b/ffmpeg/tests/ref/fate/vp8-test-vector-003 index 504766f..ffe3896 100644 --- a/ffmpeg/tests/ref/fate/vp8-test-vector-003 +++ b/ffmpeg/tests/ref/fate/vp8-test-vector-003 @@ -1,4 +1,8 @@ +#format: frame checksums +#version: 1 +#hash: MD5 #tb 0: 1/24 +#stream#, dts, pts, duration, size, hash 0, 0, 0, 1, 38016, 96e6ce168b5ef377053e86ab5484e7f9 0, 1, 1, 1, 38016, 10fd750292d8522ab7ee577043604789 0, 2, 2, 1, 38016, e040995173dc5c85abbbe38f6823ff9a diff --git a/ffmpeg/tests/ref/fate/vp8-test-vector-004 b/ffmpeg/tests/ref/fate/vp8-test-vector-004 index f402372..f7f5313 100644 --- a/ffmpeg/tests/ref/fate/vp8-test-vector-004 +++ b/ffmpeg/tests/ref/fate/vp8-test-vector-004 @@ -1,4 +1,8 @@ +#format: frame checksums +#version: 1 +#hash: MD5 #tb 0: 1/30 +#stream#, dts, pts, duration, size, hash 0, 0, 0, 1, 38016, 83c78b5db579710f61f9354d5c51e8c8 0, 1, 1, 1, 38016, d173eb8a8211a05672b43206609c9034 0, 2, 2, 1, 38016, 204e3e91613d647d30244c00fa2b9563 diff --git a/ffmpeg/tests/ref/fate/vp8-test-vector-005 b/ffmpeg/tests/ref/fate/vp8-test-vector-005 index 3569dee..3368c70 100644 --- a/ffmpeg/tests/ref/fate/vp8-test-vector-005 +++ b/ffmpeg/tests/ref/fate/vp8-test-vector-005 @@ -1,4 +1,8 @@ +#format: frame checksums +#version: 1 +#hash: MD5 #tb 0: 1/24 +#stream#, dts, pts, duration, size, hash 0, 0, 0, 1, 38016, e7a4be434df4bb524ba56a03cba901f4 0, 1, 1, 1, 38016, d903ade6d49e51485627c044fbb2190c 0, 2, 2, 1, 38016, af07ee39629b852870104cb9a9dde9e3 diff --git a/ffmpeg/tests/ref/fate/vp8-test-vector-006 b/ffmpeg/tests/ref/fate/vp8-test-vector-006 index 38b92c4..28c249c 100644 --- a/ffmpeg/tests/ref/fate/vp8-test-vector-006 +++ b/ffmpeg/tests/ref/fate/vp8-test-vector-006 @@ -1,4 +1,8 @@ +#format: frame checksums +#version: 1 +#hash: MD5 #tb 0: 1/24 +#stream#, dts, pts, duration, size, hash 0, 0, 0, 1, 37697, 9ca5df27b0158aca2a38dff946f58c41 0, 1, 1, 1, 37697, 627129a99538ec1ac51be910ca92ebc4 0, 2, 2, 1, 37697, 6c2df1f21af317aa5bb68b161ca96c70 diff --git a/ffmpeg/tests/ref/fate/vp8-test-vector-007 b/ffmpeg/tests/ref/fate/vp8-test-vector-007 index 8d9b912..a0cb441 100644 --- a/ffmpeg/tests/ref/fate/vp8-test-vector-007 +++ b/ffmpeg/tests/ref/fate/vp8-test-vector-007 @@ -1,4 +1,8 @@ +#format: frame checksums +#version: 1 +#hash: MD5 #tb 0: 1/30 +#stream#, dts, pts, duration, size, hash 0, 0, 0, 1, 38016, 98bd0af6928c144888a9c320270e9f0e 0, 1, 1, 1, 38016, 9ff7cff703d58481acd233451388377c 0, 2, 2, 1, 38016, e4cd8815527846cc782ea61ef5a46e49 diff --git a/ffmpeg/tests/ref/fate/vp8-test-vector-008 b/ffmpeg/tests/ref/fate/vp8-test-vector-008 index 9be8d73..0503c4e 100644 --- a/ffmpeg/tests/ref/fate/vp8-test-vector-008 +++ b/ffmpeg/tests/ref/fate/vp8-test-vector-008 @@ -1,3 +1,7 @@ +#format: frame checksums +#version: 1 +#hash: MD5 #tb 0: 1/23 +#stream#, dts, pts, duration, size, hash 0, 0, 0, 1, 1907424, 7146d3a72b6cb8e43ee5280ef8d661fe 0, 1, 1, 1, 1907424, 5a537e9710158efb5ad2683a1d3b4c72 diff --git a/ffmpeg/tests/ref/fate/vp8-test-vector-009 b/ffmpeg/tests/ref/fate/vp8-test-vector-009 index fae204d..f41f014 100644 --- a/ffmpeg/tests/ref/fate/vp8-test-vector-009 +++ b/ffmpeg/tests/ref/fate/vp8-test-vector-009 @@ -1,4 +1,8 @@ +#format: frame checksums +#version: 1 +#hash: MD5 #tb 0: 1/24 +#stream#, dts, pts, duration, size, hash 0, 0, 0, 1, 38016, b3a3121c796a60c88988fef5240a07fe 0, 1, 1, 1, 38016, f25147764829cf837e00b8fd6383e2c4 0, 2, 2, 1, 38016, 1b1552291a89c97d5deea145ab0ac0cd diff --git a/ffmpeg/tests/ref/fate/vp8-test-vector-010 b/ffmpeg/tests/ref/fate/vp8-test-vector-010 index b250ad9..2feeb63 100644 --- a/ffmpeg/tests/ref/fate/vp8-test-vector-010 +++ b/ffmpeg/tests/ref/fate/vp8-test-vector-010 @@ -1,4 +1,8 @@ +#format: frame checksums +#version: 1 +#hash: MD5 #tb 0: 1/30 +#stream#, dts, pts, duration, size, hash 0, 0, 0, 1, 115200, 3441ec1a9b9d325c9aeda44e3b68377d 0, 1, 1, 1, 115200, bff86a84fd673394f45c09d19a1ee0ac 0, 2, 2, 1, 115200, 8cd920f0de408e8cd883f9241680ff80 diff --git a/ffmpeg/tests/ref/fate/vp8-test-vector-011 b/ffmpeg/tests/ref/fate/vp8-test-vector-011 index d591ec7..adf7235 100644 --- a/ffmpeg/tests/ref/fate/vp8-test-vector-011 +++ b/ffmpeg/tests/ref/fate/vp8-test-vector-011 @@ -1,4 +1,8 @@ +#format: frame checksums +#version: 1 +#hash: MD5 #tb 0: 1/30 +#stream#, dts, pts, duration, size, hash 0, 0, 0, 1, 38016, 83c78b5db579710f61f9354d5c51e8c8 0, 1, 1, 1, 38016, 9b755a63c7c5352660a265f6e24991e1 0, 2, 2, 1, 38016, a591f0b04447d6d6dd9bb990502594aa diff --git a/ffmpeg/tests/ref/fate/vp8-test-vector-012 b/ffmpeg/tests/ref/fate/vp8-test-vector-012 index 4d5adcb..3de64b6 100644 --- a/ffmpeg/tests/ref/fate/vp8-test-vector-012 +++ b/ffmpeg/tests/ref/fate/vp8-test-vector-012 @@ -1,4 +1,8 @@ +#format: frame checksums +#version: 1 +#hash: MD5 #tb 0: 1/30 +#stream#, dts, pts, duration, size, hash 0, 0, 0, 1, 38016, cc3069a59b6f4319761af2b39923a6e5 0, 1, 1, 1, 38016, c0bc935941d994c6af6a864f02a90a62 0, 2, 2, 1, 38016, 5b6073ce4a03967aa87e56dfa27e32c2 diff --git a/ffmpeg/tests/ref/fate/vp8-test-vector-013 b/ffmpeg/tests/ref/fate/vp8-test-vector-013 index de7c0b3..e31e6e6 100644 --- a/ffmpeg/tests/ref/fate/vp8-test-vector-013 +++ b/ffmpeg/tests/ref/fate/vp8-test-vector-013 @@ -1,4 +1,8 @@ +#format: frame checksums +#version: 1 +#hash: MD5 #tb 0: 1/30 +#stream#, dts, pts, duration, size, hash 0, 0, 0, 1, 38016, ad137b9eae93daed28fe31fd5165b4d0 0, 1, 1, 1, 38016, 7cd527f647680c0eb305050d27fb8092 0, 2, 2, 1, 38016, f306e07a2e86c82a8cc1333be3812326 diff --git a/ffmpeg/tests/ref/fate/vp8-test-vector-014 b/ffmpeg/tests/ref/fate/vp8-test-vector-014 index 4341e59..689e24b 100644 --- a/ffmpeg/tests/ref/fate/vp8-test-vector-014 +++ b/ffmpeg/tests/ref/fate/vp8-test-vector-014 @@ -1,4 +1,8 @@ +#format: frame checksums +#version: 1 +#hash: MD5 #tb 0: 1/30 +#stream#, dts, pts, duration, size, hash 0, 0, 0, 1, 37697, 7a0356dc950e79744d79c98e391ebee9 0, 1, 1, 1, 37697, 96e221e75c290dd847b8e55865073366 0, 2, 2, 1, 37697, 67638290841837c90f180a01094f9191 diff --git a/ffmpeg/tests/ref/fate/vp8-test-vector-015 b/ffmpeg/tests/ref/fate/vp8-test-vector-015 index b32f233..766c931 100644 --- a/ffmpeg/tests/ref/fate/vp8-test-vector-015 +++ b/ffmpeg/tests/ref/fate/vp8-test-vector-015 @@ -1,4 +1,8 @@ +#format: frame checksums +#version: 1 +#hash: MD5 #tb 0: 1/30 +#stream#, dts, pts, duration, size, hash 0, 0, 0, 1, 115200, 6b4c7cc0c6a7218362e43cffef6618c9 0, 1, 1, 1, 115200, e132a7b1bb4fb15b1019092aedc0e599 0, 2, 2, 1, 115200, b36975db60f24088d95385ff7e8b7b8a diff --git a/ffmpeg/tests/ref/fate/vp8-test-vector-016 b/ffmpeg/tests/ref/fate/vp8-test-vector-016 index 291e7fe..4da7ff3 100644 --- a/ffmpeg/tests/ref/fate/vp8-test-vector-016 +++ b/ffmpeg/tests/ref/fate/vp8-test-vector-016 @@ -1,4 +1,8 @@ +#format: frame checksums +#version: 1 +#hash: MD5 #tb 0: 1/30 +#stream#, dts, pts, duration, size, hash 0, 0, 0, 1, 38016, 905a823da31f71f9c25ebb8dfc9ddd3c 0, 1, 1, 1, 38016, 9a1b97859b2f774954dbf96f45a22a0a 0, 2, 2, 1, 38016, f0f5651b32577549dc2e6e3050125229 diff --git a/ffmpeg/tests/ref/fate/vp8-test-vector-017 b/ffmpeg/tests/ref/fate/vp8-test-vector-017 index a8ccda8..0d3fbea 100644 --- a/ffmpeg/tests/ref/fate/vp8-test-vector-017 +++ b/ffmpeg/tests/ref/fate/vp8-test-vector-017 @@ -1,4 +1,8 @@ +#format: frame checksums +#version: 1 +#hash: MD5 #tb 0: 1/30 +#stream#, dts, pts, duration, size, hash 0, 0, 0, 1, 38016, 905a823da31f71f9c25ebb8dfc9ddd3c 0, 1, 1, 1, 38016, f0f411dd067bff05d5d9c64e3f52a4b1 0, 2, 2, 1, 38016, c8696f8fa56b4adf18f3db0c384d968f diff --git a/ffmpeg/tests/ref/fate/wmv8-drm b/ffmpeg/tests/ref/fate/wmv8-drm index 31291d3..12d8fbb 100644 --- a/ffmpeg/tests/ref/fate/wmv8-drm +++ b/ffmpeg/tests/ref/fate/wmv8-drm @@ -128,4 +128,3 @@ 0, 160, 160, 1, 84480, 0x13962590 0, 161, 161, 1, 84480, 0xde79482f 0, 162, 162, 1, 84480, 0x7d1ca064 -0, 163, 163, 1, 84480, 0x0998a064 diff --git a/ffmpeg/tests/ref/lavf-fate/mp3 b/ffmpeg/tests/ref/lavf-fate/mp3 index 361314b..6f201e0 100644 --- a/ffmpeg/tests/ref/lavf-fate/mp3 +++ b/ffmpeg/tests/ref/lavf-fate/mp3 @@ -1,3 +1,3 @@ -7fcf80c2059b5c058a6cdd2e2f798b6c *./tests/data/lavf-fate/lavf.mp3 -96366 ./tests/data/lavf-fate/lavf.mp3 +6bdea919dc6856d76ef2553698e2b0d3 *./tests/data/lavf-fate/lavf.mp3 +96376 ./tests/data/lavf-fate/lavf.mp3 ./tests/data/lavf-fate/lavf.mp3 CRC=0x6c9850fe diff --git a/ffmpeg/tests/ref/lavf-fate/ogg_vp3 b/ffmpeg/tests/ref/lavf-fate/ogg_vp3 index b77476d..9e9cc7e 100644 --- a/ffmpeg/tests/ref/lavf-fate/ogg_vp3 +++ b/ffmpeg/tests/ref/lavf-fate/ogg_vp3 @@ -1,3 +1,3 @@ -adbe6c30bdfe934dc5ae397f4db2960d *./tests/data/lavf-fate/lavf.ogg -417644 ./tests/data/lavf-fate/lavf.ogg +4bd51dac3194fa88ae33767c25b4b1e6 *./tests/data/lavf-fate/lavf.ogg +417621 ./tests/data/lavf-fate/lavf.ogg ./tests/data/lavf-fate/lavf.ogg CRC=0x037e3e79 diff --git a/ffmpeg/tests/ref/lavf/aiff b/ffmpeg/tests/ref/lavf/aiff index 2a5cd81..c504c18 100644 --- a/ffmpeg/tests/ref/lavf/aiff +++ b/ffmpeg/tests/ref/lavf/aiff @@ -1,3 +1,3 @@ -b0d42747a6fc99a5cd1ab0e861671f3a *./tests/data/lavf/lavf.aif -90182 ./tests/data/lavf/lavf.aif -./tests/data/lavf/lavf.aif CRC=0xf1ae5536 +2c129d88acef834e32869145fe792b9c *./tests/data/lavf/lavf.aif +88270 ./tests/data/lavf/lavf.aif +./tests/data/lavf/lavf.aif CRC=0x3a1da17e diff --git a/ffmpeg/tests/ref/lavf/alaw b/ffmpeg/tests/ref/lavf/alaw index 65bcf99..d93d6fc 100644 --- a/ffmpeg/tests/ref/lavf/alaw +++ b/ffmpeg/tests/ref/lavf/alaw @@ -1,3 +1,3 @@ -8bce9c3758b0d38da2e0718b6ab57fb4 *./tests/data/lavf/lavf.al -45056 ./tests/data/lavf/lavf.al -./tests/data/lavf/lavf.al CRC=0x5e6d372b +652d96e474869ddb01403743deb35117 *./tests/data/lavf/lavf.al +44100 ./tests/data/lavf/lavf.al +./tests/data/lavf/lavf.al CRC=0xf9643112 diff --git a/ffmpeg/tests/ref/lavf/asf b/ffmpeg/tests/ref/lavf/asf index cfa53dc..a90e547 100644 --- a/ffmpeg/tests/ref/lavf/asf +++ b/ffmpeg/tests/ref/lavf/asf @@ -1,3 +1,3 @@ -3937dfece4b48c0cdd8f44bcab3cdd2d *./tests/data/lavf/lavf.asf +6bc7dc5698c3607fad8937d14560e50c *./tests/data/lavf/lavf.asf 333581 ./tests/data/lavf/lavf.asf -./tests/data/lavf/lavf.asf CRC=0x51485213 +./tests/data/lavf/lavf.asf CRC=0xf6340a10 diff --git a/ffmpeg/tests/ref/lavf/ast b/ffmpeg/tests/ref/lavf/ast index 72a9824..513c612 100644 --- a/ffmpeg/tests/ref/lavf/ast +++ b/ffmpeg/tests/ref/lavf/ast @@ -1,3 +1,3 @@ -7fa8cd2dd7453428e71930a7c65f7b62 *./tests/data/lavf/lavf.ast -181696 ./tests/data/lavf/lavf.ast -./tests/data/lavf/lavf.ast CRC=0x7bd585ff +07f5d23aa8bade984034f7005bd72947 *./tests/data/lavf/lavf.ast +177872 ./tests/data/lavf/lavf.ast +./tests/data/lavf/lavf.ast CRC=0xe61e3bd0 diff --git a/ffmpeg/tests/ref/lavf/au b/ffmpeg/tests/ref/lavf/au index b9b70a1..ede4926 100644 --- a/ffmpeg/tests/ref/lavf/au +++ b/ffmpeg/tests/ref/lavf/au @@ -1,3 +1,3 @@ -dc54f834a23ddc0c086a86f0cef898d7 *./tests/data/lavf/lavf.au -90144 ./tests/data/lavf/lavf.au -./tests/data/lavf/lavf.au CRC=0xf1ae5536 +aa5ec1f82ac07c653ffc527b0f0dc10d *./tests/data/lavf/lavf.au +88232 ./tests/data/lavf/lavf.au +./tests/data/lavf/lavf.au CRC=0x3a1da17e diff --git a/ffmpeg/tests/ref/lavf/avi b/ffmpeg/tests/ref/lavf/avi index 056d0c7..3cbb44f 100644 --- a/ffmpeg/tests/ref/lavf/avi +++ b/ffmpeg/tests/ref/lavf/avi @@ -1,3 +1,3 @@ -feb26a85f820ede7e521a55be565f3b1 *./tests/data/lavf/lavf.avi +8d3a3554cbe21bc232603ca26b0c4d3e *./tests/data/lavf/lavf.avi 330806 ./tests/data/lavf/lavf.avi -./tests/data/lavf/lavf.avi CRC=0x4780846b +./tests/data/lavf/lavf.avi CRC=0xec6c3c68 diff --git a/ffmpeg/tests/ref/lavf/caf b/ffmpeg/tests/ref/lavf/caf index f2ae9c3..7b2a67d 100644 --- a/ffmpeg/tests/ref/lavf/caf +++ b/ffmpeg/tests/ref/lavf/caf @@ -1,3 +1,3 @@ -6c97bfc8e455d5fb8b3b45806857a953 *./tests/data/lavf/lavf.caf -90235 ./tests/data/lavf/lavf.caf -./tests/data/lavf/lavf.caf CRC=0xf1ae5536 +c3c38cba600722c87c0e75bd0688b7fc *./tests/data/lavf/lavf.caf +88323 ./tests/data/lavf/lavf.caf +./tests/data/lavf/lavf.caf CRC=0x3a1da17e diff --git a/ffmpeg/tests/ref/lavf/dpx b/ffmpeg/tests/ref/lavf/dpx index 0206bd7..591ef1b 100644 --- a/ffmpeg/tests/ref/lavf/dpx +++ b/ffmpeg/tests/ref/lavf/dpx @@ -1,9 +1,18 @@ -d2f0b4e854fda2d3b3bee84cef80593c *./tests/data/images/dpx/02.dpx +4c8880d5835ffb5fe37c1ed8c8d404de *./tests/data/images/dpx/02.dpx ./tests/data/images/dpx/%02d.dpx CRC=0x6da01946 305792 ./tests/data/images/dpx/02.dpx +16d65ceaa127806dc7ede9391fe80872 *./tests/data/images/dpx/02.dpx +./tests/data/images/dpx/%02d.dpx CRC=0x22dcc7a8 +407168 ./tests/data/images/dpx/02.dpx +02b4fd859d944075905e84e9f389bf23 *./tests/data/images/dpx/02.dpx +./tests/data/images/dpx/%02d.dpx CRC=0x964b87ba +609920 ./tests/data/images/dpx/02.dpx 075963c3c08978b6a20555ba09161434 *./tests/data/images/dpx/02.dpx ./tests/data/images/dpx/%02d.dpx CRC=0xe5b9c023 609920 ./tests/data/images/dpx/02.dpx b9f22728f8ff393bf30cf6cbd624fa95 *./tests/data/images/dpx/02.dpx -./tests/data/images/dpx/%02d.dpx CRC=0xb6310a70 +./tests/data/images/dpx/%02d.dpx CRC=0xf38d5830 407168 ./tests/data/images/dpx/02.dpx +545603630f30dec2768c8ae8d12eb8ea *./tests/data/images/dpx/02.dpx +./tests/data/images/dpx/%02d.dpx CRC=0xe72ce131 +812672 ./tests/data/images/dpx/02.dpx diff --git a/ffmpeg/tests/ref/lavf/dv_fmt b/ffmpeg/tests/ref/lavf/dv_fmt index ed8c5cc..3c8e5b1 100644 --- a/ffmpeg/tests/ref/lavf/dv_fmt +++ b/ffmpeg/tests/ref/lavf/dv_fmt @@ -1,9 +1,9 @@ 11be3e5caa2892236b3475c3f7807b76 *./tests/data/lavf/lavf.dv 3600000 ./tests/data/lavf/lavf.dv ./tests/data/lavf/lavf.dv CRC=0x25bdd732 -78db8504eefb660ed205b417157d4f44 *./tests/data/lavf/lavf.dv -3600000 ./tests/data/lavf/lavf.dv -./tests/data/lavf/lavf.dv CRC=0x1cec8738 +e9949bc767924e1e7d28856029fee024 *./tests/data/lavf/lavf.dv +3480000 ./tests/data/lavf/lavf.dv +./tests/data/lavf/lavf.dv CRC=0xc4f27ca7 87d3b20f656235671383a7eaa2f66330 *./tests/data/lavf/lavf.dv 3600000 ./tests/data/lavf/lavf.dv ./tests/data/lavf/lavf.dv CRC=0x0e868a82 diff --git a/ffmpeg/tests/ref/lavf/ffm b/ffmpeg/tests/ref/lavf/ffm index 6f67365..7071866 100644 --- a/ffmpeg/tests/ref/lavf/ffm +++ b/ffmpeg/tests/ref/lavf/ffm @@ -1,3 +1,3 @@ -d33fae310a7f6db1dc7fb74d1a9e0e6a *./tests/data/lavf/lavf.ffm +6f1443b952819cff1dae875529675e88 *./tests/data/lavf/lavf.ffm 376832 ./tests/data/lavf/lavf.ffm -./tests/data/lavf/lavf.ffm CRC=0x5b136bb1 +./tests/data/lavf/lavf.ffm CRC=0x000e23ae diff --git a/ffmpeg/tests/ref/lavf/gif b/ffmpeg/tests/ref/lavf/gif index 509ea24..4d90abe 100644 --- a/ffmpeg/tests/ref/lavf/gif +++ b/ffmpeg/tests/ref/lavf/gif @@ -1,24 +1,3 @@ -e6089fd4ef3b9df44090ab3650bdd810 *./tests/data/lavf/lavf.gif -2906401 ./tests/data/lavf/lavf.gif -./tests/data/lavf/lavf.gif CRC=0x9825d7c0 -022dc66b5068404e88c618ce79d9eb5f *./tests/data/images/gif/02.gif -./tests/data/images/gif/%02d.gif CRC=0x032e0034 -81538 ./tests/data/images/gif/02.gif -759522b3025fcf8ed6aae582a18c5a14 *./tests/data/images/gif/02.gif -./tests/data/images/gif/%02d.gif CRC=0x4c8f8a89 -38715 ./tests/data/images/gif/02.gif -21e802ae7a2239bdbea6f915da1134b9 *./tests/data/images/gif/02.gif -./tests/data/images/gif/%02d.gif CRC=0x4c8f8a89 -38715 ./tests/data/images/gif/02.gif -fc4792ac40319344dc7027668a403fc3 *./tests/data/images/gif/02.gif -./tests/data/images/gif/%02d.gif CRC=0x032e0034 -81538 ./tests/data/images/gif/02.gif -022dc66b5068404e88c618ce79d9eb5f *./tests/data/images/gif/02.gif -./tests/data/images/gif/%02d.gif CRC=0x032e0034 -81538 ./tests/data/images/gif/02.gif -e3392f49c55aa794d3dc49189f52f257 *./tests/data/images/gif/02.gif -./tests/data/images/gif/%02d.gif CRC=0x22d67c27 -63144 ./tests/data/images/gif/02.gif -022dc66b5068404e88c618ce79d9eb5f *./tests/data/images/gif/02.gif -./tests/data/images/gif/%02d.gif CRC=0x032e0034 -81538 ./tests/data/images/gif/02.gif +8aef8081e8afa445f63f320f4a1c5edb *./tests/data/lavf/lavf.gif +2030198 ./tests/data/lavf/lavf.gif +./tests/data/lavf/lavf.gif CRC=0x0dc5477c diff --git a/ffmpeg/tests/ref/lavf/gxf b/ffmpeg/tests/ref/lavf/gxf index 9e7871d..14a2c87 100644 --- a/ffmpeg/tests/ref/lavf/gxf +++ b/ffmpeg/tests/ref/lavf/gxf @@ -1,9 +1,9 @@ -c8b3a8e3ba0185ce39122ac150c12bc3 *./tests/data/lavf/lavf.gxf +9c96119322262ed2c43b34fd415233cc *./tests/data/lavf/lavf.gxf 795876 ./tests/data/lavf/lavf.gxf -./tests/data/lavf/lavf.gxf CRC=0x147ff044 -b26bd3cb439dff8b33cd74a27a3fc2d6 *./tests/data/lavf/lavf.gxf +./tests/data/lavf/lavf.gxf CRC=0xda7cebbc +260acc1c88a1706e5aaa74eff99ac389 *./tests/data/lavf/lavf.gxf 794656 ./tests/data/lavf/lavf.gxf -./tests/data/lavf/lavf.gxf CRC=0xe0199511 -e4721383461d7a9feae41435567c9257 *./tests/data/lavf/lavf.gxf +./tests/data/lavf/lavf.gxf CRC=0x7f0c9089 +3cb8bab80b73a95f51e50989ccf06817 *./tests/data/lavf/lavf.gxf 795876 ./tests/data/lavf/lavf.gxf -./tests/data/lavf/lavf.gxf CRC=0xd9d58865 +./tests/data/lavf/lavf.gxf CRC=0x5ade0285 diff --git a/ffmpeg/tests/ref/lavf/ircam b/ffmpeg/tests/ref/lavf/ircam index e29a7ad..47e0709 100644 --- a/ffmpeg/tests/ref/lavf/ircam +++ b/ffmpeg/tests/ref/lavf/ircam @@ -1,3 +1,3 @@ -2cfae025de1b13098ef84a5e7f9947aa *./tests/data/lavf/lavf.ircam -91136 ./tests/data/lavf/lavf.ircam -./tests/data/lavf/lavf.ircam CRC=0xf1ae5536 +45d9a4667030e95d1d8fb6ab012f1aa0 *./tests/data/lavf/lavf.ircam +89224 ./tests/data/lavf/lavf.ircam +./tests/data/lavf/lavf.ircam CRC=0x3a1da17e diff --git a/ffmpeg/tests/ref/lavf/ismv b/ffmpeg/tests/ref/lavf/ismv index 6f9f57b..dd4b162 100644 --- a/ffmpeg/tests/ref/lavf/ismv +++ b/ffmpeg/tests/ref/lavf/ismv @@ -1,9 +1,9 @@ -a24a0426b5f8dc896daaf18502e38790 *./tests/data/lavf/lavf.ismv -312263 ./tests/data/lavf/lavf.ismv +ec3e7d37755378cbe9907175768afbac *./tests/data/lavf/lavf.ismv +312453 ./tests/data/lavf/lavf.ismv ./tests/data/lavf/lavf.ismv CRC=0x9d9a638a -1b98502911dd19a9792777de67922db2 *./tests/data/lavf/lavf.ismv -321189 ./tests/data/lavf/lavf.ismv +a4b6fb1f46848622477230f69040942c *./tests/data/lavf/lavf.ismv +321359 ./tests/data/lavf/lavf.ismv ./tests/data/lavf/lavf.ismv CRC=0xe8130120 -a24a0426b5f8dc896daaf18502e38790 *./tests/data/lavf/lavf.ismv -312263 ./tests/data/lavf/lavf.ismv +ec3e7d37755378cbe9907175768afbac *./tests/data/lavf/lavf.ismv +312453 ./tests/data/lavf/lavf.ismv ./tests/data/lavf/lavf.ismv CRC=0x9d9a638a diff --git a/ffmpeg/tests/ref/lavf/mkv b/ffmpeg/tests/ref/lavf/mkv index 64979b2..51fd2e7 100644 --- a/ffmpeg/tests/ref/lavf/mkv +++ b/ffmpeg/tests/ref/lavf/mkv @@ -1,6 +1,6 @@ -b53f31e572394f225aff0bc82b5d1cc9 *./tests/data/lavf/lavf.mkv -472553 ./tests/data/lavf/lavf.mkv -./tests/data/lavf/lavf.mkv CRC=0x4780846b -84dcb326fe85aeeb5768beb44372f248 *./tests/data/lavf/lavf.mkv -320297 ./tests/data/lavf/lavf.mkv -./tests/data/lavf/lavf.mkv CRC=0x4780846b +5e3e58192b11644477474a25bef2e022 *./tests/data/lavf/lavf.mkv +472559 ./tests/data/lavf/lavf.mkv +./tests/data/lavf/lavf.mkv CRC=0xec6c3c68 +6aac0de39634046f23a3447b08380efe *./tests/data/lavf/lavf.mkv +320288 ./tests/data/lavf/lavf.mkv +./tests/data/lavf/lavf.mkv CRC=0xec6c3c68 diff --git a/ffmpeg/tests/ref/lavf/mmf b/ffmpeg/tests/ref/lavf/mmf index fea8015..fae95ca 100644 --- a/ffmpeg/tests/ref/lavf/mmf +++ b/ffmpeg/tests/ref/lavf/mmf @@ -1,3 +1,3 @@ -b165af6f2e5c6c1de733e9d3848bcebb *./tests/data/lavf/lavf.mmf +643fadf7482f6d937ed75ec4f508e4f1 *./tests/data/lavf/lavf.mmf 22611 ./tests/data/lavf/lavf.mmf -./tests/data/lavf/lavf.mmf CRC=0x03633476 +./tests/data/lavf/lavf.mmf CRC=0x8dea1388 diff --git a/ffmpeg/tests/ref/lavf/mov b/ffmpeg/tests/ref/lavf/mov index 2ed8ad0..6c73753 100644 --- a/ffmpeg/tests/ref/lavf/mov +++ b/ffmpeg/tests/ref/lavf/mov @@ -1,12 +1,12 @@ -fcbe7806047914d9751fd9053009df69 *./tests/data/lavf/lavf.mov -367365 ./tests/data/lavf/lavf.mov -./tests/data/lavf/lavf.mov CRC=0xb2f59ab4 -72eac0051107a16e41d5263dab640f26 *./tests/data/lavf/lavf.mov -358455 ./tests/data/lavf/lavf.mov -./tests/data/lavf/lavf.mov CRC=0xb2f59ab4 -cf6ea2e8d4d16626d9dbd9e3fb802ce6 *./tests/data/lavf/lavf.mov -367549 ./tests/data/lavf/lavf.mov -./tests/data/lavf/lavf.mov CRC=0x6e82384a -7c932d24837f46ef57d3e40a61331565 *./tests/data/lavf/lavf.mov -357837 ./tests/data/lavf/lavf.mov -./tests/data/lavf/lavf.mov CRC=0xb2f59ab4 +65ba2cff95100a4914b2ff507eb42818 *./tests/data/lavf/lavf.mov +366421 ./tests/data/lavf/lavf.mov +./tests/data/lavf/lavf.mov CRC=0xbb2b949b +b9b988b23b5e5aff8760d0475908f837 *./tests/data/lavf/lavf.mov +357511 ./tests/data/lavf/lavf.mov +./tests/data/lavf/lavf.mov CRC=0xbb2b949b +5c5c79e09490763a2692c91c5985b7ea *./tests/data/lavf/lavf.mov +366593 ./tests/data/lavf/lavf.mov +./tests/data/lavf/lavf.mov CRC=0xa9793231 +c1d4ff07ccad169cb6fca003661f0c12 *./tests/data/lavf/lavf.mov +356893 ./tests/data/lavf/lavf.mov +./tests/data/lavf/lavf.mov CRC=0xbb2b949b diff --git a/ffmpeg/tests/ref/lavf/mpg b/ffmpeg/tests/ref/lavf/mpg index 798ee03..9feff66 100644 --- a/ffmpeg/tests/ref/lavf/mpg +++ b/ffmpeg/tests/ref/lavf/mpg @@ -1,9 +1,9 @@ -ddc5cd5469eb8a0500f8a725baead5e5 *./tests/data/lavf/lavf.mpg +0a8c879bf813b6b758806088f29842dc *./tests/data/lavf/lavf.mpg 372736 ./tests/data/lavf/lavf.mpg -./tests/data/lavf/lavf.mpg CRC=0x5b136bb1 -7962eab004026dd7a8c0417470cdf574 *./tests/data/lavf/lavf.mpg +./tests/data/lavf/lavf.mpg CRC=0x000e23ae +d9446ae7b49de006a5a0f052ea9333ca *./tests/data/lavf/lavf.mpg 389120 ./tests/data/lavf/lavf.mpg -./tests/data/lavf/lavf.mpg CRC=0xbbbf92bc -bb22933de60193bce9032f67ce6fcc23 *./tests/data/lavf/lavf.mpg +./tests/data/lavf/lavf.mpg CRC=0x60ba4ab9 +edfef790122870cf4652e8a92ca558a0 *./tests/data/lavf/lavf.mpg 372736 ./tests/data/lavf/lavf.mpg -./tests/data/lavf/lavf.mpg CRC=0x5b136bb1 +./tests/data/lavf/lavf.mpg CRC=0x000e23ae diff --git a/ffmpeg/tests/ref/lavf/mulaw b/ffmpeg/tests/ref/lavf/mulaw index c6fa058..bd54084 100644 --- a/ffmpeg/tests/ref/lavf/mulaw +++ b/ffmpeg/tests/ref/lavf/mulaw @@ -1,3 +1,3 @@ -e64027a96ad5907ee281deff3286da0a *./tests/data/lavf/lavf.ul -45056 ./tests/data/lavf/lavf.ul -./tests/data/lavf/lavf.ul CRC=0xe028b50a +ad492935e361f830f2f8302aa102701d *./tests/data/lavf/lavf.ul +44100 ./tests/data/lavf/lavf.ul +./tests/data/lavf/lavf.ul CRC=0x4515fa26 diff --git a/ffmpeg/tests/ref/lavf/mxf b/ffmpeg/tests/ref/lavf/mxf index b1e46e9..b1918f5 100644 --- a/ffmpeg/tests/ref/lavf/mxf +++ b/ffmpeg/tests/ref/lavf/mxf @@ -1,9 +1,9 @@ 967f6ee9223c865328f4891465191108 *./tests/data/lavf/lavf.mxf 525369 ./tests/data/lavf/lavf.mxf ./tests/data/lavf/lavf.mxf CRC=0xdbfff6f1 -7788939d349d09a7f9b546e59376a496 *./tests/data/lavf/lavf.mxf +a085845074129d732fc6adb5601e3b5e *./tests/data/lavf/lavf.mxf 560697 ./tests/data/lavf/lavf.mxf -./tests/data/lavf/lavf.mxf CRC=0xb69f428b +./tests/data/lavf/lavf.mxf CRC=0x3ff4178e ce535b606423d117675213b16275206a *./tests/data/lavf/lavf.mxf 525369 ./tests/data/lavf/lavf.mxf ./tests/data/lavf/lavf.mxf CRC=0xdbfff6f1 diff --git a/ffmpeg/tests/ref/lavf/nut b/ffmpeg/tests/ref/lavf/nut index 72e59e8..6c42a40 100644 --- a/ffmpeg/tests/ref/lavf/nut +++ b/ffmpeg/tests/ref/lavf/nut @@ -1,3 +1,3 @@ -56c403dd91ae1dd4569348381b2b43a4 *./tests/data/lavf/lavf.nut +66386a488ee35e4592b605f63ef90a73 *./tests/data/lavf/lavf.nut 319902 ./tests/data/lavf/lavf.nut -./tests/data/lavf/lavf.nut CRC=0x4780846b +./tests/data/lavf/lavf.nut CRC=0xec6c3c68 diff --git a/ffmpeg/tests/ref/lavf/ogg b/ffmpeg/tests/ref/lavf/ogg index 584e09b..f8b58c4 100644 --- a/ffmpeg/tests/ref/lavf/ogg +++ b/ffmpeg/tests/ref/lavf/ogg @@ -1,3 +1,3 @@ -ce1734741fa50c6c85f9cc8f410a720c *./tests/data/lavf/lavf.ogg -13985 ./tests/data/lavf/lavf.ogg -./tests/data/lavf/lavf.ogg CRC=0x37a143ea +304a201b4afa3583b206bdeef177ce6b *./tests/data/lavf/lavf.ogg +13495 ./tests/data/lavf/lavf.ogg +./tests/data/lavf/lavf.ogg CRC=0x3a1da17e diff --git a/ffmpeg/tests/ref/lavf/pam b/ffmpeg/tests/ref/lavf/pam index d21ccd7..50048ed 100644 --- a/ffmpeg/tests/ref/lavf/pam +++ b/ffmpeg/tests/ref/lavf/pam @@ -4,8 +4,8 @@ 2ed31ca8d8de560afb3e0fd7a873cde5 *./tests/data/images/pam/02.pam ./tests/data/images/pam/%02d.pam CRC=0xf07d29cd 405573 ./tests/data/images/pam/02.pam -587284e40b78accd54fa92fdb7ca29f4 *./tests/data/images/pam/02.pam -./tests/data/images/pam/%02d.pam CRC=0x418d2963 +35cb9e42b2d3181be494f8693af1ddea *./tests/data/images/pam/02.pam +./tests/data/images/pam/%02d.pam CRC=0x0ff205be 101445 ./tests/data/images/pam/02.pam ebd43e97839b2538a79f35757e84ffb0 *./tests/data/images/pam/02.pam ./tests/data/images/pam/%02d.pam CRC=0x831a2963 diff --git a/ffmpeg/tests/ref/lavf/pgm b/ffmpeg/tests/ref/lavf/pgm index 4043f7a..816579f 100644 --- a/ffmpeg/tests/ref/lavf/pgm +++ b/ffmpeg/tests/ref/lavf/pgm @@ -1,3 +1,3 @@ -388f5c51a678ca6a52cc006095c12f08 *./tests/data/images/pgm/02.pgm -./tests/data/images/pgm/%02d.pgm CRC=0x418d2963 +cc777c5fc4d116d4c5a996eac8d3133e *./tests/data/images/pgm/02.pgm +./tests/data/images/pgm/%02d.pgm CRC=0x0ff205be 101391 ./tests/data/images/pgm/02.pgm diff --git a/ffmpeg/tests/ref/lavf/pgmpipe b/ffmpeg/tests/ref/lavf/pgmpipe index 28ad60e..da6f9a6 100644 --- a/ffmpeg/tests/ref/lavf/pgmpipe +++ b/ffmpeg/tests/ref/lavf/pgmpipe @@ -1,3 +1,3 @@ -04e66c8e9e064c8310bd657ee559bd70 *./tests/data/lavf/pgmpipe.pgm +c34e37ea49237c2d1ea81a5944328e59 *./tests/data/lavf/pgmpipe.pgm 2534775 ./tests/data/lavf/pgmpipe.pgm -./tests/data/lavf/pgmpipe.pgm CRC=0xadf48ba9 +./tests/data/lavf/pgmpipe.pgm CRC=0x7aa0122f diff --git a/ffmpeg/tests/ref/lavf/pixfmt b/ffmpeg/tests/ref/lavf/pixfmt index bf62d90..8803087 100644 --- a/ffmpeg/tests/ref/lavf/pixfmt +++ b/ffmpeg/tests/ref/lavf/pixfmt @@ -26,7 +26,7 @@ efa7c0337cc00c796c6df615223716f1 *./tests/data/pixfmt/rgb565.yuv 304128 ./tests/data/pixfmt/rgb565.yuv 0df2a477af1415a1b8fbf2a3e552bc39 *./tests/data/pixfmt/rgb555.yuv 304128 ./tests/data/pixfmt/rgb555.yuv -6be306b0cce5f8e6c271ea17fef9745b *./tests/data/pixfmt/gray.yuv +1e080c12bd9755c41ecb8e19b756f406 *./tests/data/pixfmt/gray.yuv 304128 ./tests/data/pixfmt/gray.yuv 6c719671e39f1bcf67b47eab98fa529b *./tests/data/pixfmt/monow.yuv 304128 ./tests/data/pixfmt/monow.yuv diff --git a/ffmpeg/tests/ref/lavf/rm b/ffmpeg/tests/ref/lavf/rm index d396e00..62e0a31 100644 --- a/ffmpeg/tests/ref/lavf/rm +++ b/ffmpeg/tests/ref/lavf/rm @@ -1,2 +1,2 @@ -a3a875be9c528a2a4534a5a31230fdae *./tests/data/lavf/lavf.rm +e30681d05d6f3d24108d3614600bf116 *./tests/data/lavf/lavf.rm 346424 ./tests/data/lavf/lavf.rm diff --git a/ffmpeg/tests/ref/lavf/rso b/ffmpeg/tests/ref/lavf/rso index 648c248..5878f43 100644 --- a/ffmpeg/tests/ref/lavf/rso +++ b/ffmpeg/tests/ref/lavf/rso @@ -1,3 +1,3 @@ -f41fd78f7df981802e7caeb23648b8c0 *./tests/data/lavf/lavf.rso -45064 ./tests/data/lavf/lavf.rso -./tests/data/lavf/lavf.rso CRC=0x74b2b546 +443b72346065d6318ca18c8395aa1d87 *./tests/data/lavf/lavf.rso +44108 ./tests/data/lavf/lavf.rso +./tests/data/lavf/lavf.rso CRC=0x298fd284 diff --git a/ffmpeg/tests/ref/lavf/smjpeg b/ffmpeg/tests/ref/lavf/smjpeg index 3e7e8ed..a2eeb97 100644 --- a/ffmpeg/tests/ref/lavf/smjpeg +++ b/ffmpeg/tests/ref/lavf/smjpeg @@ -1,3 +1,3 @@ -2f6e613e9e257545e1048d57de92ba92 *./tests/data/lavf/lavf.smjpeg -791463 ./tests/data/lavf/lavf.smjpeg -./tests/data/lavf/lavf.smjpeg CRC=0x557714ff +a95982a2d390f4dcdc72a41d8920abb9 *./tests/data/lavf/lavf.smjpeg +789551 ./tests/data/lavf/lavf.smjpeg +./tests/data/lavf/lavf.smjpeg CRC=0x54bf6147 diff --git a/ffmpeg/tests/ref/lavf/sox b/ffmpeg/tests/ref/lavf/sox index 0026480..fc368b1 100644 --- a/ffmpeg/tests/ref/lavf/sox +++ b/ffmpeg/tests/ref/lavf/sox @@ -1,3 +1,3 @@ -e6f278256f145b69ed06f35b8d3585c1 *./tests/data/lavf/lavf.sox -180256 ./tests/data/lavf/lavf.sox -./tests/data/lavf/lavf.sox CRC=0xf1ae5536 +683635d5cb1344e44fa96df90c3a993c *./tests/data/lavf/lavf.sox +176432 ./tests/data/lavf/lavf.sox +./tests/data/lavf/lavf.sox CRC=0x3a1da17e diff --git a/ffmpeg/tests/ref/lavf/ts b/ffmpeg/tests/ref/lavf/ts index 0cab3dd..02921ed 100644 --- a/ffmpeg/tests/ref/lavf/ts +++ b/ffmpeg/tests/ref/lavf/ts @@ -1,3 +1,3 @@ -4531d0f4a80d5a2ee2b08a8d4ba3b442 *./tests/data/lavf/lavf.ts +a876e6bde8a2e8c7eca878869433ad3b *./tests/data/lavf/lavf.ts 407020 ./tests/data/lavf/lavf.ts -./tests/data/lavf/lavf.ts CRC=0xcc2dc628 +./tests/data/lavf/lavf.ts CRC=0x71287e25 diff --git a/ffmpeg/tests/ref/lavf/voc b/ffmpeg/tests/ref/lavf/voc index 062da63..ded8af7 100644 --- a/ffmpeg/tests/ref/lavf/voc +++ b/ffmpeg/tests/ref/lavf/voc @@ -1,3 +1,3 @@ -e4cefbeb4c20f5735de1877fbcfd8d1d *./tests/data/lavf/lavf.voc -45261 ./tests/data/lavf/lavf.voc -./tests/data/lavf/lavf.voc CRC=0x74b2b546 +bb5ad96a5e1b35683d50bf18115db821 *./tests/data/lavf/lavf.voc +44305 ./tests/data/lavf/lavf.voc +./tests/data/lavf/lavf.voc CRC=0x298fd284 diff --git a/ffmpeg/tests/ref/lavf/voc_s16 b/ffmpeg/tests/ref/lavf/voc_s16 index 23e5aab..d026090 100644 --- a/ffmpeg/tests/ref/lavf/voc_s16 +++ b/ffmpeg/tests/ref/lavf/voc_s16 @@ -1,3 +1,3 @@ -a8225786fdbf5a2a19d1eeaf15f28632 *./tests/data/lavf/lavf.s16.voc -180439 ./tests/data/lavf/lavf.s16.voc -./tests/data/lavf/lavf.s16.voc CRC=0x7bd585ff +db9fa22ff71992bd8b6cc80047223c92 *./tests/data/lavf/lavf.s16.voc +176615 ./tests/data/lavf/lavf.s16.voc +./tests/data/lavf/lavf.s16.voc CRC=0xe61e3bd0 diff --git a/ffmpeg/tests/ref/lavf/w64 b/ffmpeg/tests/ref/lavf/w64 index 9acda83..7da4f09 100644 --- a/ffmpeg/tests/ref/lavf/w64 +++ b/ffmpeg/tests/ref/lavf/w64 @@ -1,3 +1,3 @@ -420bf38762386ae2ba8bf2e85b6cc7f2 *./tests/data/lavf/lavf.w64 -90224 ./tests/data/lavf/lavf.w64 -./tests/data/lavf/lavf.w64 CRC=0xf1ae5536 +062b91c34d570a90af8d55427804878e *./tests/data/lavf/lavf.w64 +88312 ./tests/data/lavf/lavf.w64 +./tests/data/lavf/lavf.w64 CRC=0x3a1da17e diff --git a/ffmpeg/tests/ref/lavf/wav b/ffmpeg/tests/ref/lavf/wav index cc8ec1d..600c26a 100644 --- a/ffmpeg/tests/ref/lavf/wav +++ b/ffmpeg/tests/ref/lavf/wav @@ -1,3 +1,3 @@ -c4afa6eafac5243aa1c202397789ccb8 *./tests/data/lavf/lavf.wav -90188 ./tests/data/lavf/lavf.wav -./tests/data/lavf/lavf.wav CRC=0xf1ae5536 +eb5a869456d2e9107bb195c8c99be1a1 *./tests/data/lavf/lavf.wav +88276 ./tests/data/lavf/lavf.wav +./tests/data/lavf/lavf.wav CRC=0x3a1da17e diff --git a/ffmpeg/tests/ref/lavf/wtv b/ffmpeg/tests/ref/lavf/wtv index 8f2c2ac..8d69f79 100644 --- a/ffmpeg/tests/ref/lavf/wtv +++ b/ffmpeg/tests/ref/lavf/wtv @@ -1,3 +1,3 @@ -345516d3a03fd239c62e5e7257c9f4a2 *./tests/data/lavf/lavf.wtv +13cbdaf2c5e7c97991781cc48d9a958f *./tests/data/lavf/lavf.wtv 413696 ./tests/data/lavf/lavf.wtv -./tests/data/lavf/lavf.wtv CRC=0xcc2dc628 +./tests/data/lavf/lavf.wtv CRC=0x71287e25 diff --git a/ffmpeg/tests/ref/lavf/xwd b/ffmpeg/tests/ref/lavf/xwd index 73f859d..5e593b5 100644 --- a/ffmpeg/tests/ref/lavf/xwd +++ b/ffmpeg/tests/ref/lavf/xwd @@ -16,8 +16,8 @@ c6f3cb7c45f7238474a89d2ad61a1caf *./tests/data/images/xwd/02.xwd fe1af954966a40c2cd35fc27094ff823 *./tests/data/images/xwd/02.xwd ./tests/data/images/xwd/%02d.xwd CRC=0xd69c3a09 104559 ./tests/data/images/xwd/02.xwd -9e2f3d455566897692cdfda88ff10112 *./tests/data/images/xwd/02.xwd -./tests/data/images/xwd/%02d.xwd CRC=0x418d2963 +85e9b8b814a1dea71d143aac2e487037 *./tests/data/images/xwd/02.xwd +./tests/data/images/xwd/%02d.xwd CRC=0x0ff205be 101487 ./tests/data/images/xwd/02.xwd 2131b4c41fe35178b0c7d121223af549 *./tests/data/images/xwd/02.xwd ./tests/data/images/xwd/%02d.xwd CRC=0x0f5aa5cb diff --git a/ffmpeg/tests/ref/lavfi/alphaextract_rgb b/ffmpeg/tests/ref/lavfi/alphaextract_rgb deleted file mode 100644 index d46b563..0000000 --- a/ffmpeg/tests/ref/lavfi/alphaextract_rgb +++ /dev/null @@ -1 +0,0 @@ -alphaextract_rgb 4a46df014912056534fcab2f45a02279 diff --git a/ffmpeg/tests/ref/lavfi/alphaextract_yuv b/ffmpeg/tests/ref/lavfi/alphaextract_yuv deleted file mode 100644 index 32b9ab9..0000000 --- a/ffmpeg/tests/ref/lavfi/alphaextract_yuv +++ /dev/null @@ -1 +0,0 @@ -alphaextract_yuv 591e2d45f96ecfa8cc326eb741456a79 diff --git a/ffmpeg/tests/ref/lavfi/alphamerge_rgb b/ffmpeg/tests/ref/lavfi/alphamerge_rgb deleted file mode 100644 index d890fae..0000000 --- a/ffmpeg/tests/ref/lavfi/alphamerge_rgb +++ /dev/null @@ -1 +0,0 @@ -alphamerge_rgb 4a46df014912056534fcab2f45a02279 diff --git a/ffmpeg/tests/ref/lavfi/alphamerge_yuv b/ffmpeg/tests/ref/lavfi/alphamerge_yuv deleted file mode 100644 index 2e58301..0000000 --- a/ffmpeg/tests/ref/lavfi/alphamerge_yuv +++ /dev/null @@ -1 +0,0 @@ -alphamerge_yuv 591e2d45f96ecfa8cc326eb741456a79 diff --git a/ffmpeg/tests/ref/lavfi/colormatrix1 b/ffmpeg/tests/ref/lavfi/colormatrix1 deleted file mode 100644 index 9ec093d..0000000 --- a/ffmpeg/tests/ref/lavfi/colormatrix1 +++ /dev/null @@ -1 +0,0 @@ -colormatrix1 600fef16b66cff4ee76540ff2a8f4480 diff --git a/ffmpeg/tests/ref/lavfi/colormatrix2 b/ffmpeg/tests/ref/lavfi/colormatrix2 deleted file mode 100644 index 9961bae..0000000 --- a/ffmpeg/tests/ref/lavfi/colormatrix2 +++ /dev/null @@ -1 +0,0 @@ -colormatrix2 e4ba95b7dd5e0862aa5f5e3ddc54bda4 diff --git a/ffmpeg/tests/ref/lavfi/crop b/ffmpeg/tests/ref/lavfi/crop deleted file mode 100644 index dec7f29..0000000 --- a/ffmpeg/tests/ref/lavfi/crop +++ /dev/null @@ -1 +0,0 @@ -crop f7b5236ddf88224188051c7c43503a14 diff --git a/ffmpeg/tests/ref/lavfi/crop_scale b/ffmpeg/tests/ref/lavfi/crop_scale deleted file mode 100644 index e692a8a..0000000 --- a/ffmpeg/tests/ref/lavfi/crop_scale +++ /dev/null @@ -1 +0,0 @@ -crop_scale c298d61e731a97d0a9600e7fde80b6b4 diff --git a/ffmpeg/tests/ref/lavfi/crop_scale_vflip b/ffmpeg/tests/ref/lavfi/crop_scale_vflip deleted file mode 100644 index 9a7d326..0000000 --- a/ffmpeg/tests/ref/lavfi/crop_scale_vflip +++ /dev/null @@ -1 +0,0 @@ -crop_scale_vflip 56b8204e72d0680b139a8d9dd756e332 diff --git a/ffmpeg/tests/ref/lavfi/crop_vflip b/ffmpeg/tests/ref/lavfi/crop_vflip deleted file mode 100644 index d6d6bad..0000000 --- a/ffmpeg/tests/ref/lavfi/crop_vflip +++ /dev/null @@ -1 +0,0 @@ -crop_vflip 8368eb12fa29acc5826bade961257375 diff --git a/ffmpeg/tests/ref/lavfi/drawbox b/ffmpeg/tests/ref/lavfi/drawbox deleted file mode 100644 index 6d2f632..0000000 --- a/ffmpeg/tests/ref/lavfi/drawbox +++ /dev/null @@ -1 +0,0 @@ -drawbox b6ff6ecda5611de46ed26db05b49dc72 diff --git a/ffmpeg/tests/ref/lavfi/edgedetect b/ffmpeg/tests/ref/lavfi/edgedetect deleted file mode 100644 index 6db0e72..0000000 --- a/ffmpeg/tests/ref/lavfi/edgedetect +++ /dev/null @@ -1 +0,0 @@ -edgedetect 9d396de52d56b63a77ea6933a323f61f diff --git a/ffmpeg/tests/ref/lavfi/fade b/ffmpeg/tests/ref/lavfi/fade deleted file mode 100644 index 852abb9..0000000 --- a/ffmpeg/tests/ref/lavfi/fade +++ /dev/null @@ -1 +0,0 @@ -fade 129fb9b266524b0adf102689c366cac8 diff --git a/ffmpeg/tests/ref/lavfi/field b/ffmpeg/tests/ref/lavfi/field deleted file mode 100644 index 68a4643..0000000 --- a/ffmpeg/tests/ref/lavfi/field +++ /dev/null @@ -1,110 +0,0 @@ -0bgr 57434af4bddb691877f2400c704604eb -0rgb fc2ba950163aeee98590181e31fcd202 -abgr 3c78d0a72484a1ecd3cae245b9fa988c -argb d5057a2be412864719ffb8ba129c1f2c -bgr0 b33c6b58b0d7bf6ce07d5a2d7c267040 -bgr24 bd6620738df19410d5df5f31e7451709 -bgr444be 219e318b7e0e05050181e71df6b9539d -bgr444le 8354f2cf5b30de0233d302a74816649d -bgr48be 22be50bd0aa39f07ad1b1aa57cb741ce -bgr48le c4b0f8057b3eac237e9228e83bdc4c66 -bgr4_byte d4c3304b4b823a130c335379e4d3444d -bgr555be c3072da465233dbfc8f61dc7a9766d2c -bgr555le be83adcf0b802b061442f0c564fd5987 -bgr565be bf955b9a035af0e613cf1de249f55f9d -bgr565le 6dd85cd5e19266c53a54cbcf06d396a7 -bgr8 9669f6974f0fc1c0afa1c7d4df093c0b -bgra f7cabae31dd7465dab2203f45db646f8 -gbrp 55eab469e3e02ccc5a358565d9b1eaa7 -gbrp10be 38753e9ac21e13d76d1a83bd7272c026 -gbrp10le a65ff11ee79ae698550218549288e6cc -gbrp12be 5f49bf3190b98221dab95056ab46bd96 -gbrp12le 3d1cd386205bc690407c81a007a79170 -gbrp14be 60e2efec11a36e7cb0db95e01603d9eb -gbrp14le fdcdecdd2c8dc13561a3788ce0487c85 -gbrp9be 86380bf8eaeee32ec40d776f699394e5 -gbrp9le 1286d4558d9bc7c3d68261f4b43e3ba9 -gray 66a09b53f7d3f79dcb6096f3ec3740c5 -gray16be a447af6482b922c9997ac02e5d3535f1 -gray16le c1dd0db327295898ff282d07f48c105d -monob 1b7fb7e69a913a0a1c0dffc54e5899ea -monow b5d3778a054fc73d515d36f8a6bc693b -nv12 b3829e9ae2a15349432b7efac4236068 -nv21 963cf5780e07301ff2906bf345b6d0ff -pal8 bfedafc3bf19c2c12eeb87125833142a -rgb0 d7481143742ff68abfbac4195edbede0 -rgb24 908d5494062c617bc87149c9daaf2167 -rgb444be 281a8f186a2726c2b31aa7e09e21c865 -rgb444le 93f9ee6265d8ad5e744ab652563f9b78 -rgb48be 0d1d60e1639edb2758ad776cb5583970 -rgb48le c958b5e98324263e97de2bb528f5bda4 -rgb4_byte 2ec97bf65649e3d47eb6812701544593 -rgb555be 21b9138b229d4065b02d38b5b62f18d1 -rgb555le 0307ee34e562b2fb2b1c6988ae18b2b2 -rgb565be e8f3ebcbb9a5fff000eca8a312f89782 -rgb565le 53bbd558fb0dcd82f1fad83ea855c3ad -rgb8 67bfdd4fa88b1ab9be876f42dfc75683 -rgba d0ebdf1495bc6b7e9d3bfbe2813a9d16 -uyvy422 a6a52504a16f09b8f2ec2405bc8190b5 -yuv410p 3feb55b1e2a385b488c82e808a12587b -yuv411p ab3dd8e6cf1452afe2d2e976e4726370 -yuv420p 52e26ad198368e2326bef97cdfa6a2bb -yuv420p10be 04353bfc21e9b88cd7776e83be756742 -yuv420p10le 3f8e7167dbd12976c6ee516b8c952363 -yuv420p12be b058ac076c8a5fe522b9fd9b8422054e -yuv420p12le ad0bf28e69eeb14eac5d8f9ea8b801f1 -yuv420p14be c7a435d42f07928332ecb21a7d96ad7a -yuv420p14le 5507e8db4e58c9517012686a7408996b -yuv420p16be 5241d64e9fa2fd6590fd23ea0e8a6f90 -yuv420p16le 78da606f761a4fb62fdac05aa5092742 -yuv420p9be e4bcaf5d6a7030f950b08501327f6175 -yuv420p9le bbf80e57389578be66d4a7a12335a613 -yuv422p e461a21995da361b88202339a2ebb879 -yuv422p10be a3e13070215f5a016ac9bae7e7115417 -yuv422p10le 8e9e3d9adc8fdb8a0a03d79bdc31eefe -yuv422p12be 6a2aca2ea007534e729203641a82c3a3 -yuv422p12le aef072b55c6e9df8fd9f398d79f864df -yuv422p14be 34e5f31372c0fdb4d77ccb7fd7bddb2f -yuv422p14le c2c50fbea0cff7edad5c5e907380cbad -yuv422p16be 55cfed8fa610f82b6625e16871dab235 -yuv422p16le e2488df0f22987fe7ed12a5ef2adf835 -yuv422p9be 80fcdd7fd9cdd79632104dcc32f78b4b -yuv422p9le e0ec9f94c875297ee5d0546274df40e9 -yuv440p f8e80596babcdb94378ec8bebf2dd46d -yuv444p 572bad9e12ed53e242658fa613412279 -yuv444p10be c5304f086afc4624d4fffb66a3cf3cb8 -yuv444p10le d1754974b936f74028752d49413d30aa -yuv444p12be 7ec8fd2d7986d6e923dfed572589e643 -yuv444p12le 79d0e287e2171a53cf4f285c0d1e83ef -yuv444p14be be021957cd819ca3146f3247138ccae9 -yuv444p14le bac0b0c70bcf72272d724f0cd1ac411e -yuv444p16be 3a67c28325978db734ba03b1828c15da -yuv444p16le c6dc275a4277fd3c65535253bb298263 -yuv444p9be f47357cdd775fc399aeab3ae58712fb9 -yuv444p9le e29799ecb6fac9f5b6d85bc34d248d4b -yuva420p 82ab09bb7a3a24bf95aeb3fa9d939847 -yuva420p10be f4559039e99ecf74a58e7063b1e7c5d3 -yuva420p10le 32b3858b01be5bfe2579dadd1be3ab12 -yuva420p16be c580495d34c6ac6e3e3b81772a0f3070 -yuva420p16le 1c49deeafb8f81e9186f3906c9b1a670 -yuva420p9be a788d7cc6ad67ad52619a08da126569a -yuva420p9le c1579a5c015908f26b76480d82f6a648 -yuva422p c162b37ce05360c47b2a2224ea0748ad -yuva422p10be b7c0adc12a8602ab8b40b611785cc18c -yuva422p10le 97f91d820f8ba642a3f9ae0901d03826 -yuva422p16be 1c61492076be33404894c1d3ec578d87 -yuva422p16le 1c085c9479a57eea35e74c264c947d73 -yuva422p9be 271c6cc091052731373ef5313bc76435 -yuva422p9le b8c2e963ac35371e8aa6a05d5c252b37 -yuva444p 4a85f1f17e95829cd53c9a28928fd8eb -yuva444p10be 04c1026f4328ebf24bd7906291b33464 -yuva444p10le 3e8ea3b211bd7ac99cb96ebf71d0e75a -yuva444p16be ac5c17adeb0ef6730a0de1dbd1d14a1a -yuva444p16le 41f1a82eb686d7191bdb00206f723247 -yuva444p9be 413d01385a8b008031b2ab3ef0b9eff4 -yuva444p9le 33ede0bd20bfd85489d266ac81d035d6 -yuvj420p 762dc6a157d0bee72da3e3d852668aef -yuvj422p 8cec955c1c62b00b6798361ef82962b7 -yuvj440p 7b469444994d8b52766ee461bcb795ea -yuvj444p b395162325af489c465a3e6a31fbb0e7 -yuyv422 1efb17cd0a48d2e956fd574ea6f412e7 diff --git a/ffmpeg/tests/ref/lavfi/histeq b/ffmpeg/tests/ref/lavfi/histeq deleted file mode 100644 index a250902..0000000 --- a/ffmpeg/tests/ref/lavfi/histeq +++ /dev/null @@ -1,6 +0,0 @@ -abgr a538e1221c94a12fb4e60b47b5358f67 -argb d0ef008d603d67a6a7d698d2a8f53d6a -bgr24 9ef3c69a658490c4fbc807272372e73a -bgra 716e70fdf7413d9a3b83e0365c2b0a99 -rgb24 8423322bbc66bc5050f6b93fdab23433 -rgba a960c9423bbb3925c3511362348b38e2 diff --git a/ffmpeg/tests/ref/lavfi/hue b/ffmpeg/tests/ref/lavfi/hue deleted file mode 100644 index ab412a7..0000000 --- a/ffmpeg/tests/ref/lavfi/hue +++ /dev/null @@ -1 +0,0 @@ -hue faddb090f2eefa663b9539fd67451352 diff --git a/ffmpeg/tests/ref/lavfi/idet b/ffmpeg/tests/ref/lavfi/idet deleted file mode 100644 index 2c6c2ae..0000000 --- a/ffmpeg/tests/ref/lavfi/idet +++ /dev/null @@ -1 +0,0 @@ -idet 1077e3cb6fc4916b5441dd08cea4c9a8 diff --git a/ffmpeg/tests/ref/lavfi/il b/ffmpeg/tests/ref/lavfi/il deleted file mode 100644 index d4a8142..0000000 --- a/ffmpeg/tests/ref/lavfi/il +++ /dev/null @@ -1,109 +0,0 @@ -0bgr b85afb77d7c3198ad7ff9ca5cceb970b -0rgb 7ca2257e526092027c67311e273767bf -abgr 4df961441de91db58f5a8a80603de585 -argb db1e1e487a489674fbf260f56ac2705d -bgr0 4335fb9738bb6ca5d6d39d738b934bbd -bgr24 7446301030e6a26853aca2036309fa8a -bgr444be f80a44936b1295d14b0bac1db624d02e -bgr444le cfc1511a390f7ca18516540c31c097c3 -bgr48be 0b1084ac65d328552bd62b4e819ab91d -bgr48le 04e4f510b6d586dc9082af43a59c0ede -bgr4_byte 2dfd29e0705fbb2b590458028cb2939d -bgr555be 5622aa808b389095658a203970bd6028 -bgr555le 6a5ad1e35cbacc45aeb9fd593c6f61ba -bgr565be 5ff7a76d9f58800e38f21a84d88c7129 -bgr565le 485b2b6f589a936d6fb12d0033809dca -bgr8 d7fae34b87a67556c273585d9140ff96 -bgra 7b4abc57f0ee99a0226e9bfd5d25cf9e -gbrp b85cfeb0e34559ffb4b2e4f1209a3712 -gbrp10be 5487219fee31607d6b19aa0d302fb42f -gbrp10le 7975e53a9e03a8acfa877334ae5e9d1d -gbrp12be 34bd529e3b085e813e7471e5a5951423 -gbrp12le 14716b36ee4043158f24b49b6a723213 -gbrp14be 426ac36ea666041afd39f842dbdd683c -gbrp14le e0823115de7b2e44c25e1c59dd204ac1 -gbrp9be 0db6ce2fe6a7fc2d5c7d6d4f0decd112 -gbrp9le 00a1a9fe310753a28c0512568a317c67 -gray 4dd4ea934fdbf689fdcf665856c402ff -gray16be cd9c1367dabd2f1858ae4f31693e622f -gray16le 4ef774c282280d7ed4780690df6e5cb4 -monob 07cffe7f5f25f39c3aa38866303791c6 -monow f2d1bdb939813a49abd6348ecfbb2703 -nv12 6847b3f7141ca1e3c40d3a494f0e13cb -nv21 e7a8e94001151e2bdd68a0ee7e4ac544 -rgb0 0d1dfb1edc9b4a7ad28dde9a1b0bee23 -rgb24 15781da8615974ed12b18f7439a25d6f -rgb444be 19bc79cdbafee996eb48feea597d761e -rgb444le de61209ae25f005d357b68e0836c4739 -rgb48be fa24415175a0759ac49949a948820f27 -rgb48le 82d5d55b03dfd9a74f0cc087793cdfc6 -rgb4_byte 7ec4d55df1bfb02ffa9956d85ade89f7 -rgb555be 34ef691ed2b6d22136c086d37bb0fefd -rgb555le 04b20c057eed7dcaee1858d45500ba54 -rgb565be 077604cc5dc91008b018264db73c8f0c -rgb565le a97549f25e63dd0dd404db41bbe05c07 -rgb8 a35d3c3b9b87261c7417076a8b18fdb8 -rgba 8ca9c8db589615ebbaa964be4ce62d08 -uyvy422 8be40aded4b407ff66305911ba5ce2ce -yuv410p 92112d85ba4f74cbd3044945c0f33402 -yuv411p b6b22000e5275c92baf5afc417c32a70 -yuv420p fca7fbbff753612a718ee13e1dfe2af2 -yuv420p10be 15c655b60ff5d212657e0620ed69fadf -yuv420p10le c9c71c78e00034af1b0fdcfe68615c6f -yuv420p12be a5377d262bd05698b2bbcfc8dd2b15ea -yuv420p12le 7d076ea30985ecf2eb590041a45f2cc6 -yuv420p14be 7a33da52fed0ffdc7f90ebcb677dc155 -yuv420p14le f431bf16d8204fb919ba0abf4ea54288 -yuv420p16be 254b78ba00a928d22cba98380546fe9d -yuv420p16le e6c182b47c3b57814d28248dbbaaea35 -yuv420p9be b1eafb2e864fa86c08684d8dd4628535 -yuv420p9le f07b2282c50f8eb6f138029d748eadfe -yuv422p ffc2693b9e1d39b59aabb9a7e1dffe05 -yuv422p10be e83db7f2f485bea0ea808f22ffcdb7bc -yuv422p10le bfd8fbeb5d89ba3904514d835aa6947d -yuv422p12be 5f31197795eda7998a0ec813496e57f1 -yuv422p12le 903939621d457a034c0181032164b3c1 -yuv422p14be 8d08189d27d3a97fbecec7edd690c691 -yuv422p14le 01b717875b85707185acd48ac75dd6f9 -yuv422p16be 0feb24228cc5ec3963dc0bde913d14be -yuv422p16le 0d6fe6924f14e77b2fef02e7ad1c47c8 -yuv422p9be 003b2032a30281845dfb6f9a7ebccc71 -yuv422p9le 427c505eb27af0059aeafffd1a858189 -yuv440p 23b55dcf6c876f0c53cf46960b13e6a3 -yuv444p 7730197c0570d46493d50bc163244754 -yuv444p10be 74b13f67114ac0f92af7bb427d6335ae -yuv444p10le 9ab09ae4acc46a2fa04fdbde1373a9f9 -yuv444p12be 76320bae89f10947e692b6ce1fa22b93 -yuv444p12le a79e40c464df640ba97c13456616b25c -yuv444p14be de7f737796d1de38a8227511b91d3378 -yuv444p14le 7c27d1b7846beb3565ce086c7df1131f -yuv444p16be 1d51af32b9e077bf1ad750c6a1787b2c -yuv444p16le 94a936f571861f25f2539ba099cafd56 -yuv444p9be 384dd0aa411d00b2deb2363a9f345db9 -yuv444p9le 77758bad5ca383b3a698fdcb38a85f20 -yuva420p 24337fc952d7f9c633756549a7b94146 -yuva420p10be f586830e7605b5bbc307f6f5c532958c -yuva420p10le 7bc9e81d18021dbb7c96ceeef4a18090 -yuva420p16be 54362c9d57d26ead878b9eb05a523785 -yuva420p16le af55baa12d11c0ac6c9065df730d81ef -yuva420p9be a290f1b1e1fe18ac22fed3535562ff98 -yuva420p9le 89d0fa6679548757044c0e1971c1cbfd -yuva422p e3fe9f137a37e1b3817fe8579d2d2acc -yuva422p10be 4aa77b690225054f9b5c7ce7c66950e8 -yuva422p10le e7c6538112fc1d9539f4635dedf52eae -yuva422p16be 0e5a1b0b52d42f4f07d7e63dbe4ab83b -yuva422p16le 5b3a1219d7224650929e6272693f1cd3 -yuva422p9be 9d6f936fa9666e2bcbada5188e2a4942 -yuva422p9le 0f97c4d357e103e7263705b918a37824 -yuva444p fe4dbba35f355d68b6c254c06db1cbad -yuva444p10be 3926a29639556a11acc95888e29517d6 -yuva444p10le 1b68842a69b3b9d5a23854217b410c69 -yuva444p16be 45ec67a0828aedf18f1ed54fcfb0ff83 -yuva444p16le 7b8e5963f19e6fe7fd409b34af014489 -yuva444p9be 6d2905a9e61ce4ff5b3d7b972a7333eb -yuva444p9le e2ffdb1d867a1b78f3bd38d600b17193 -yuvj420p d1a8d9cf6b4035ac5d6439ab2754b09d -yuvj422p d20df6138cdf62d7f3b93eb1277827d6 -yuvj440p 17a24a86f279febaebb66d65509088e8 -yuvj444p 326bb83d1aec23d941894a1324984c56 -yuyv422 f9121733169ca5437e95e7600a7c5aea diff --git a/ffmpeg/tests/ref/lavfi/kerndeint b/ffmpeg/tests/ref/lavfi/kerndeint deleted file mode 100644 index 2769319..0000000 --- a/ffmpeg/tests/ref/lavfi/kerndeint +++ /dev/null @@ -1,10 +0,0 @@ -0bgr 58fb0bda60562ce17e75f1c3459d0504 -0rgb d29f6a7b63ade359ec81f5856633ec06 -abgr 71071045b8ec66a6d0a38bb3fed1ca51 -argb 93ba0daa1e945ad1a6f8c0c1cd2e1858 -bgr0 364b8bcd1c7a384902077bc7190c5ea3 -bgra 81ac8315a4c66e363bc6fa3e99d9cd2b -rgb0 ae0c2afbc266345c1372276755595105 -rgba 42a6cc9b815ca0ee69c29db3616ce25e -yuv420p 40ca042814882b0b791cbec38e289702 -yuyv422 f549c98059ba9ce50e28204256d13b5d diff --git a/ffmpeg/tests/ref/lavfi/life b/ffmpeg/tests/ref/lavfi/life deleted file mode 100644 index 05713f3..0000000 --- a/ffmpeg/tests/ref/lavfi/life +++ /dev/null @@ -1 +0,0 @@ -life bc4822aa5d473a8b5efb31fef7aeac86 diff --git a/ffmpeg/tests/ref/lavfi/null b/ffmpeg/tests/ref/lavfi/null deleted file mode 100644 index 0b9b9b8..0000000 --- a/ffmpeg/tests/ref/lavfi/null +++ /dev/null @@ -1 +0,0 @@ -null 61fffd2d8425759a33ae07e718d0242d diff --git a/ffmpeg/tests/ref/lavfi/overlay_rgb b/ffmpeg/tests/ref/lavfi/overlay_rgb deleted file mode 100644 index ce4e30b..0000000 --- a/ffmpeg/tests/ref/lavfi/overlay_rgb +++ /dev/null @@ -1 +0,0 @@ -overlay_rgb abea47d9e61d7eab40c4734294519524 diff --git a/ffmpeg/tests/ref/lavfi/overlay_yuv420 b/ffmpeg/tests/ref/lavfi/overlay_yuv420 deleted file mode 100644 index 3d12251..0000000 --- a/ffmpeg/tests/ref/lavfi/overlay_yuv420 +++ /dev/null @@ -1 +0,0 @@ -overlay_yuv420 4e85d551db9e56e8faddc1fc70fd6a00 diff --git a/ffmpeg/tests/ref/lavfi/overlay_yuv444 b/ffmpeg/tests/ref/lavfi/overlay_yuv444 deleted file mode 100644 index b83e605..0000000 --- a/ffmpeg/tests/ref/lavfi/overlay_yuv444 +++ /dev/null @@ -1 +0,0 @@ -overlay_yuv444 16215d0b4054a44bbe7f6c46bd97d235 diff --git a/ffmpeg/tests/ref/lavfi/pad b/ffmpeg/tests/ref/lavfi/pad deleted file mode 100644 index 7a6f61e..0000000 --- a/ffmpeg/tests/ref/lavfi/pad +++ /dev/null @@ -1 +0,0 @@ -pad 8122d716097523d0875e2d55b0926105 diff --git a/ffmpeg/tests/ref/lavfi/pixfmts_copy b/ffmpeg/tests/ref/lavfi/pixfmts_copy deleted file mode 100644 index 68ec828..0000000 --- a/ffmpeg/tests/ref/lavfi/pixfmts_copy +++ /dev/null @@ -1,110 +0,0 @@ -0bgr a06d3a7652e4885c65895e0e168aab28 -0rgb b6b5653d2228cdf2ba3c55a72f2e713f -abgr 1a147fa04ed70b9a7e67a4c89052f630 -argb 997df0b5c268a0d8f9c611cae4e01e05 -bgr0 218df6dc3eb5094a0c16a8bd18bc3999 -bgr24 d6370f6dc34df2ea66e1718baf74137b -bgr444be aba6dfea008ae12c2120a95f54293904 -bgr444le cfb5401e8f076cc8675e17ed1114a3df -bgr48be ab65229b64606f6408cd732b967c0b01 -bgr48le f1b4e718cadee9bd2978289153ce43de -bgr4_byte de96505ef9ad7078f87b4dfdf6fe4b61 -bgr555be 8d5de9e9200d622f27dc73958a85045c -bgr555le 74eb9837706143a40e26305a16a79369 -bgr565be 13a36d6502be88fc0c2aec05b8d2d501 -bgr565le ed027571692aecd522aa65a90cc7e09b -bgr8 71ef789609c746c2e7e4be9dec29062c -bgra 0364b074268682ea46168742a8239f7d -gbrp 89d6e4b116e3bd542fa09a19a977ad16 -gbrp10be 5dc62e2d01fa7c19a57abe48246f2232 -gbrp10le 0cac205a304b59811ce30fcad49b3527 -gbrp12be de1d2a6b1d189bce9b9a2cf322c31c24 -gbrp12le e3267ef00bb48778df21a386416d2e14 -gbrp14be 7979d158b30c0b45db97aba2228d15fc -gbrp14le d32b6c73a820f9d03a779a996924893d -gbrp9be 2478d1c27ae4ec94ec4b5e439128af0c -gbrp9le 640240ca2663e48f0bacd8edb5242c7d -gray 1e5e2b8548843a6898eedd9c974c422c -gray16be 389f4e5a8ab413b3af32767b59ed7f9e -gray16le a1f912941247e45b394b9cf4f0e81130 -monob 309b5785a36bd988d17e15d88f4ffad1 -monow 8809a02bc69b58d1114b09ca79ebffad -nv12 75e90c54d858b993e99f4ee6d2a2a38f -nv21 8831a3f411015d45fbc5dd191245ba9c -pal8 13de2a1c3c80cb64d14e2bc4f6f461d0 -rgb0 992f5ad24802cc255edab45c3084db4a -rgb24 c71ba90f69f15c8275232bb3f62d0ced -rgb444be 26eaec65d7efd2b0c9c13b47dfd9b241 -rgb444le 5f29863553107110ea817f52151d77b7 -rgb48be a3bc81c46c21818a989f23104a599ab0 -rgb48le e87c661ac49aea1f1e93939802883d92 -rgb4_byte 293b1b84f01efd90bde40cb3faffc127 -rgb555be 5229183fa64d4e5c7e3703d8263ee6ae -rgb555le c3e9978cb2a4129a5575935e8cbc433a -rgb565be bc123b962629ead1a06af0c18cbb6e5f -rgb565le 20757fafe4756e62d845b2ab4c0b8f93 -rgb8 e01614f5416dcc8ad365ad7a57afc9fb -rgba 53796fa4c392a1b2659595b6a284f8c4 -uyvy422 3f411f947e3ac8f842c88e717d68bd9a -yuv410p 7dcf3f4770c8b494290ceacd2c2ce6db -yuv411p 9461b188dab6f8b90d9a27e353a89f58 -yuv420p 61fffd2d8425759a33ae07e718d0242d -yuv420p10be 2abf90242cb021cb6fcf9f2c3c92f6a7 -yuv420p10le 180b7e4de684c7225d2fb37614f842cb -yuv420p12be 256c9e6cfc878a8abf681b30777c0620 -yuv420p12le 8dc8b86c4790da3769d4a62e87608623 -yuv420p14be 8d22756c5d2b9e501924c082bfb22a6c -yuv420p14le c9da19d4818bcb119ad6481b75778f7e -yuv420p16be 4ccdcca6dd6a960f9a3333f0aee095bd -yuv420p16le 9c5847d9b0de258a10ee906dc47e24ea -yuv420p9be fa7ad4f73232aac0e35def62af1e2c39 -yuv420p9le 3720ba1786b56c8f4913e67dddebbb07 -yuv422p eee223e92f1f2e5ad4186b411ebf5816 -yuv422p10be 80fa87750491dcc3e93d175b64835654 -yuv422p10le e1640cd315bd96c6b59f7753825a7306 -yuv422p12be 5c6d86e919515d1af71f8004a6252f9e -yuv422p12le 7f331cadb0ab75d07656d29f47bd8bd9 -yuv422p14be 4f4e186ba683b90fe990cccc4db7e521 -yuv422p14le d78016c9119b1f1d1c922bd5aaf47732 -yuv422p16be 1f3c216927d17966a009a42def124bba -yuv422p16le 90adbdffaeea9b09398339c8a1322b02 -yuv422p9be e46446534dd0821029d3b831c9c1d1b0 -yuv422p9le 520e418a2429f7efee511b7fcbf45ab6 -yuv440p 456d83524b299f2fa1bb988e421554d9 -yuv444p 068bc09d282d18c9fa35c2787943fc2a -yuv444p10be 9f6e1490080a454243daee9229425e1e -yuv444p10le cc183e51041351d9ac06c4df6e8ad5f7 -yuv444p12be 34f63ac6a47ac681016105d3bfb3e118 -yuv444p12le 7964701bfe8d718edf97f6e0002935bd -yuv444p14be 4ad3a9d52fe9c050150c0f7d2f3cf63d -yuv444p14le 69575e5a94b978f159c4fdb1a61587b0 -yuv444p16be 4000b12fa88ed0feef182da31c7e6b96 -yuv444p16le 96a857dba8dc6792c58daec872825b32 -yuv444p9be 07727e5c9040b7f0a17d591288ac330d -yuv444p9le 4d12d20a68dc28618594c96c2ade4ff4 -yuva420p 3a8c5c142e051367c196f95696e0e2c3 -yuva420p10be 1b7c5ec6691498e24676ce6ed97f62f8 -yuva420p10le 4c13322bca914df2727da91cca85ca1a -yuva420p16be 6afcf758f4b66c0b4173c942d42212d7 -yuva420p16le 13e195aa96329eb49921b6f9f07b875c -yuva420p9be 05a78390de312dfd21ac666a9da05fbd -yuva420p9le 78f5593bf51a31841ef83df41d0316eb -yuva422p 45ae66d6f69fd5b77e6831e98d228bf4 -yuva422p10be 18284c58b926fe2389605c692a703145 -yuva422p10le b934d28b615729a24bebf0381c465e37 -yuva422p16be c3f7354b6013b43439e02aa02be5fe69 -yuva422p16le a7ccc43820683ab15061d14cf8efce6c -yuva422p9be 14c55a16d19499b54b4341f135d3e558 -yuva422p9le a8bf168e5d2709222192d0aff46b1373 -yuva444p 86b05da54db8c7e8cf5b6638e19c6fc5 -yuva444p10be 8c417158165c00fbd42def60cbc27d69 -yuva444p10le 5f303ef3fb56faed69b4cc1c760ac6ae -yuva444p16be 52a9591ec0d5059e49b1b2803f8582aa -yuva444p16le a9272ac197e4a4195662ce90f533976c -yuva444p9be f72f646ef07cdab613420585aba041ac -yuva444p9le 6d431b0a27bf4f86ea44ef5f14247a01 -yuvj420p 73661456012f20cda81207b14bb0c0a5 -yuvj422p aa97862b57f47c5a6506156e9aaf129a -yuvj440p ff8b9884a49d546b035f5d2ac1e673df -yuvj444p b8142888d80b8065c54045839e79b331 -yuyv422 f06a4fbbdb32807d05de825daa2c3a1b diff --git a/ffmpeg/tests/ref/lavfi/pixfmts_crop b/ffmpeg/tests/ref/lavfi/pixfmts_crop deleted file mode 100644 index 797aedc..0000000 --- a/ffmpeg/tests/ref/lavfi/pixfmts_crop +++ /dev/null @@ -1,43 +0,0 @@ -abgr ef31d9057f6e65a7c3308a1b1daa98fa -argb 5e5e261c4870e0de05d56ff640b9550a -bgr24 44bec15f35513de7e957b3d59b53cb7b -bgr48be 0b5ebce3c48eb8614d79e204b5268603 -bgr48le c4ab61a8b9d502132730c6abb6ffd84c -bgr4_byte cab930dbe1fe77d58b41837ecdcb8460 -bgr555be 67162782fdb86813f446d8e1c21c73e9 -bgr555le 85913cfa8dab465f7dcfcfe7f9001a01 -bgr565be ee9a1debb896d41c53a026f9e6ce006b -bgr565le ab7b6055bc3b6b7edc9a5e4de43ec90d -bgr8 f85ff16e21d922ad6d32648ef3acfbfb -bgra 9f2e37d73ad3b759fc9d6b12ee668c38 -gray 3266b99065a17cbd647f2339addc5303 -gray16be 02ac848ad4e28c06938599563ba81ff7 -gray16le 672aebfeb8a0f4067b3c6064340056e4 -pal8 e1fd50b8a8a67fb5abd8b44abc778bbb -rgb24 d044123f1fe50f656f2101dd3f091ead -rgb48be ef5507f88948b54218911d12e1dbef36 -rgb48le 6d045d5990d6ada64a112e3b581a7b38 -rgb4_byte 0f0f9ee31c65dc60da49bf98a1b06dcf -rgb555be 48fa619bfd04f6dee05416b02605c031 -rgb555le 292cff1f824e49076bad50a07ab1c749 -rgb565be 0dd6f6a5a8713bd1c3d9826bb7a88eab -rgb565le 6afd85faa8c6f0f330969539178eb9a2 -rgb8 87cf541b110e35a6f9a983e9cde85e15 -rgba 7abe1af7b97f5b9a7aa5ad3e4bf32f76 -yuv410p 126e0da1da4fd89be28087b8367bbb36 -yuv411p b94f0af107fc4796aca70c0a36d374c5 -yuv420p 74c6b331bd30f005e6c75a192423ad90 -yuv420p16be 2d3c84ebff77479e8c5b6e3e59ec4e45 -yuv420p16le e2c906f2751609bf8cbcbeb2f629319a -yuv422p 124bc8d668072de1bb3b894cc4bae859 -yuv422p16be 3ec47e2709107fcc388b5e0abebf7eaf -yuv422p16le a4183a62917bf8568fe11ff446dd18f9 -yuv440p 15c81c685fa5b9db95150caff14ff83f -yuv444p 12b752f78af72666627cea2d0c274cdb -yuv444p16be f2bf0e22a1d184e37eaa199a76cf22ba -yuv444p16le c11b151dced5c8854d385373fa4dcc8f -yuva420p 920c5d1b965eeb72e3a0e343696face3 -yuvj420p f9183e49f42bae31d7d85b92161fa82f -yuvj422p aabeed60a6e1b2cf88665ac627bf531f -yuvj440p 5ae4f404b42f3167f978473d9a3737fc -yuvj444p 6728997f65b879fd5a3175cb449a8f0c diff --git a/ffmpeg/tests/ref/lavfi/pixfmts_hflip b/ffmpeg/tests/ref/lavfi/pixfmts_hflip deleted file mode 100644 index ee5c2d3..0000000 --- a/ffmpeg/tests/ref/lavfi/pixfmts_hflip +++ /dev/null @@ -1,106 +0,0 @@ -0bgr 03d8a8920dbb408218376baee8665649 -0rgb 6ee5f3b85ec38953df0762ddd0bdf561 -abgr 8ab842e280c8b31f66450e8951dfedfa -argb cdb6aa47939d49c0ff72537bfc8c82e0 -bgr0 1b0b59382ddbbf045be6b160b7df5881 -bgr24 5b64fd60e2050946b50da1f4945127fb -bgr444be b52c1b9d9dc02cb46c04e80d97139e60 -bgr444le 48172797fa65a25c0ad30ddc7e8f5bcb -bgr48be 58e292c33eb60708171c3393a5700615 -bgr48le e1be8e6bfe26acdee258e76329d2f03d -bgr4_byte af34e1158edfbc8c6929365d651a9549 -bgr555be c82d7877f7ef25ee1154d05b240cf54c -bgr555le b7a4e2c66807a82bd132dfcf8540bfb5 -bgr565be 3b464a00c619410eac7bdea9c96faf60 -bgr565le 4b4c708d4ad222f41734dce68e9d48b6 -bgr8 ad1db7a17cdfab2ede6f22c2415a3fbf -bgra 85fa06ad9fd156c3179a647a2e741b60 -gbrp 95fde5b6a767cf8d2679a4a6d18fdbe7 -gbrp10be 5ddc834dbf2198f6b1af36c66b185e2c -gbrp10le 04814cbb805b66e8e085c7db4a548deb -gbrp12be 8184b00342421c366764c091e9174260 -gbrp12le 1519cba0b6ddd7ee3df7c97670f1cbd5 -gbrp14be 10872df155aab67a13b98ad162908896 -gbrp14le 5fd363517fca5ef0ac725d1c047f2e75 -gbrp9be 187c83736d4fe1d7c8491609debc8f86 -gbrp9le 5476b0787da2d928d98d4cda60537fb5 -gray 35b50e78d5d27255f43e642a404dd708 -gray16be d206a080739d89cb7dc0009ad4082ed4 -gray16le 7ebcfd9401ba85e584230de8fc02986d -nv12 719adbc47fa74e92f83150921917483f -nv21 9c833b3ce53539d270e1f21e4319797b -pal8 19c8735b23feeed18ec2d37913a5f3f8 -rgb0 ce26538ebe1ec09dec3dde5e4d8a1405 -rgb24 c2752464ac2b549268e9638745dba857 -rgb444be 85586541cc7eb12e05ff7162b12304c2 -rgb444le 670da20b82403e00609bf2c1f5611223 -rgb48be a9ee2c9946d8d54dba60cebbdbe43886 -rgb48le 28e2cf59b789249dbd0859f58f4ae55d -rgb4_byte 31dca70b4f3537afa9840cea1b062acf -rgb555be c010cc746ce9483b47387ba846670179 -rgb555le a768de014e0908dfa886108da376b2e5 -rgb565be 6727e71974c8e5dad157925c10ee1532 -rgb565le b0a2b4817775289cfc415bb951f9ae0c -rgb8 22fdbd14ce296c1afa9bb4a6ea09b3fe -rgba a37789c4df73c3bd8648ad1fe9d3f991 -yuv410p a1280c2b9b562dba3c2d35a1e5fc4b23 -yuv411p 6bf10756ac5c7841db63a97106ff911b -yuv420p 45f4a06481f2cd8e28fb29c7c151e110 -yuv420p10be ddfef981d53de0f808173bb267203ca6 -yuv420p10le 966b8c55de4d8a12bdc8db3d9ad3ae6d -yuv420p12be 735da68f3ac8380a993f46a460c02432 -yuv420p12le 3a71ae4e6a7b106b3e1532c6d148fa61 -yuv420p14be d921d7b364d0a7bde183ba717a77f1d4 -yuv420p14le ab410b636acd41234cc396967f66c859 -yuv420p16be cde798cad650bcb087943442a399c8ea -yuv420p16le b7124c56605eeb12f3d13287ddc77f3a -yuv420p9be b0f6044fb40cf0ef41cc536311566cc6 -yuv420p9le 086f9320167a755faed18c0a3a36c0e6 -yuv422p c3982fbb57e796881efedae11b8346de -yuv422p10be a3db158525c7794fd06b4d20e558e64d -yuv422p10le 31cf611e502584fcf846d3ba2583028a -yuv422p12be 8cafc31b579b168a71f7093a161b8023 -yuv422p12le be83ffe86cb99ecfef76affb2b73d5b2 -yuv422p14be 96870c66856e2669095ccdea034558ab -yuv422p14le 46dcb0160aa8ada4025b365873a78d6c -yuv422p16be 4b96fb571e686185d96b4a97e3413d5f -yuv422p16le 503bc49bace58dae1767173746a16056 -yuv422p9be 0ffc1bfde0b679e6e7b7e0c8c84e686a -yuv422p9le 3c061cdb9f302c8f8806b409bd2b0aca -yuv440p 44f78792c5766ab896fbe0d718976946 -yuv444p a36b8ce12de27971b52e93267fe6583f -yuv444p10be 90e94770d3eb4693b09925f549d7311e -yuv444p10le 8a26fba7c2223d72cd5ad00c1941948f -yuv444p12be 24bdad5d7ddca614da7d105e931c49e8 -yuv444p12le a996cb8a1c062d2238b58a5db9b990dd -yuv444p14be a9f7dd66b6f54bbdbf176894b01d7422 -yuv444p14le 6204f763af4a0d26f41ddca1d1ae9741 -yuv444p16be 9370058632b2582ab7a21725ec4f4e1d -yuv444p16le 0674c63a0e8debbfc010a2730da66a13 -yuv444p9be b1327e7ca47a950ee99bd2a7e05f56d0 -yuv444p9le 2f89171f0470eefa9f89fdc43874dc1d -yuva420p a62cf0a72905b54a7ef10fcaeff723bc -yuva420p10be 602b6a8c0b16ce2b55ddcae443e75dac -yuva420p10le 1c086d4ee0619ac65cb5a69481b981ca -yuva420p16be 51c45f4227ba86159f46c65783d64cef -yuva420p16le e87030429a965f2ddc8f07ca49014573 -yuva420p9be a48309403dc66dc5242cac19cc7598e5 -yuva420p9le ae2dcb326eb3a2ff170f498077ae5624 -yuva422p 6e7c30ea252a41b70d26250f624ab284 -yuva422p10be e0ee8576f9328ca4ec174a8c084f2235 -yuva422p10le b489c203b9b0ebc42adb794bb10a3c4f -yuva422p16be 550b1d2ecbc3d5f50041816090d62a02 -yuva422p16le 73a426eb63685247ea037389595cb43a -yuva422p9be c65251c422cd3c81ff5d97d207312292 -yuva422p9le 3405924773c6bdc42325a8a1ff658595 -yuva444p e32ba5dcb01ba848e7dead04112b1aa5 -yuva444p10be 97549388c7f9fbc1425b1663b46c43d1 -yuva444p10le 0b88bed194caea2fa06f458034b1b90e -yuva444p16be 2dd545e4ddb0f134322eee1c1de4c2ff -yuva444p16le 1e144cc9ea16429c1655c67e2f12f5c9 -yuva444p9be e37fa0743bf720fbe31605714d7f7ad6 -yuva444p9le 9bd4083c1384a55e91f02630161dc4c3 -yuvj420p 86370b945c5d19d809ee92386d476a53 -yuvj422p d3bda08bd4b92a256a8ec8432c4767d1 -yuvj440p dbae7083c82f20a38fc55e6f8bc374bc -yuvj444p 55ce75c7bd172b28703e82f64186e6b6 diff --git a/ffmpeg/tests/ref/lavfi/pixfmts_null b/ffmpeg/tests/ref/lavfi/pixfmts_null deleted file mode 100644 index 68ec828..0000000 --- a/ffmpeg/tests/ref/lavfi/pixfmts_null +++ /dev/null @@ -1,110 +0,0 @@ -0bgr a06d3a7652e4885c65895e0e168aab28 -0rgb b6b5653d2228cdf2ba3c55a72f2e713f -abgr 1a147fa04ed70b9a7e67a4c89052f630 -argb 997df0b5c268a0d8f9c611cae4e01e05 -bgr0 218df6dc3eb5094a0c16a8bd18bc3999 -bgr24 d6370f6dc34df2ea66e1718baf74137b -bgr444be aba6dfea008ae12c2120a95f54293904 -bgr444le cfb5401e8f076cc8675e17ed1114a3df -bgr48be ab65229b64606f6408cd732b967c0b01 -bgr48le f1b4e718cadee9bd2978289153ce43de -bgr4_byte de96505ef9ad7078f87b4dfdf6fe4b61 -bgr555be 8d5de9e9200d622f27dc73958a85045c -bgr555le 74eb9837706143a40e26305a16a79369 -bgr565be 13a36d6502be88fc0c2aec05b8d2d501 -bgr565le ed027571692aecd522aa65a90cc7e09b -bgr8 71ef789609c746c2e7e4be9dec29062c -bgra 0364b074268682ea46168742a8239f7d -gbrp 89d6e4b116e3bd542fa09a19a977ad16 -gbrp10be 5dc62e2d01fa7c19a57abe48246f2232 -gbrp10le 0cac205a304b59811ce30fcad49b3527 -gbrp12be de1d2a6b1d189bce9b9a2cf322c31c24 -gbrp12le e3267ef00bb48778df21a386416d2e14 -gbrp14be 7979d158b30c0b45db97aba2228d15fc -gbrp14le d32b6c73a820f9d03a779a996924893d -gbrp9be 2478d1c27ae4ec94ec4b5e439128af0c -gbrp9le 640240ca2663e48f0bacd8edb5242c7d -gray 1e5e2b8548843a6898eedd9c974c422c -gray16be 389f4e5a8ab413b3af32767b59ed7f9e -gray16le a1f912941247e45b394b9cf4f0e81130 -monob 309b5785a36bd988d17e15d88f4ffad1 -monow 8809a02bc69b58d1114b09ca79ebffad -nv12 75e90c54d858b993e99f4ee6d2a2a38f -nv21 8831a3f411015d45fbc5dd191245ba9c -pal8 13de2a1c3c80cb64d14e2bc4f6f461d0 -rgb0 992f5ad24802cc255edab45c3084db4a -rgb24 c71ba90f69f15c8275232bb3f62d0ced -rgb444be 26eaec65d7efd2b0c9c13b47dfd9b241 -rgb444le 5f29863553107110ea817f52151d77b7 -rgb48be a3bc81c46c21818a989f23104a599ab0 -rgb48le e87c661ac49aea1f1e93939802883d92 -rgb4_byte 293b1b84f01efd90bde40cb3faffc127 -rgb555be 5229183fa64d4e5c7e3703d8263ee6ae -rgb555le c3e9978cb2a4129a5575935e8cbc433a -rgb565be bc123b962629ead1a06af0c18cbb6e5f -rgb565le 20757fafe4756e62d845b2ab4c0b8f93 -rgb8 e01614f5416dcc8ad365ad7a57afc9fb -rgba 53796fa4c392a1b2659595b6a284f8c4 -uyvy422 3f411f947e3ac8f842c88e717d68bd9a -yuv410p 7dcf3f4770c8b494290ceacd2c2ce6db -yuv411p 9461b188dab6f8b90d9a27e353a89f58 -yuv420p 61fffd2d8425759a33ae07e718d0242d -yuv420p10be 2abf90242cb021cb6fcf9f2c3c92f6a7 -yuv420p10le 180b7e4de684c7225d2fb37614f842cb -yuv420p12be 256c9e6cfc878a8abf681b30777c0620 -yuv420p12le 8dc8b86c4790da3769d4a62e87608623 -yuv420p14be 8d22756c5d2b9e501924c082bfb22a6c -yuv420p14le c9da19d4818bcb119ad6481b75778f7e -yuv420p16be 4ccdcca6dd6a960f9a3333f0aee095bd -yuv420p16le 9c5847d9b0de258a10ee906dc47e24ea -yuv420p9be fa7ad4f73232aac0e35def62af1e2c39 -yuv420p9le 3720ba1786b56c8f4913e67dddebbb07 -yuv422p eee223e92f1f2e5ad4186b411ebf5816 -yuv422p10be 80fa87750491dcc3e93d175b64835654 -yuv422p10le e1640cd315bd96c6b59f7753825a7306 -yuv422p12be 5c6d86e919515d1af71f8004a6252f9e -yuv422p12le 7f331cadb0ab75d07656d29f47bd8bd9 -yuv422p14be 4f4e186ba683b90fe990cccc4db7e521 -yuv422p14le d78016c9119b1f1d1c922bd5aaf47732 -yuv422p16be 1f3c216927d17966a009a42def124bba -yuv422p16le 90adbdffaeea9b09398339c8a1322b02 -yuv422p9be e46446534dd0821029d3b831c9c1d1b0 -yuv422p9le 520e418a2429f7efee511b7fcbf45ab6 -yuv440p 456d83524b299f2fa1bb988e421554d9 -yuv444p 068bc09d282d18c9fa35c2787943fc2a -yuv444p10be 9f6e1490080a454243daee9229425e1e -yuv444p10le cc183e51041351d9ac06c4df6e8ad5f7 -yuv444p12be 34f63ac6a47ac681016105d3bfb3e118 -yuv444p12le 7964701bfe8d718edf97f6e0002935bd -yuv444p14be 4ad3a9d52fe9c050150c0f7d2f3cf63d -yuv444p14le 69575e5a94b978f159c4fdb1a61587b0 -yuv444p16be 4000b12fa88ed0feef182da31c7e6b96 -yuv444p16le 96a857dba8dc6792c58daec872825b32 -yuv444p9be 07727e5c9040b7f0a17d591288ac330d -yuv444p9le 4d12d20a68dc28618594c96c2ade4ff4 -yuva420p 3a8c5c142e051367c196f95696e0e2c3 -yuva420p10be 1b7c5ec6691498e24676ce6ed97f62f8 -yuva420p10le 4c13322bca914df2727da91cca85ca1a -yuva420p16be 6afcf758f4b66c0b4173c942d42212d7 -yuva420p16le 13e195aa96329eb49921b6f9f07b875c -yuva420p9be 05a78390de312dfd21ac666a9da05fbd -yuva420p9le 78f5593bf51a31841ef83df41d0316eb -yuva422p 45ae66d6f69fd5b77e6831e98d228bf4 -yuva422p10be 18284c58b926fe2389605c692a703145 -yuva422p10le b934d28b615729a24bebf0381c465e37 -yuva422p16be c3f7354b6013b43439e02aa02be5fe69 -yuva422p16le a7ccc43820683ab15061d14cf8efce6c -yuva422p9be 14c55a16d19499b54b4341f135d3e558 -yuva422p9le a8bf168e5d2709222192d0aff46b1373 -yuva444p 86b05da54db8c7e8cf5b6638e19c6fc5 -yuva444p10be 8c417158165c00fbd42def60cbc27d69 -yuva444p10le 5f303ef3fb56faed69b4cc1c760ac6ae -yuva444p16be 52a9591ec0d5059e49b1b2803f8582aa -yuva444p16le a9272ac197e4a4195662ce90f533976c -yuva444p9be f72f646ef07cdab613420585aba041ac -yuva444p9le 6d431b0a27bf4f86ea44ef5f14247a01 -yuvj420p 73661456012f20cda81207b14bb0c0a5 -yuvj422p aa97862b57f47c5a6506156e9aaf129a -yuvj440p ff8b9884a49d546b035f5d2ac1e673df -yuvj444p b8142888d80b8065c54045839e79b331 -yuyv422 f06a4fbbdb32807d05de825daa2c3a1b diff --git a/ffmpeg/tests/ref/lavfi/pixfmts_pad b/ffmpeg/tests/ref/lavfi/pixfmts_pad deleted file mode 100644 index 192ff6a..0000000 --- a/ffmpeg/tests/ref/lavfi/pixfmts_pad +++ /dev/null @@ -1,25 +0,0 @@ -0bgr 36ba5b43e0ac64d8daad4f897efd8cdf -0rgb cc3ca0f63885af19b3daa4504cadcc19 -abgr 9ddb78f395d7d3f75b65b5309223c0c5 -argb e5fbb7bb282a80897b8f730627f68876 -bgr0 c55368036cccbb0af471d6bd82abe02a -bgr24 67f9fd70dc6d9896b7122976b33932b4 -bgra c8dd017b5a3b55e8b9d0ac1cdcf327bd -gbrp 74f83deee9866bbdce3f91fa2aeddaaa -gray b1abadae3718522aa57a7972da8cbe17 -rgb0 b1977b45634c4db58a183a07feb2acff -rgb24 e73de9dc0fdd78f4853c168603cc7aba -rgba 5a36df3c5ba623b589728a5a442e98e2 -yuv410p ff246b8b41d3d4a3eb90414ae3031123 -yuv411p a82c606c665fa747679aa8bfffa8a5db -yuv420p 0fe4d9031999f83ca96292ec2025f272 -yuv422p 5e0bffdac30b39f1bae9ec54fd9a6a34 -yuv440p 5e338303cd89d1d76ab918e5bec1e90d -yuv444p 248bdf9747d5c3718580dc2279e2e273 -yuva420p b5bdefbb0c5b302b6d18ee4df7c1d7c7 -yuva422p 8b56b36d9eb3c382d2a5a695107e759d -yuva444p 389cf95e98bf24684a42d5d67b913e16 -yuvj420p d182ac937d312e4894c1bc548883bf1c -yuvj422p 26ac91b5daf6f2f1f3c22be489e994a3 -yuvj440p 63e2b94f81e0a6f2868055a4c8258b63 -yuvj444p 64f103c7db8fc803d062db7ed2b8dc76 diff --git a/ffmpeg/tests/ref/lavfi/pixfmts_pixdesctest b/ffmpeg/tests/ref/lavfi/pixfmts_pixdesctest deleted file mode 100644 index 05d5e0f..0000000 --- a/ffmpeg/tests/ref/lavfi/pixfmts_pixdesctest +++ /dev/null @@ -1,110 +0,0 @@ -0bgr 2b46a6ce47a19ffc240e4e93f498f491 -0rgb e90e5d377a3e5af69fdf7b60cbf88f51 -abgr 1a147fa04ed70b9a7e67a4c89052f630 -argb 997df0b5c268a0d8f9c611cae4e01e05 -bgr0 b61591a68252e66c576b9bb074a9eaed -bgr24 d6370f6dc34df2ea66e1718baf74137b -bgr444be aba6dfea008ae12c2120a95f54293904 -bgr444le cfb5401e8f076cc8675e17ed1114a3df -bgr48be ab65229b64606f6408cd732b967c0b01 -bgr48le f1b4e718cadee9bd2978289153ce43de -bgr4_byte de96505ef9ad7078f87b4dfdf6fe4b61 -bgr555be 8d5de9e9200d622f27dc73958a85045c -bgr555le 74eb9837706143a40e26305a16a79369 -bgr565be 13a36d6502be88fc0c2aec05b8d2d501 -bgr565le ed027571692aecd522aa65a90cc7e09b -bgr8 71ef789609c746c2e7e4be9dec29062c -bgra 0364b074268682ea46168742a8239f7d -gbrp 89d6e4b116e3bd542fa09a19a977ad16 -gbrp10be 5dc62e2d01fa7c19a57abe48246f2232 -gbrp10le 0cac205a304b59811ce30fcad49b3527 -gbrp12be de1d2a6b1d189bce9b9a2cf322c31c24 -gbrp12le e3267ef00bb48778df21a386416d2e14 -gbrp14be 7979d158b30c0b45db97aba2228d15fc -gbrp14le d32b6c73a820f9d03a779a996924893d -gbrp9be 2478d1c27ae4ec94ec4b5e439128af0c -gbrp9le 640240ca2663e48f0bacd8edb5242c7d -gray 1e5e2b8548843a6898eedd9c974c422c -gray16be 389f4e5a8ab413b3af32767b59ed7f9e -gray16le a1f912941247e45b394b9cf4f0e81130 -monob 309b5785a36bd988d17e15d88f4ffad1 -monow 8809a02bc69b58d1114b09ca79ebffad -nv12 75e90c54d858b993e99f4ee6d2a2a38f -nv21 8831a3f411015d45fbc5dd191245ba9c -pal8 13de2a1c3c80cb64d14e2bc4f6f461d0 -rgb0 5774780b3c532896300fa326fcde01a8 -rgb24 c71ba90f69f15c8275232bb3f62d0ced -rgb444be 26eaec65d7efd2b0c9c13b47dfd9b241 -rgb444le 5f29863553107110ea817f52151d77b7 -rgb48be a3bc81c46c21818a989f23104a599ab0 -rgb48le e87c661ac49aea1f1e93939802883d92 -rgb4_byte 293b1b84f01efd90bde40cb3faffc127 -rgb555be 5229183fa64d4e5c7e3703d8263ee6ae -rgb555le c3e9978cb2a4129a5575935e8cbc433a -rgb565be bc123b962629ead1a06af0c18cbb6e5f -rgb565le 20757fafe4756e62d845b2ab4c0b8f93 -rgb8 e01614f5416dcc8ad365ad7a57afc9fb -rgba 53796fa4c392a1b2659595b6a284f8c4 -uyvy422 3f411f947e3ac8f842c88e717d68bd9a -yuv410p 7dcf3f4770c8b494290ceacd2c2ce6db -yuv411p 9461b188dab6f8b90d9a27e353a89f58 -yuv420p 61fffd2d8425759a33ae07e718d0242d -yuv420p10be 2abf90242cb021cb6fcf9f2c3c92f6a7 -yuv420p10le 180b7e4de684c7225d2fb37614f842cb -yuv420p12be 256c9e6cfc878a8abf681b30777c0620 -yuv420p12le 8dc8b86c4790da3769d4a62e87608623 -yuv420p14be 8d22756c5d2b9e501924c082bfb22a6c -yuv420p14le c9da19d4818bcb119ad6481b75778f7e -yuv420p16be 4ccdcca6dd6a960f9a3333f0aee095bd -yuv420p16le 9c5847d9b0de258a10ee906dc47e24ea -yuv420p9be fa7ad4f73232aac0e35def62af1e2c39 -yuv420p9le 3720ba1786b56c8f4913e67dddebbb07 -yuv422p eee223e92f1f2e5ad4186b411ebf5816 -yuv422p10be 80fa87750491dcc3e93d175b64835654 -yuv422p10le e1640cd315bd96c6b59f7753825a7306 -yuv422p12be 5c6d86e919515d1af71f8004a6252f9e -yuv422p12le 7f331cadb0ab75d07656d29f47bd8bd9 -yuv422p14be 4f4e186ba683b90fe990cccc4db7e521 -yuv422p14le d78016c9119b1f1d1c922bd5aaf47732 -yuv422p16be 1f3c216927d17966a009a42def124bba -yuv422p16le 90adbdffaeea9b09398339c8a1322b02 -yuv422p9be e46446534dd0821029d3b831c9c1d1b0 -yuv422p9le 520e418a2429f7efee511b7fcbf45ab6 -yuv440p 456d83524b299f2fa1bb988e421554d9 -yuv444p 068bc09d282d18c9fa35c2787943fc2a -yuv444p10be 9f6e1490080a454243daee9229425e1e -yuv444p10le cc183e51041351d9ac06c4df6e8ad5f7 -yuv444p12be 34f63ac6a47ac681016105d3bfb3e118 -yuv444p12le 7964701bfe8d718edf97f6e0002935bd -yuv444p14be 4ad3a9d52fe9c050150c0f7d2f3cf63d -yuv444p14le 69575e5a94b978f159c4fdb1a61587b0 -yuv444p16be 4000b12fa88ed0feef182da31c7e6b96 -yuv444p16le 96a857dba8dc6792c58daec872825b32 -yuv444p9be 07727e5c9040b7f0a17d591288ac330d -yuv444p9le 4d12d20a68dc28618594c96c2ade4ff4 -yuva420p 3a8c5c142e051367c196f95696e0e2c3 -yuva420p10be 1b7c5ec6691498e24676ce6ed97f62f8 -yuva420p10le 4c13322bca914df2727da91cca85ca1a -yuva420p16be 6afcf758f4b66c0b4173c942d42212d7 -yuva420p16le 13e195aa96329eb49921b6f9f07b875c -yuva420p9be 05a78390de312dfd21ac666a9da05fbd -yuva420p9le 78f5593bf51a31841ef83df41d0316eb -yuva422p 45ae66d6f69fd5b77e6831e98d228bf4 -yuva422p10be 18284c58b926fe2389605c692a703145 -yuva422p10le b934d28b615729a24bebf0381c465e37 -yuva422p16be c3f7354b6013b43439e02aa02be5fe69 -yuva422p16le a7ccc43820683ab15061d14cf8efce6c -yuva422p9be 14c55a16d19499b54b4341f135d3e558 -yuva422p9le a8bf168e5d2709222192d0aff46b1373 -yuva444p 86b05da54db8c7e8cf5b6638e19c6fc5 -yuva444p10be 8c417158165c00fbd42def60cbc27d69 -yuva444p10le 5f303ef3fb56faed69b4cc1c760ac6ae -yuva444p16be 52a9591ec0d5059e49b1b2803f8582aa -yuva444p16le a9272ac197e4a4195662ce90f533976c -yuva444p9be f72f646ef07cdab613420585aba041ac -yuva444p9le 6d431b0a27bf4f86ea44ef5f14247a01 -yuvj420p 73661456012f20cda81207b14bb0c0a5 -yuvj422p aa97862b57f47c5a6506156e9aaf129a -yuvj440p ff8b9884a49d546b035f5d2ac1e673df -yuvj444p b8142888d80b8065c54045839e79b331 -yuyv422 f06a4fbbdb32807d05de825daa2c3a1b diff --git a/ffmpeg/tests/ref/lavfi/pixfmts_scale b/ffmpeg/tests/ref/lavfi/pixfmts_scale deleted file mode 100644 index 9bc3ced..0000000 --- a/ffmpeg/tests/ref/lavfi/pixfmts_scale +++ /dev/null @@ -1,110 +0,0 @@ -0bgr 710350573339f608b23e5bf8ea3327d0 -0rgb ba87d80ccd24ffb20ac711511132adb8 -abgr e448ff50225b119979987e55399e49e2 -argb ef03d804e0de6315fd59e3d2edaddb9d -bgr0 93cd61cfcbef1789d2d5ccae4de75f79 -bgr24 793fc4c2b1c92ad4f7f4dca157e624d1 -bgr444be 9af6abe0bc74cdcc75b4ab2f441f5f67 -bgr444le b8c0e693ae2cbd7c03abcc3aeb4bf7b4 -bgr48be 3aa33b667b9baefe3f17ef44360688cd -bgr48le eaf353ab363fbb279fd72d6c6e3b8855 -bgr4_byte a6e269daf7085504a01113ce5e8bff57 -bgr555be 9d71206c1a5373b8978126e5f5779726 -bgr555le 025caaa21fed9d14c382cac26af778c8 -bgr565be fca6f07daf23d9dd84381dd4c9afd959 -bgr565le f524e9f16bdd68b247dbcb621e543fc0 -bgr8 68a3a395043dc57335ad1f8e891229c5 -bgra 3eaf5489b8aa13a3388aad3751b597bf -gbrp 7b83ae32c1f76bd634e50f4797a74e92 -gbrp10be 77dae432c42fad019c286753b0e4b0a8 -gbrp10le 7d3e7341423b1206e8a6a3a02b48b5d7 -gbrp12be 2c237c413e765024eb3f73d8c5e03df8 -gbrp12le 9a0c9eda1f16d640663c729d4bb88024 -gbrp14be 2b4f1928a5ef53d0a216b3b10fa11ca0 -gbrp14le 47100ec39fad45579de1dff56fe17117 -gbrp9be c345137de0aa4b0536a00009e8e11267 -gbrp9le b798662b2ba4cdf21ad6a6d4c1fe1b72 -gray 045c35e6cc7d41460f2b96b3e254deab -gray16be 70064f9acdc5e3935ccda67e765bf2fb -gray16le 578241fb43029e5ae841a3c94d940dce -monob 91ec2a25b13f6ca34d42da778b217de0 -monow a991455fda8f60f373aeb744456996b9 -nv12 0617f1e13ae4a43d4cb49282b9c02f71 -nv21 8a00d5d29766c1251eeda74c0ddee3f2 -pal8 7849884994cf99604f025b053332d08d -rgb0 6a9d26ebf674f02b5a8830583ba7a171 -rgb24 1de2978e23ad10b9b4ca2777688b4546 -rgb444be 88f534c5d07ebf5a4374484aed540893 -rgb444le c243685bfad7c243a78892a0dafe2b9f -rgb48be 874c8e2305ce9d82165ffddf2854d1f2 -rgb48le 877075f2ff2d9a0aec6fec843385f126 -rgb4_byte 4a8b119cf1996efe273302da29cbfbfb -rgb555be 8aeefa1fc4eba200abee3b1eb52186af -rgb555le 0495a7c13f9b0d0253379d5ae90cf6c4 -rgb565be 5168b66e69c25351948085e5fc51bb3a -rgb565le 301a4d41f0db3aaed341d812ed0d7927 -rgb8 8e5786e83099bc89d2e38a76e6dfcc52 -rgba de6a65b8c01bdad84e575202ca8b66a0 -uyvy422 479105bc4c7fbb4a33ca8745aa8c2de8 -yuv410p d0daa93f5cee83360e219e39563ab6da -yuv411p e5c8f3ca024a88dd07e0a92db3e2133d -yuv420p 485d9af8608f926ffffbf42230b4150d -yuv420p10be e4f12002b46549779886f27fd3c6c645 -yuv420p10le 698b7a346ae6d1315280d3e28c86b973 -yuv420p12be 10ccb1da4f69f5578e017ffdaa19adf6 -yuv420p12le 4f68fcfeee4fb70ea941979cc6a39d1f -yuv420p14be d7b1183a6ca2f5d80d1bddf609c35995 -yuv420p14le 934dbea61d804e7c66e805a45f1e3914 -yuv420p16be 6ebcf48a9317c6265430cd3ba5f569a2 -yuv420p16le 604a7215f384488a38aa0cffdbcbe17e -yuv420p9be 7b293aec92897bf0a32ec3a02a20acf9 -yuv420p9le f37fdff7d6c62ebe2ab0cf791cd049db -yuv422p b1724528079199908c667b3428a7c01c -yuv422p10be 1c7281254fb980c123148dfd145c4a05 -yuv422p10le 959caa253354e897f01848db21b8006e -yuv422p12be 9e1db2326fb3dd3a8f8d32f3a6f61305 -yuv422p12le 5a4aecf4baf74358551e75fd7f1549cd -yuv422p14be e75088b934f86ddb6a7ff1749b77687c -yuv422p14le 2cdae3e0447b35ddee6161639107205b -yuv422p16be 4ccc3e0bc94eaf3a3350e4d694c3a56c -yuv422p16le dde889032f13fa5f8d76b8484dd73116 -yuv422p9be ba5eae7669d02a13f54a592344612098 -yuv422p9le 2deb39425d924a15c8946df79ceaa579 -yuv440p 19de0ba1fd354b42189e96cdf73ef7cc -yuv444p fba8a00cd0b182af82e9de3b2f4d2c8a -yuv444p10be db89397ac4d33e66b5eab3678661f73a -yuv444p10le 28208677f07d4e4191ef228c096f3297 -yuv444p12be 55d291347d13f98b520c7d0cf7e0bdfe -yuv444p12le fd12d6054262cebda2a9b1a2ac4dac98 -yuv444p14be a078f34e001828d576e748ca0850af56 -yuv444p14le d02ba5c47b0bbb359df8ef478aa4c395 -yuv444p16be 07e27200d2f4382090ca260874f02e92 -yuv444p16le f8bac16bf1f2afbd3626e07bcc815a9f -yuv444p9be db739906e3ae3b8792cdc5a0c3387565 -yuv444p9le 693b8d30958ef1a37296b1690b4b36d2 -yuva420p df46b738bdaf30d3a7f880b5ae45b092 -yuva420p10be 8e5f3b069fdf2f0c14f49ad827991092 -yuva420p10le ce4ac1961e0466c40448353cf76b3282 -yuva420p16be aa8ca29a93936c62ef038ca8a57f47d7 -yuva420p16le ee0cbb31f9cdb897c1982df0caa8ffa0 -yuva420p9be b8ca5603123aeb953b9d4fc8ec8e35e1 -yuva420p9le 220212a81cda0f2d112f7ae96d532ff9 -yuva422p 650755270debb03d2c03b2e93b64c576 -yuva422p10be 8d077362542a73c72aadb885510ea0c7 -yuva422p10le 80f729d9f8f438d2ab87909797c27873 -yuva422p16be 0b8f9385498d2449b18fb15237b0a448 -yuva422p16le ce22b20deb93b4846a5043aa104f22d1 -yuva422p9be 822df465d12916d8852340d6b56247c8 -yuva422p9le f69c09e872838fe392dfe1825263d3f1 -yuva444p 72083e0941cc45af9f97b89d3cd16112 -yuva444p10be 42e159c62771239fa14d06a2db3b357d -yuva444p10le ee9786aee055c39da2dfbdb91ab834b5 -yuva444p16be 36a8797545163c24fc0d73f669c3108c -yuva444p16le c017c229aacb832a12c2297fb080a7a0 -yuva444p9be 8bfb5decfc8b71478b090a5b48c316c3 -yuva444p9le 2c7bfb90f7db9faab6862537801e1143 -yuvj420p 31386dce60a2dcc493da5d0ed9d880df -yuvj422p 492452e50a3fe66724840cad29be4098 -yuvj440p 7632893e81d3f4f3ace3755f97479897 -yuvj444p 389388dd5d623f660c30ab840807ce82 -yuyv422 518be9b5ac93c365c0962453770fbe73 diff --git a/ffmpeg/tests/ref/lavfi/pixfmts_super2xsai b/ffmpeg/tests/ref/lavfi/pixfmts_super2xsai deleted file mode 100644 index 964d04a..0000000 --- a/ffmpeg/tests/ref/lavfi/pixfmts_super2xsai +++ /dev/null @@ -1,14 +0,0 @@ -abgr b04e3dfb0043f6eb04a573d2d13052eb -argb 257e33717d23298430025c0665642cd5 -bgr24 3765d88f93d4ae8baa2cfbc64b0b32e1 -bgr555be 81832e6269c509be55bba49bdd0ebed5 -bgr555le 56772e91aefba4013890d156866730ce -bgr565be 0b3c420fbddcec5a420c285b3c4b8792 -bgr565le 6cbded26d2bab8204afe2115384c09a8 -bgra c81430c3d1465e37b6acaa19cc54e932 -rgb24 9899359a817e705dc5b9cc363d35a625 -rgb555be 9b60d9aa1f3c78edf9936894f37e3243 -rgb555le 917fa8565f35882404a45fee3a947bf7 -rgb565be 12edaab49440fbb3aa4c1835fd697745 -rgb565le 5bf91cb1767066f23f0c672dedb4d476 -rgba 71687289b6c3ab6fa727d468de459026 diff --git a/ffmpeg/tests/ref/lavfi/pixfmts_vflip b/ffmpeg/tests/ref/lavfi/pixfmts_vflip deleted file mode 100644 index 7990c3e..0000000 --- a/ffmpeg/tests/ref/lavfi/pixfmts_vflip +++ /dev/null @@ -1,110 +0,0 @@ -0bgr 30d1f7d7081c012556da0373e6d389ee -0rgb 66cd838e9c19f750c61efd73f66c42ac -abgr e6cc18ed21293e455d1dc63f9e1645e4 -argb b5383d783698a0b3d753d01f2498e490 -bgr0 f99729e70a94d1c278c292a7acdddae5 -bgr24 c48ec71c68a9840572a548c2ad141028 -bgr444be ab9253d2f836f58ff8f3f2b4ec76abdc -bgr444le b1bd8245a286b615e75e10d34fda4e62 -bgr48be b5355b4fa578b9422288507cf7fba2b6 -bgr48le 11dc232500b6339f58a9981f46d1d7a9 -bgr4_byte 531fd9a2249a213c89b1afc9788d070e -bgr555be 54ba55dc1dcc5a7f27f2727976be6583 -bgr555le a45c637fe5ce84b238b1e6f66fc8c852 -bgr565be 7100c2ddfee42e7efafec1ccefecf7c6 -bgr565le 9fab295d966386d4ef99d5b43066da47 -bgr8 275ce12eeb05de67a6915f67cbb43ce5 -bgra d29c35871248c476c366e678db580982 -gbrp 7852e9bbe52cfad9bab8081a5c7a5a31 -gbrp10be f591c6c98396baf3242837827081f2f7 -gbrp10le c5edb9bb566edbc8c478595ac6ab070f -gbrp12be c61c19ad1bcca18719dd071e2cb77287 -gbrp12le 334a6c802ae0e15d9e0950c27ce4a457 -gbrp14be e24459d3b4a1e9c56ec3658c525b7a32 -gbrp14le 99207ef7c7dcb1d1369dc3fe3b5dc261 -gbrp9be 1daea1677f8a62c5a1ef8959c5e0e4b0 -gbrp9le e3cca50b844e7dd326eadf6e38fab84b -gray a53528cdf80ed31c9897042a2ea16618 -gray16be 9b23f3e79c54a6ccb62e0135a32e3045 -gray16le 93cfa8fbb2a86ead275ce1817444e6d5 -monob c395a8efb9477b4ec53a77326e41ccd7 -monow efaee1c763ccd5ce1a8519d2ed5aa5a9 -nv12 77373304a9c732b65dab0a33afba9295 -nv21 1e70b3ce8be75f91f465a6d62df550c3 -pal8 be51ffaaad8e8428f2ce1e10d5729d3d -rgb0 84a83e576fc59ffd1ac5549fd7aa0023 -rgb24 a00171a51cbbdcc61ecbd0198b2e2513 -rgb444be 09a819863d3fe75518376cdac01c069f -rgb444le 4ab35fc85b8550be2a9b96dec9bf7306 -rgb48be 97a30a902d26b4840235926dae9028dd -rgb48le 82b33a864bab70d5463d57eaf693e78c -rgb4_byte afbfab537406988eab7460ec748a0389 -rgb555be 95e417e9429622245e2d2e0b1c3ab3e4 -rgb555le e4b35d8e9c1710f6d051fb4bda8700cc -rgb565be c70d86afbd68a073f2d4fe0eee3a9832 -rgb565le 991576c5d3308a73068a826543b3e7af -rgb8 42230235c5a2a66c0f9a2fcd20f9f5cd -rgba a6973a2940a378d2a8284194da26eec0 -uyvy422 21c48162379321bb83ec2399535f9253 -yuv410p 8699f50c04f8ac931aa5a8306827364b -yuv411p 47af34559b92b68851df4c2b170f7736 -yuv420p c59b35b82b5a195128736021913b35a4 -yuv420p10be fc5eed1744cdd033728362772a450e32 -yuv420p10le 141e6b39adac979765c846f3a5a8293c -yuv420p12be 0e0145d3592d56362c1bcc62cbd78a78 -yuv420p12le 8c3a2b27126df203786d4e05fd79e269 -yuv420p14be 6a11c75aa378f9628cd8fc3339474e68 -yuv420p14le e8b683876508bc0371582e2b8c0eb191 -yuv420p16be c467fae3a1936f3f91c19dd1c0c63e49 -yuv420p16le 87f09595ac106e694c538382179bfcc5 -yuv420p9be 31bc440f64fdd8d9e7cba897881345ec -yuv420p9le c6fed3016f03c49aa01bdcd63f846d3a -yuv422p 5e48541d3e659046ac0e1eacb038485f -yuv422p10be 9097b4d06f1fc598375b7c6480a2ba50 -yuv422p10le da7bd36f65cac06bd54bc9857493d835 -yuv422p12be 9c0fd650ec9872fbe06e82dc41a7399f -yuv422p12le 3bdb982268c06b8876e206d8b89b4583 -yuv422p14be bb0fc25212c2aa9f273aad2d562c3384 -yuv422p14le 1f89e82da25ce459db456ed27631054f -yuv422p16be 95ed65e718929dbeb5092bf0d852026d -yuv422p16le c62e554dde4a170177bec2efc3f4f1a2 -yuv422p9be b249cd58eaab5ccac6bae3e184774362 -yuv422p9le 696fc2a55f155edaaa9fc289574b2bb8 -yuv440p fca8395b7e43e2d0f38dd6ba822ef747 -yuv444p 1ef971a434c53e81c578e3c7cb9cbcad -yuv444p10be 3114a7469c2b9c440a9a9ccbd6e167d6 -yuv444p10le 34cb8774a1eb627b5f32825ac7d0ae9a -yuv444p12be 2fd83655c3223d176243d7ff871df3cc -yuv444p12le cfec541fde2894656f6b3401177b7604 -yuv444p14be 11671a128afd177e5eda13bd2e93ac26 -yuv444p14le 5aefe5d3f78e4f3b86ed7041a20f9b8e -yuv444p16be 35340098dc6956c34afce17bc6ffcedd -yuv444p16le 201e3acfa6f7628dfe2a1663de1128b1 -yuv444p9be 6143c321929ade9e0bc93ddea926e936 -yuv444p9le e43ba2026848ec803fabf74d77c10125 -yuva420p dc8fd115eaf203a3eac351b92a7d8f18 -yuva420p10be b3aaa8a5c9b9c3c9d66053159af3ec99 -yuva420p10le f7a8ae85fcac45db1f1689a1ab7cc63e -yuva420p16be b5c54895e87521f65a298d33bab5eb08 -yuva420p16le 95e208bc6644e23a2126ac5fca085f06 -yuva420p9be 1ba55d16f060bf54698dd7200523b44f -yuva420p9le 4b57b8bd1534743f6740502c74bef385 -yuva422p 6091f9c62a121c09eadb02e9173b2da2 -yuva422p10be a6e8352978f263ea89e63ad06a9339b1 -yuva422p10le ee39cfa1d29c294dc096f739bf454478 -yuva422p16be 3fa019b3d5e6dcb7c8e338837b9cffe1 -yuva422p16le 871f244989e14f5d3eda45abb6b3dfd1 -yuva422p9be 923c816778f782ff8a56bcd1b14ef08d -yuva422p9le bd882d40af0369d9ef7891c8e7891024 -yuva444p 9a55e83047abcc7a709f20805070135e -yuva444p10be 6258901ef2ddfdb526a1038d92e8b63c -yuva444p10le 24b8ef0f63e60f0f0a4d47a5870ad773 -yuva444p16be 4699a802e8ea3e74e968122980c0b0b0 -yuva444p16le 6f54a8cff38c54a235b92a0f1314e0aa -yuva444p9be 7472bb4b0c774d5d741035086d5e4330 -yuva444p9le ae11ddd5a3e8d69a36989f6f2a8897a1 -yuvj420p 200b0332de9944e76c94d2e0699a5a2d -yuvj422p a19a89ef145305cf224ef5aa247d075a -yuvj440p 4240c9348d28af5f3edd0e642002bd2c -yuvj444p 9e11298ba9c4faae0f5c81420d2123f2 -yuyv422 867fff568fa4170503779c48e5f25e6e diff --git a/ffmpeg/tests/ref/lavfi/pp b/ffmpeg/tests/ref/lavfi/pp deleted file mode 100644 index 1f7efef..0000000 --- a/ffmpeg/tests/ref/lavfi/pp +++ /dev/null @@ -1 +0,0 @@ -pp 62a6acf1969155f29249fd0757540f9f diff --git a/ffmpeg/tests/ref/lavfi/pp2 b/ffmpeg/tests/ref/lavfi/pp2 deleted file mode 100644 index b32bd1a..0000000 --- a/ffmpeg/tests/ref/lavfi/pp2 +++ /dev/null @@ -1 +0,0 @@ -pp2 efcfe545df8f869e3a93ae25a3e08967 diff --git a/ffmpeg/tests/ref/lavfi/pp3 b/ffmpeg/tests/ref/lavfi/pp3 deleted file mode 100644 index ccf2eeb..0000000 --- a/ffmpeg/tests/ref/lavfi/pp3 +++ /dev/null @@ -1 +0,0 @@ -pp3 39af1a30d0ea0e906df264773adfcaa6 diff --git a/ffmpeg/tests/ref/lavfi/pp4 b/ffmpeg/tests/ref/lavfi/pp4 deleted file mode 100644 index 0557ca6..0000000 --- a/ffmpeg/tests/ref/lavfi/pp4 +++ /dev/null @@ -1 +0,0 @@ -pp4 d79a3727359f62747edb82cc92ed040b diff --git a/ffmpeg/tests/ref/lavfi/pp5 b/ffmpeg/tests/ref/lavfi/pp5 deleted file mode 100644 index 4265566..0000000 --- a/ffmpeg/tests/ref/lavfi/pp5 +++ /dev/null @@ -1 +0,0 @@ -pp5 5dc5a1f0c67d8a78e32cf50f47d1b27f diff --git a/ffmpeg/tests/ref/lavfi/pp6 b/ffmpeg/tests/ref/lavfi/pp6 deleted file mode 100644 index ca40024..0000000 --- a/ffmpeg/tests/ref/lavfi/pp6 +++ /dev/null @@ -1 +0,0 @@ -pp6 40fb584b10082dff87fb947a1bccdbef diff --git a/ffmpeg/tests/ref/lavfi/scale200 b/ffmpeg/tests/ref/lavfi/scale200 deleted file mode 100644 index f267522..0000000 --- a/ffmpeg/tests/ref/lavfi/scale200 +++ /dev/null @@ -1 +0,0 @@ -scale200 e84ce966038a9f8f915704959f64278d diff --git a/ffmpeg/tests/ref/lavfi/scale500 b/ffmpeg/tests/ref/lavfi/scale500 deleted file mode 100644 index ec4a699..0000000 --- a/ffmpeg/tests/ref/lavfi/scale500 +++ /dev/null @@ -1 +0,0 @@ -scale500 24e89b23ba4286162c2026181db8d2b7 diff --git a/ffmpeg/tests/ref/lavfi/scalenorm b/ffmpeg/tests/ref/lavfi/scalenorm deleted file mode 100644 index 6df4bb8..0000000 --- a/ffmpeg/tests/ref/lavfi/scalenorm +++ /dev/null @@ -1 +0,0 @@ -scalenorm cad5d7b40b213deecc1d156cf45fc70d diff --git a/ffmpeg/tests/ref/lavfi/select b/ffmpeg/tests/ref/lavfi/select deleted file mode 100644 index a9d2be0..0000000 --- a/ffmpeg/tests/ref/lavfi/select +++ /dev/null @@ -1 +0,0 @@ -select 7975bb8d0e326af9369379927324f1a6 diff --git a/ffmpeg/tests/ref/lavfi/setdar b/ffmpeg/tests/ref/lavfi/setdar deleted file mode 100644 index 5bc7d5d..0000000 --- a/ffmpeg/tests/ref/lavfi/setdar +++ /dev/null @@ -1 +0,0 @@ -setdar 04b06d4622b116cdae756d4b475b9d5d diff --git a/ffmpeg/tests/ref/lavfi/setsar b/ffmpeg/tests/ref/lavfi/setsar deleted file mode 100644 index 86592e8..0000000 --- a/ffmpeg/tests/ref/lavfi/setsar +++ /dev/null @@ -1 +0,0 @@ -setsar 04b06d4622b116cdae756d4b475b9d5d diff --git a/ffmpeg/tests/ref/lavfi/testsrc b/ffmpeg/tests/ref/lavfi/testsrc deleted file mode 100644 index 8e2363b..0000000 --- a/ffmpeg/tests/ref/lavfi/testsrc +++ /dev/null @@ -1 +0,0 @@ -testsrc cdac8817054b30e086d6ecabdcec5444 diff --git a/ffmpeg/tests/ref/lavfi/thumbnail b/ffmpeg/tests/ref/lavfi/thumbnail deleted file mode 100644 index 5cfbf50..0000000 --- a/ffmpeg/tests/ref/lavfi/thumbnail +++ /dev/null @@ -1 +0,0 @@ -thumbnail 33c479d5701943253df5e6adc6bc8746 diff --git a/ffmpeg/tests/ref/lavfi/tile b/ffmpeg/tests/ref/lavfi/tile deleted file mode 100644 index 376acfc..0000000 --- a/ffmpeg/tests/ref/lavfi/tile +++ /dev/null @@ -1 +0,0 @@ -tile bfd98570151154d078b14398f867f0e8 diff --git a/ffmpeg/tests/ref/lavfi/tinterlace_merge b/ffmpeg/tests/ref/lavfi/tinterlace_merge deleted file mode 100644 index 300713f..0000000 --- a/ffmpeg/tests/ref/lavfi/tinterlace_merge +++ /dev/null @@ -1,10 +0,0 @@ -gray c996e583bbc5a6f380463142eb77b7c6 -yuv410p c9bad1317b496071d6d895238638e07d -yuv420p 9794d11e59ec7bcdf9e30a433e4137b1 -yuv422p e852e61e455db8ee3981ea942d510b0f -yuv444p a38a3f65d2f358cde5e9547c897cfcd5 -yuva420p c1dc15d6ee78587d9f825acd795673d7 -yuvj420p 3ee7014727ee64b45292a4f15ba028d8 -yuvj422p 4f990d5473f15571276adb5770b3b773 -yuvj440p 9a005e8b8431aaa762fde8d942fd11a9 -yuvj444p e29bf9f42e3a3632e09df529979e0040 diff --git a/ffmpeg/tests/ref/lavfi/tinterlace_pad b/ffmpeg/tests/ref/lavfi/tinterlace_pad deleted file mode 100644 index 722ac85..0000000 --- a/ffmpeg/tests/ref/lavfi/tinterlace_pad +++ /dev/null @@ -1,10 +0,0 @@ -gray 25a7d1ccf1a06c1a8a0520c1e6cb30ff -yuv410p 17163d1b4f21d894598fc62e6aeb8141 -yuv420p f8bbae33295741c1c17d33ff8ee16f7f -yuv422p 4fa67d1580d3453942bb0950c5784f6e -yuv444p f0558305fb7ca65b5b86d3ee88c4201e -yuva420p 7c76c0ca03a62275d25e8140c68da2b9 -yuvj420p b5b7baf11946a2265fc56e48be5b0436 -yuvj422p 2e70ab700851d12a773f926bb1785235 -yuvj440p 93319f9c8a02ee793966fae40f7e42fd -yuvj444p 81a124fffe0214bee5205c90ae0dd201 diff --git a/ffmpeg/tests/ref/lavfi/transpose b/ffmpeg/tests/ref/lavfi/transpose deleted file mode 100644 index 1785e3a..0000000 --- a/ffmpeg/tests/ref/lavfi/transpose +++ /dev/null @@ -1 +0,0 @@ -transpose 75d71957db820f657ccc46c14da6c8e9 diff --git a/ffmpeg/tests/ref/lavfi/unsharp b/ffmpeg/tests/ref/lavfi/unsharp deleted file mode 100644 index ad064ae..0000000 --- a/ffmpeg/tests/ref/lavfi/unsharp +++ /dev/null @@ -1 +0,0 @@ -unsharp 7d72d2ab7b7f60159c822a097e01068b diff --git a/ffmpeg/tests/ref/lavfi/vflip b/ffmpeg/tests/ref/lavfi/vflip deleted file mode 100644 index ee49247..0000000 --- a/ffmpeg/tests/ref/lavfi/vflip +++ /dev/null @@ -1 +0,0 @@ -vflip c59b35b82b5a195128736021913b35a4 diff --git a/ffmpeg/tests/ref/lavfi/vflip_crop b/ffmpeg/tests/ref/lavfi/vflip_crop deleted file mode 100644 index 43c944a..0000000 --- a/ffmpeg/tests/ref/lavfi/vflip_crop +++ /dev/null @@ -1 +0,0 @@ -vflip_crop cd56578bb7e89ca0853467dfecab244b diff --git a/ffmpeg/tests/ref/lavfi/vflip_vflip b/ffmpeg/tests/ref/lavfi/vflip_vflip deleted file mode 100644 index f401fc7..0000000 --- a/ffmpeg/tests/ref/lavfi/vflip_vflip +++ /dev/null @@ -1 +0,0 @@ -vflip_vflip 61fffd2d8425759a33ae07e718d0242d diff --git a/ffmpeg/tests/ref/seek/acodec-mp2 b/ffmpeg/tests/ref/seek/acodec-mp2 index 8de3676..62abab4 100644 --- a/ffmpeg/tests/ref/seek/acodec-mp2 +++ b/ffmpeg/tests/ref/seek/acodec-mp2 @@ -1,6 +1,6 @@ ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 417 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 417 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 440 ret: 0 st:-1 flags:1 ts: 1.894167 ret: 0 st: 0 flags:1 dts: 1.880816 pts: 1.880816 pos: 30093 size: 418 ret: 0 st: 0 flags:0 ts: 0.788334 @@ -18,7 +18,7 @@ ret: 0 st: 0 flags:1 dts: 2.168163 pts: 2.168163 pos: 34690 size: 418 ret: 0 st:-1 flags:1 ts: 1.047503 ret: 0 st: 0 flags:1 dts: 1.044898 pts: 1.044898 pos: 16718 size: 418 ret: 0 st: 0 flags:0 ts:-0.058330 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 417 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 440 ret: 0 st: 0 flags:1 ts: 2.835837 ret: 0 st: 0 flags:1 dts: 2.821224 pts: 2.821224 pos: 45139 size: 418 ret: 0 st:-1 flags:0 ts: 1.730004 @@ -26,7 +26,7 @@ ret: 0 st: 0 flags:1 dts: 1.750204 pts: 1.750204 pos: 28003 size: 418 ret: 0 st:-1 flags:1 ts: 0.624171 ret: 0 st: 0 flags:1 dts: 0.600816 pts: 0.600816 pos: 9613 size: 418 ret: 0 st: 0 flags:0 ts:-0.481662 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 417 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 440 ret: 0 st: 0 flags:1 ts: 2.412505 ret: 0 st: 0 flags:1 dts: 2.403265 pts: 2.403265 pos: 38452 size: 418 ret: 0 st:-1 flags:0 ts: 1.306672 @@ -34,7 +34,7 @@ ret: 0 st: 0 flags:1 dts: 1.332245 pts: 1.332245 pos: 21315 size: 418 ret: 0 st:-1 flags:1 ts: 0.200839 ret: 0 st: 0 flags:1 dts: 0.182857 pts: 0.182857 pos: 2925 size: 418 ret: 0 st: 0 flags:0 ts:-0.904994 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 417 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 440 ret: 0 st: 0 flags:1 ts: 1.989173 ret: 0 st: 0 flags:1 dts: 1.985306 pts: 1.985306 pos: 31764 size: 418 ret: 0 st:-1 flags:0 ts: 0.883340 diff --git a/ffmpeg/tests/ref/seek/lavf-alaw b/ffmpeg/tests/ref/seek/lavf-alaw index 84661ec..4b1f8fb 100644 --- a/ffmpeg/tests/ref/seek/lavf-alaw +++ b/ffmpeg/tests/ref/seek/lavf-alaw @@ -38,7 +38,7 @@ ret: 0 st: 0 flags:1 dts: 0.200816 pts: 0.200816 pos: 4428 size: 1024 ret: 0 st: 0 flags:0 ts:-0.904989 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 1024 ret: 0 st: 0 flags:1 ts: 1.989161 -ret: 0 st: 0 flags:1 dts: 1.989161 pts: 1.989161 pos: 43861 size: 1024 +ret: 0 st: 0 flags:1 dts: 1.989161 pts: 1.989161 pos: 43861 size: 239 ret: 0 st:-1 flags:0 ts: 0.883340 ret: 0 st: 0 flags:1 dts: 0.883356 pts: 0.883356 pos: 19478 size: 1024 ret: 0 st:-1 flags:1 ts:-0.222493 diff --git a/ffmpeg/tests/ref/seek/lavf-gif b/ffmpeg/tests/ref/seek/lavf-gif index 0a2d1b3..9ce8308 100644 --- a/ffmpeg/tests/ref/seek/lavf-gif +++ b/ffmpeg/tests/ref/seek/lavf-gif @@ -1,40 +1,40 @@ -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:117024 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 81501 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:117024 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 81501 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:117024 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 81501 ret:-1 st: 0 flags:0 ts: 0.790000 ret:-1 st: 0 flags:1 ts:-0.320000 ret:-1 st:-1 flags:0 ts: 2.576668 ret: 0 st:-1 flags:1 ts: 1.470835 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:117024 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 81501 ret:-1 st: 0 flags:0 ts: 0.370000 ret:-1 st: 0 flags:1 ts:-0.740000 ret:-1 st:-1 flags:0 ts: 2.153336 ret: 0 st:-1 flags:1 ts: 1.047503 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:117024 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 81501 ret: 0 st: 0 flags:0 ts:-0.060000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:117024 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 81501 ret: 0 st: 0 flags:1 ts: 2.840000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:117024 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 81501 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.000000 pts: 0.000000 pos: 0 size:117024 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 81501 ret: 0 st: 0 flags:0 ts:-0.480000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:117024 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 81501 ret: 0 st: 0 flags:1 ts: 2.410000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:117024 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 81501 ret:-1 st:-1 flags:0 ts: 1.306672 ret: 0 st:-1 flags:1 ts: 0.200839 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:117024 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 81501 ret: 0 st: 0 flags:0 ts:-0.900000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:117024 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 81501 ret: 0 st: 0 flags:1 ts: 1.990000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:117024 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 81501 ret:-1 st:-1 flags:0 ts: 0.883340 ret:-1 st:-1 flags:1 ts:-0.222493 ret:-1 st: 0 flags:0 ts: 2.670000 ret: 0 st: 0 flags:1 ts: 1.570000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size:117024 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 81501 ret:-1 st:-1 flags:0 ts: 0.460008 ret:-1 st:-1 flags:1 ts:-0.645825 diff --git a/ffmpeg/tests/ref/seek/lavf-mkv b/ffmpeg/tests/ref/seek/lavf-mkv index 681462c..bf6cab0 100644 --- a/ffmpeg/tests/ref/seek/lavf-mkv +++ b/ffmpeg/tests/ref/seek/lavf-mkv @@ -1,48 +1,48 @@ -ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 555 size: 208 +ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 537 size: 208 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 771 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 753 size: 27837 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292185 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292167 size: 27834 ret: 0 st: 0 flags:0 ts: 0.788000 -ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292185 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292167 size: 27834 ret: 0 st: 0 flags:1 ts:-0.317000 -ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 771 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 753 size: 27837 ret:-1 st: 1 flags:0 ts: 2.577000 ret: 0 st: 1 flags:1 ts: 1.471000 -ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320026 size: 209 +ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320008 size: 209 ret: 0 st:-1 flags:0 ts: 0.365002 -ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146738 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146720 size: 27925 ret: 0 st:-1 flags:1 ts:-0.740831 -ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 771 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 753 size: 27837 ret:-1 st: 0 flags:0 ts: 2.153000 ret: 0 st: 0 flags:1 ts: 1.048000 -ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292185 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292167 size: 27834 ret: 0 st: 1 flags:0 ts:-0.058000 -ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 555 size: 208 +ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 537 size: 208 ret: 0 st: 1 flags:1 ts: 2.836000 -ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320026 size: 209 +ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320008 size: 209 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.491000 pts: 0.491000 pos: 146738 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146720 size: 27925 ret: 0 st: 0 flags:0 ts:-0.482000 -ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 771 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 753 size: 27837 ret: 0 st: 0 flags:1 ts: 2.413000 -ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292185 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292167 size: 27834 ret:-1 st: 1 flags:0 ts: 1.307000 ret: 0 st: 1 flags:1 ts: 0.201000 -ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 555 size: 208 +ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 537 size: 208 ret: 0 st:-1 flags:0 ts:-0.904994 -ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 771 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 753 size: 27837 ret: 0 st:-1 flags:1 ts: 1.989173 -ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292185 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292167 size: 27834 ret: 0 st: 0 flags:0 ts: 0.883000 -ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292185 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292167 size: 27834 ret: 0 st: 0 flags:1 ts:-0.222000 -ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 771 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 753 size: 27837 ret:-1 st: 1 flags:0 ts: 2.672000 ret: 0 st: 1 flags:1 ts: 1.566000 -ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320026 size: 209 +ret: 0 st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320008 size: 209 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146738 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146720 size: 27925 ret: 0 st:-1 flags:1 ts:-0.645825 -ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 771 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos: 753 size: 27837 diff --git a/ffmpeg/tests/ref/seek/lavf-mov b/ffmpeg/tests/ref/seek/lavf-mov index 9563a0d..93a9a23 100644 --- a/ffmpeg/tests/ref/seek/lavf-mov +++ b/ffmpeg/tests/ref/seek/lavf-mov @@ -1,48 +1,48 @@ -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1739 size: 27837 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1739 size: 27837 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326931 size: 1024 +ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326943 size: 1024 ret: 0 st: 0 flags:0 ts: 0.788359 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327955 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327967 size: 27834 ret: 0 st: 0 flags:1 ts:-0.317500 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1739 size: 27837 ret:-1 st: 1 flags:0 ts: 2.576667 ret: 0 st: 1 flags:1 ts: 1.470839 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327955 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327967 size: 27834 ret: 0 st:-1 flags:0 ts: 0.365002 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 165209 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 165221 size: 27925 ret: 0 st:-1 flags:1 ts:-0.740831 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1739 size: 27837 ret:-1 st: 0 flags:0 ts: 2.153359 ret: 0 st: 0 flags:1 ts: 1.047500 -ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326931 size: 1024 +ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326943 size: 1024 ret: 0 st: 1 flags:0 ts:-0.058322 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1739 size: 27837 ret: 0 st: 1 flags:1 ts: 2.835828 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327955 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327967 size: 27834 ret:-1 st:-1 flags:0 ts: 1.730004 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 1 flags:1 dts: 0.464399 pts: 0.464399 pos: 164185 size: 1024 +ret: 0 st: 1 flags:1 dts: 0.464399 pts: 0.464399 pos: 164197 size: 1024 ret: 0 st: 0 flags:0 ts:-0.481641 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1739 size: 27837 ret: 0 st: 0 flags:1 ts: 2.412500 -ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326931 size: 1024 +ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326943 size: 1024 ret:-1 st: 1 flags:0 ts: 1.306667 ret: 0 st: 1 flags:1 ts: 0.200839 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1739 size: 27837 ret: 0 st:-1 flags:0 ts:-0.904994 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1739 size: 27837 ret: 0 st:-1 flags:1 ts: 1.989173 -ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326931 size: 1024 +ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326943 size: 1024 ret: 0 st: 0 flags:0 ts: 0.883359 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327955 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327967 size: 27834 ret: 0 st: 0 flags:1 ts:-0.222500 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1739 size: 27837 ret:-1 st: 1 flags:0 ts: 2.671678 ret: 0 st: 1 flags:1 ts: 1.565850 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327955 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327967 size: 27834 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 165209 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 165221 size: 27925 ret: 0 st:-1 flags:1 ts:-0.645825 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1739 size: 27837 diff --git a/ffmpeg/tests/ref/seek/lavf-mulaw b/ffmpeg/tests/ref/seek/lavf-mulaw index 84661ec..4b1f8fb 100644 --- a/ffmpeg/tests/ref/seek/lavf-mulaw +++ b/ffmpeg/tests/ref/seek/lavf-mulaw @@ -38,7 +38,7 @@ ret: 0 st: 0 flags:1 dts: 0.200816 pts: 0.200816 pos: 4428 size: 1024 ret: 0 st: 0 flags:0 ts:-0.904989 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 0 size: 1024 ret: 0 st: 0 flags:1 ts: 1.989161 -ret: 0 st: 0 flags:1 dts: 1.989161 pts: 1.989161 pos: 43861 size: 1024 +ret: 0 st: 0 flags:1 dts: 1.989161 pts: 1.989161 pos: 43861 size: 239 ret: 0 st:-1 flags:0 ts: 0.883340 ret: 0 st: 0 flags:1 dts: 0.883356 pts: 0.883356 pos: 19478 size: 1024 ret: 0 st:-1 flags:1 ts:-0.222493 diff --git a/ffmpeg/tests/ref/seek/lavf-ts b/ffmpeg/tests/ref/seek/lavf-ts index 407ba59..e57651e 100644 --- a/ffmpeg/tests/ref/seek/lavf-ts +++ b/ffmpeg/tests/ref/seek/lavf-ts @@ -1,53 +1,53 @@ -ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801 +ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size: 24801 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801 +ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size: 24801 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:0 dts: 1.880000 pts: 1.920000 pos: 216388 size: 17440 +ret: 0 st: 0 flags:1 dts: 1.880000 pts: 1.920000 pos: 189692 size: 24786 ret: 0 st: 0 flags:0 ts: 0.788333 -ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801 +ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size: 24801 ret: 0 st: 0 flags:1 ts:-0.317500 -ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801 +ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size: 24801 ret: 0 st: 1 flags:0 ts: 2.576667 -ret: 0 st: 1 flags:1 dts: 2.120522 pts: 2.120522 pos: 404576 size: 209 +ret: 0 st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 404576 size: 209 ret: 0 st: 1 flags:1 ts: 1.470833 -ret: 0 st: 1 flags:1 dts: 1.389089 pts: 1.389089 pos: 159988 size: 208 +ret: 0 st: 1 flags:1 dts: 1.429089 pts: 1.429089 pos: 159988 size: 208 ret: 0 st:-1 flags:0 ts: 0.365002 -ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801 +ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size: 24801 ret: 0 st:-1 flags:1 ts:-0.740831 -ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801 +ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size: 24801 ret: 0 st: 0 flags:0 ts: 2.153333 -ret: 0 st: 0 flags:0 dts: 2.160000 pts: 2.200000 pos: 325992 size: 12692 +ret: 0 st: 1 flags:1 dts: 1.794811 pts: 1.794811 pos: 322608 size: 209 ret: 0 st: 0 flags:1 ts: 1.047500 -ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801 +ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size: 24801 ret: 0 st: 1 flags:0 ts:-0.058333 -ret: 0 st: 1 flags:1 dts: 1.389089 pts: 1.389089 pos: 159988 size: 208 +ret: 0 st: 1 flags:1 dts: 1.429089 pts: 1.429089 pos: 159988 size: 208 ret: 0 st: 1 flags:1 ts: 2.835833 -ret: 0 st: 1 flags:1 dts: 2.120522 pts: 2.120522 pos: 404576 size: 209 +ret: 0 st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 404576 size: 209 ret: 0 st:-1 flags:0 ts: 1.730004 -ret: 0 st: 0 flags:0 dts: 1.760000 pts: 1.800000 pos: 162996 size: 12135 +ret: 0 st: 1 flags:1 dts: 1.429089 pts: 1.429089 pos: 159988 size: 208 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801 +ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size: 24801 ret: 0 st: 0 flags:0 ts:-0.481667 -ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801 +ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size: 24801 ret: 0 st: 0 flags:1 ts: 2.412500 -ret: 0 st: 1 flags:1 dts: 2.120522 pts: 2.120522 pos: 404576 size: 209 +ret: 0 st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 404576 size: 209 ret: 0 st: 1 flags:0 ts: 1.306667 -ret: 0 st: 1 flags:1 dts: 1.389089 pts: 1.389089 pos: 159988 size: 208 +ret: 0 st: 1 flags:1 dts: 1.429089 pts: 1.429089 pos: 159988 size: 208 ret: 0 st: 1 flags:1 ts: 0.200844 -ret: 0 st: 1 flags:1 dts: 1.389089 pts: 1.389089 pos: 159988 size: 208 +ret: 0 st: 1 flags:1 dts: 1.429089 pts: 1.429089 pos: 159988 size: 208 ret: 0 st:-1 flags:0 ts:-0.904994 -ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801 +ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size: 24801 ret: 0 st:-1 flags:1 ts: 1.989173 -ret: 0 st: 0 flags:0 dts: 1.960000 pts: 2.000000 pos: 251356 size: 13449 +ret: 0 st: 0 flags:0 dts: 1.960000 pts: 2.000000 pos: 235000 size: 15019 ret: 0 st: 0 flags:0 ts: 0.883344 -ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801 +ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size: 24801 ret: 0 st: 0 flags:1 ts:-0.222489 -ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801 +ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size: 24801 ret: 0 st: 1 flags:0 ts: 2.671678 -ret: 0 st: 1 flags:1 dts: 2.120522 pts: 2.120522 pos: 404576 size: 209 +ret: 0 st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 404576 size: 209 ret: 0 st: 1 flags:1 ts: 1.565844 -ret: 0 st: 1 flags:1 dts: 1.389089 pts: 1.389089 pos: 159988 size: 208 +ret: 0 st: 1 flags:1 dts: 1.429089 pts: 1.429089 pos: 159988 size: 208 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801 +ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size: 24801 ret: 0 st:-1 flags:1 ts:-0.645825 -ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801 +ret: 0 st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos: 564 size: 24801 diff --git a/ffmpeg/tests/ref/seek/lavf-wtv b/ffmpeg/tests/ref/seek/lavf-wtv index 67def8a..2808c10 100644 --- a/ffmpeg/tests/ref/seek/lavf-wtv +++ b/ffmpeg/tests/ref/seek/lavf-wtv @@ -1,48 +1,48 @@ -ret: 0 st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos: 26344 size: 208 +ret: 0 st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos: 26288 size: 208 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos: 26344 size: 208 +ret: 0 st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos: 26288 size: 208 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 1 flags:1 dts: 0.694399 pts: 0.694399 pos: 294744 size: 209 +ret: 0 st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294688 size: 209 ret: 0 st: 0 flags:0 ts: 0.788334 -ret: 0 st: 1 flags:1 dts: 0.694399 pts: 0.694399 pos: 294744 size: 209 +ret: 0 st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294688 size: 209 ret: 0 st: 0 flags:1 ts:-0.317499 -ret: 0 st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos: 26344 size: 208 +ret: 0 st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos: 26288 size: 208 ret:-1 st: 1 flags:0 ts: 2.576668 ret: 0 st: 1 flags:1 ts: 1.470835 -ret: 0 st: 1 flags:1 dts: 0.694399 pts: 0.694399 pos: 294744 size: 209 +ret: 0 st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294688 size: 209 ret: 0 st:-1 flags:0 ts: 0.365002 -ret: 0 st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos: 26344 size: 208 +ret: 0 st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos: 26288 size: 208 ret: 0 st:-1 flags:1 ts:-0.740831 -ret: 0 st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos: 26344 size: 208 +ret: 0 st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos: 26288 size: 208 ret:-1 st: 0 flags:0 ts: 2.153336 ret: 0 st: 0 flags:1 ts: 1.047503 -ret: 0 st: 1 flags:1 dts: 0.694399 pts: 0.694399 pos: 294744 size: 209 +ret: 0 st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos: 26288 size: 208 ret: 0 st: 1 flags:0 ts:-0.058330 -ret: 0 st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos: 26344 size: 208 +ret: 0 st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos: 26288 size: 208 ret: 0 st: 1 flags:1 ts: 2.835837 -ret: 0 st: 1 flags:1 dts: 0.694399 pts: 0.694399 pos: 294744 size: 209 +ret: 0 st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294688 size: 209 ret:-1 st:-1 flags:0 ts: 1.730004 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos: 26344 size: 208 +ret: 0 st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos: 26288 size: 208 ret: 0 st: 0 flags:0 ts:-0.481662 -ret: 0 st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos: 26344 size: 208 +ret: 0 st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos: 26288 size: 208 ret: 0 st: 0 flags:1 ts: 2.412505 -ret: 0 st: 1 flags:1 dts: 0.694399 pts: 0.694399 pos: 294744 size: 209 +ret: 0 st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294688 size: 209 ret:-1 st: 1 flags:0 ts: 1.306672 ret: 0 st: 1 flags:1 ts: 0.200839 -ret: 0 st: 1 flags:1 dts: 0.224195 pts: 0.224195 pos: 112904 size: 209 +ret: 0 st: 1 flags:1 dts: 0.211950 pts: 0.211950 pos: 99296 size: 209 ret: 0 st:-1 flags:0 ts:-0.904994 -ret: 0 st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos: 26344 size: 208 +ret: 0 st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos: 26288 size: 208 ret: 0 st:-1 flags:1 ts: 1.989173 -ret: 0 st: 1 flags:1 dts: 0.694399 pts: 0.694399 pos: 294744 size: 209 +ret: 0 st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294688 size: 209 ret: 0 st: 0 flags:0 ts: 0.883340 -ret: 0 st: 1 flags:1 dts: 0.694399 pts: 0.694399 pos: 294744 size: 209 +ret: 0 st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294688 size: 209 ret: 0 st: 0 flags:1 ts:-0.222493 -ret: 0 st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos: 26344 size: 208 +ret: 0 st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos: 26288 size: 208 ret:-1 st: 1 flags:0 ts: 2.671674 ret: 0 st: 1 flags:1 ts: 1.565841 -ret: 0 st: 1 flags:1 dts: 0.694399 pts: 0.694399 pos: 294744 size: 209 +ret: 0 st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294688 size: 209 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos: 26344 size: 208 +ret: 0 st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos: 26288 size: 208 ret: 0 st:-1 flags:1 ts:-0.645825 -ret: 0 st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos: 26344 size: 208 +ret: 0 st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos: 26288 size: 208 diff --git a/ffmpeg/tests/ref/seek/vsynth2-ffv1 b/ffmpeg/tests/ref/seek/vsynth2-ffv1 index 715a272..84e7436 100644 --- a/ffmpeg/tests/ref/seek/vsynth2-ffv1 +++ b/ffmpeg/tests/ref/seek/vsynth2-ffv1 @@ -1,46 +1,46 @@ -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5688 size: 71679 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5690 size: 71707 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5688 size: 71679 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5690 size: 71707 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:2498334 size: 75937 +ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:2499438 size: 75965 ret: 0 st: 0 flags:0 ts: 0.800000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:1630830 size: 72682 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:1631570 size: 72710 ret:-1 st: 0 flags:1 ts:-0.320000 ret:-1 st:-1 flags:0 ts: 2.576668 ret: 0 st:-1 flags:1 ts: 1.470835 -ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:2498334 size: 75937 +ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:2499438 size: 75965 ret: 0 st: 0 flags:0 ts: 0.360000 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 801262 size: 69457 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 801634 size: 69485 ret:-1 st: 0 flags:1 ts:-0.760000 ret:-1 st:-1 flags:0 ts: 2.153336 ret: 0 st:-1 flags:1 ts: 1.047503 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:1630830 size: 72682 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:1631570 size: 72710 ret: 0 st: 0 flags:0 ts:-0.040000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5688 size: 71679 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5690 size: 71707 ret: 0 st: 0 flags:1 ts: 2.840000 -ret: 0 st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:3392418 size: 77461 +ret: 0 st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:3393890 size: 77489 ret: 0 st:-1 flags:0 ts: 1.730004 -ret: 0 st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:3392418 size: 77461 +ret: 0 st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:3393890 size: 77489 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 801262 size: 69457 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 801634 size: 69485 ret: 0 st: 0 flags:0 ts:-0.480000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5688 size: 71679 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5690 size: 71707 ret: 0 st: 0 flags:1 ts: 2.400000 -ret: 0 st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:3392418 size: 77461 +ret: 0 st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:3393890 size: 77489 ret: 0 st:-1 flags:0 ts: 1.306672 -ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:2498334 size: 75937 +ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:2499438 size: 75965 ret: 0 st:-1 flags:1 ts: 0.200839 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5688 size: 71679 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5690 size: 71707 ret: 0 st: 0 flags:0 ts:-0.920000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5688 size: 71679 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5690 size: 71707 ret: 0 st: 0 flags:1 ts: 2.000000 -ret: 0 st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:3392418 size: 77461 +ret: 0 st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:3393890 size: 77489 ret: 0 st:-1 flags:0 ts: 0.883340 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:1630830 size: 72682 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:1631570 size: 72710 ret:-1 st:-1 flags:1 ts:-0.222493 ret:-1 st: 0 flags:0 ts: 2.680000 ret: 0 st: 0 flags:1 ts: 1.560000 -ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:2498334 size: 75937 +ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:2499438 size: 75965 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 801262 size: 69457 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 801634 size: 69485 ret:-1 st:-1 flags:1 ts:-0.645825 diff --git a/ffmpeg/tests/ref/seek/vsynth2-ljpeg b/ffmpeg/tests/ref/seek/vsynth2-ljpeg index 92264c9..1ca1441 100644 --- a/ffmpeg/tests/ref/seek/vsynth2-ljpeg +++ b/ffmpeg/tests/ref/seek/vsynth2-ljpeg @@ -1,46 +1,46 @@ -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5648 size: 96069 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5648 size: 96000 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5648 size: 96069 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5648 size: 96000 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos:4481864 size: 94870 +ret: 0 st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos:4478624 size: 94801 ret: 0 st: 0 flags:0 ts: 0.800000 -ret: 0 st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:1902318 size: 95465 +ret: 0 st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:1900940 size: 95396 ret:-1 st: 0 flags:1 ts:-0.320000 ret:-1 st:-1 flags:0 ts: 2.576668 ret: 0 st:-1 flags:1 ts: 1.470835 -ret: 0 st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos:3527724 size: 95724 +ret: 0 st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos:3525172 size: 95655 ret: 0 st: 0 flags:0 ts: 0.360000 -ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos: 854944 size: 94635 +ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos: 854322 size: 94566 ret:-1 st: 0 flags:1 ts:-0.760000 ret:-1 st:-1 flags:0 ts: 2.153336 ret: 0 st:-1 flags:1 ts: 1.047503 -ret: 0 st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos:2475566 size: 95649 +ret: 0 st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos:2473776 size: 95580 ret: 0 st: 0 flags:0 ts:-0.040000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5648 size: 96069 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5648 size: 96000 ret: 0 st: 0 flags:1 ts: 2.840000 -ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:4671498 size: 94595 +ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:4668120 size: 94526 ret: 0 st:-1 flags:0 ts: 1.730004 -ret: 0 st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos:4101338 size: 95353 +ret: 0 st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos:4098374 size: 95284 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:1520284 size: 95410 +ret: 0 st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:1519182 size: 95341 ret: 0 st: 0 flags:0 ts:-0.480000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5648 size: 96069 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5648 size: 96000 ret: 0 st: 0 flags:1 ts: 2.400000 -ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:4671498 size: 94595 +ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:4668120 size: 94526 ret: 0 st:-1 flags:0 ts: 1.306672 -ret: 0 st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos:3145114 size: 95587 +ret: 0 st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos:3142838 size: 95518 ret: 0 st:-1 flags:1 ts: 0.200839 -ret: 0 st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: 477226 size: 94261 +ret: 0 st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: 476880 size: 94192 ret: 0 st: 0 flags:0 ts:-0.920000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5648 size: 96069 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5648 size: 96000 ret: 0 st: 0 flags:1 ts: 2.000000 -ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:4671498 size: 94595 +ret: 0 st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:4668120 size: 94526 ret: 0 st:-1 flags:0 ts: 0.883340 -ret: 0 st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:2093302 size: 95528 +ret: 0 st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:2091786 size: 95459 ret:-1 st:-1 flags:1 ts:-0.222493 ret:-1 st: 0 flags:0 ts: 2.680000 ret: 0 st: 0 flags:1 ts: 1.560000 -ret: 0 st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos:3719126 size: 95615 +ret: 0 st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos:3716438 size: 95546 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:1139238 size: 95032 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:1138408 size: 94963 ret:-1 st:-1 flags:1 ts:-0.645825 diff --git a/ffmpeg/tests/ref/vsynth/vsynth1-avui b/ffmpeg/tests/ref/vsynth/vsynth1-avui index e4434e8..a4937ac 100644 --- a/ffmpeg/tests/ref/vsynth/vsynth1-avui +++ b/ffmpeg/tests/ref/vsynth/vsynth1-avui @@ -1,4 +1,4 @@ -0e71be51f4e0701d91ff7fa4d9ea0533 *tests/data/fate/vsynth1-avui.mov +55af74b378fb938d5ea6e0a37c149f16 *tests/data/fate/vsynth1-avui.mov 42624917 tests/data/fate/vsynth1-avui.mov c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-avui.out.rawvideo stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/ffmpeg/tests/ref/vsynth/vsynth1-dnxhd-1080i b/ffmpeg/tests/ref/vsynth/vsynth1-dnxhd-1080i index dbe2c37..62aa0b9 100644 --- a/ffmpeg/tests/ref/vsynth/vsynth1-dnxhd-1080i +++ b/ffmpeg/tests/ref/vsynth/vsynth1-dnxhd-1080i @@ -1,4 +1,4 @@ -124c991ee3ac0caef39a58a45287a762 *tests/data/fate/vsynth1-dnxhd-1080i.mov +8d0f7b3424ada79f87053022bf888797 *tests/data/fate/vsynth1-dnxhd-1080i.mov 3031911 tests/data/fate/vsynth1-dnxhd-1080i.mov a09132c6db44f415e831dcaa630a351b *tests/data/fate/vsynth1-dnxhd-1080i.out.rawvideo stddev: 6.29 PSNR: 32.15 MAXDIFF: 64 bytes: 7603200/ 760320 diff --git a/ffmpeg/tests/ref/vsynth/vsynth1-ffv1 b/ffmpeg/tests/ref/vsynth/vsynth1-ffv1 index a162a77..22c9341 100644 --- a/ffmpeg/tests/ref/vsynth/vsynth1-ffv1 +++ b/ffmpeg/tests/ref/vsynth/vsynth1-ffv1 @@ -1,4 +1,4 @@ -d236e8441d7e04e24d882bb97faccd36 *tests/data/fate/vsynth1-ffv1.avi -2689718 tests/data/fate/vsynth1-ffv1.avi +394aa2d2ee50abbc2372e6d126c7eb5a *tests/data/fate/vsynth1-ffv1.avi +2691264 tests/data/fate/vsynth1-ffv1.avi c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-ffv1.out.rawvideo stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/ffmpeg/tests/ref/vsynth/vsynth1-j2k b/ffmpeg/tests/ref/vsynth/vsynth1-j2k deleted file mode 100644 index 1e2f3f2..0000000 --- a/ffmpeg/tests/ref/vsynth/vsynth1-j2k +++ /dev/null @@ -1,4 +0,0 @@ -e6e3d338eeb394d6fadc7bbb55fa9e6e *tests/data/fate/vsynth1-j2k.avi -2306902 tests/data/fate/vsynth1-j2k.avi -ee9b245b3b07eed90bc6f2147bbd916c *tests/data/fate/vsynth1-j2k.out.rawvideo -stddev: 5.47 PSNR: 33.37 MAXDIFF: 64 bytes: 7603200/ 7603200 diff --git a/ffmpeg/tests/ref/vsynth/vsynth1-ljpeg b/ffmpeg/tests/ref/vsynth/vsynth1-ljpeg index e229db5..7464a38 100644 --- a/ffmpeg/tests/ref/vsynth/vsynth1-ljpeg +++ b/ffmpeg/tests/ref/vsynth/vsynth1-ljpeg @@ -1,4 +1,4 @@ -2b1a2d5ad7f357df955d8548320d13f7 *tests/data/fate/vsynth1-ljpeg.avi -6312924 tests/data/fate/vsynth1-ljpeg.avi +ef0a38e7c24a4d7367a461ad8acac2c1 *tests/data/fate/vsynth1-ljpeg.avi +6309478 tests/data/fate/vsynth1-ljpeg.avi c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-ljpeg.out.rawvideo stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/ffmpeg/tests/ref/vsynth/vsynth1-mpeg4 b/ffmpeg/tests/ref/vsynth/vsynth1-mpeg4 index b6da11c..9a58987 100644 --- a/ffmpeg/tests/ref/vsynth/vsynth1-mpeg4 +++ b/ffmpeg/tests/ref/vsynth/vsynth1-mpeg4 @@ -1,4 +1,4 @@ -a2acdf772bf7b7641079d8a03ea03ccf *tests/data/fate/vsynth1-mpeg4.mp4 +a52ff2ce472737e07462d6b51673a886 *tests/data/fate/vsynth1-mpeg4.mp4 540024 tests/data/fate/vsynth1-mpeg4.mp4 f80ec173d37f2f91add031e95579a220 *tests/data/fate/vsynth1-mpeg4.out.rawvideo stddev: 7.97 PSNR: 30.10 MAXDIFF: 105 bytes: 7603200/ 7603200 diff --git a/ffmpeg/tests/ref/vsynth/vsynth1-prores b/ffmpeg/tests/ref/vsynth/vsynth1-prores index 16517ee..bc1d883 100644 --- a/ffmpeg/tests/ref/vsynth/vsynth1-prores +++ b/ffmpeg/tests/ref/vsynth/vsynth1-prores @@ -1,4 +1,4 @@ -6f7ce83099b35e5af0cf484f2e9f1f4f *tests/data/fate/vsynth1-prores.mov +176b9fa03cc0946c6a41f2dcfad46805 *tests/data/fate/vsynth1-prores.mov 5022821 tests/data/fate/vsynth1-prores.mov a2e2d1d45341a94ff994d1d92629f778 *tests/data/fate/vsynth1-prores.out.rawvideo stddev: 2.47 PSNR: 40.27 MAXDIFF: 31 bytes: 7603200/ 7603200 diff --git a/ffmpeg/tests/ref/vsynth/vsynth1-prores_kostya b/ffmpeg/tests/ref/vsynth/vsynth1-prores_kostya deleted file mode 100644 index ab6ecff..0000000 --- a/ffmpeg/tests/ref/vsynth/vsynth1-prores_kostya +++ /dev/null @@ -1,4 +0,0 @@ -36411e06db3f86ddedd6171a56784d6b *tests/data/fate/vsynth1-prores_kostya.mov -3858911 tests/data/fate/vsynth1-prores_kostya.mov -0a4153637d0cc0a88a8bcbf04cfaf8c6 *tests/data/fate/vsynth1-prores_kostya.out.rawvideo -stddev: 3.17 PSNR: 38.09 MAXDIFF: 39 bytes: 7603200/ 7603200 diff --git a/ffmpeg/tests/ref/vsynth/vsynth1-qtrle b/ffmpeg/tests/ref/vsynth/vsynth1-qtrle index 9bd79cc..25d61ce 100644 --- a/ffmpeg/tests/ref/vsynth/vsynth1-qtrle +++ b/ffmpeg/tests/ref/vsynth/vsynth1-qtrle @@ -1,4 +1,4 @@ -4eaa59011403ce3e53f8abb5cf6d26e5 *tests/data/fate/vsynth1-qtrle.mov +d909610eb8ad5250a73f0be4c9c29b82 *tests/data/fate/vsynth1-qtrle.mov 15263158 tests/data/fate/vsynth1-qtrle.mov 93695a27c24a61105076ca7b1f010bbd *tests/data/fate/vsynth1-qtrle.out.rawvideo stddev: 3.42 PSNR: 37.44 MAXDIFF: 48 bytes: 7603200/ 7603200 diff --git a/ffmpeg/tests/ref/vsynth/vsynth1-qtrlegray b/ffmpeg/tests/ref/vsynth/vsynth1-qtrlegray index 425c11f..3aaba24 100644 --- a/ffmpeg/tests/ref/vsynth/vsynth1-qtrlegray +++ b/ffmpeg/tests/ref/vsynth/vsynth1-qtrlegray @@ -1,4 +1,4 @@ -d010ff7be190f4cd053d79ee7f601ce2 *tests/data/fate/vsynth1-qtrlegray.mov -5113294 tests/data/fate/vsynth1-qtrlegray.mov -29def4aed035ed65d3a89f7d382fccbe *tests/data/fate/vsynth1-qtrlegray.out.rawvideo -stddev: 25.95 PSNR: 19.85 MAXDIFF: 122 bytes: 7603200/ 7603200 +6ef537a90e5295670701bdeaf5eb4ce1 *tests/data/fate/vsynth1-qtrlegray.mov +5113293 tests/data/fate/vsynth1-qtrlegray.mov +cb20af0e5a65aad7cf47002fcb52288e *tests/data/fate/vsynth1-qtrlegray.out.rawvideo +stddev: 25.34 PSNR: 20.05 MAXDIFF: 122 bytes: 7603200/ 7603200 diff --git a/ffmpeg/tests/ref/vsynth/vsynth1-svq1 b/ffmpeg/tests/ref/vsynth/vsynth1-svq1 index 6be76e1..a7de66e 100644 --- a/ffmpeg/tests/ref/vsynth/vsynth1-svq1 +++ b/ffmpeg/tests/ref/vsynth/vsynth1-svq1 @@ -1,4 +1,4 @@ -ea441979fa5bf694d1f6cee958d56560 *tests/data/fate/vsynth1-svq1.mov +69afe0f66844ac3edb83d97994099fc0 *tests/data/fate/vsynth1-svq1.mov 1334233 tests/data/fate/vsynth1-svq1.mov 9cc35c54b2c77d36bd7e308b393c1f81 *tests/data/fate/vsynth1-svq1.out.rawvideo stddev: 9.58 PSNR: 28.50 MAXDIFF: 210 bytes: 7603200/ 7603200 diff --git a/ffmpeg/tests/ref/vsynth/vsynth2-avui b/ffmpeg/tests/ref/vsynth/vsynth2-avui index 743c6ff..424a15e 100644 --- a/ffmpeg/tests/ref/vsynth/vsynth2-avui +++ b/ffmpeg/tests/ref/vsynth/vsynth2-avui @@ -1,4 +1,4 @@ -ec8b12fd9f1f7737f7e23419457fe431 *tests/data/fate/vsynth2-avui.mov +ec8425d8916254687ce700c940eb6664 *tests/data/fate/vsynth2-avui.mov 42624917 tests/data/fate/vsynth2-avui.mov dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth2-avui.out.rawvideo stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/ffmpeg/tests/ref/vsynth/vsynth2-dnxhd-1080i b/ffmpeg/tests/ref/vsynth/vsynth2-dnxhd-1080i index f657eb4..1f9b783 100644 --- a/ffmpeg/tests/ref/vsynth/vsynth2-dnxhd-1080i +++ b/ffmpeg/tests/ref/vsynth/vsynth2-dnxhd-1080i @@ -1,4 +1,4 @@ -5d7ab75ce6e547ed63a7a0eacf18f078 *tests/data/fate/vsynth2-dnxhd-1080i.mov +4bbed3e8b6bc301d9bbdc83859f3a847 *tests/data/fate/vsynth2-dnxhd-1080i.mov 3031911 tests/data/fate/vsynth2-dnxhd-1080i.mov 744ba46da5d4c19a28562ea31061d170 *tests/data/fate/vsynth2-dnxhd-1080i.out.rawvideo stddev: 1.31 PSNR: 45.77 MAXDIFF: 23 bytes: 7603200/ 760320 diff --git a/ffmpeg/tests/ref/vsynth/vsynth2-ffv1 b/ffmpeg/tests/ref/vsynth/vsynth2-ffv1 index 8263b01..6caffdd 100644 --- a/ffmpeg/tests/ref/vsynth/vsynth2-ffv1 +++ b/ffmpeg/tests/ref/vsynth/vsynth2-ffv1 @@ -1,4 +1,4 @@ -9d8486fc8a260204d8ee3212d95915b5 *tests/data/fate/vsynth2-ffv1.avi -3546258 tests/data/fate/vsynth2-ffv1.avi +0837dc7e6f625e2f6ac16140562c079d *tests/data/fate/vsynth2-ffv1.avi +3547788 tests/data/fate/vsynth2-ffv1.avi dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth2-ffv1.out.rawvideo stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/ffmpeg/tests/ref/vsynth/vsynth2-j2k b/ffmpeg/tests/ref/vsynth/vsynth2-j2k deleted file mode 100644 index 4f038fe..0000000 --- a/ffmpeg/tests/ref/vsynth/vsynth2-j2k +++ /dev/null @@ -1,4 +0,0 @@ -fc49816ba28731689872f5c87ca91c10 *tests/data/fate/vsynth2-j2k.avi -1151144 tests/data/fate/vsynth2-j2k.avi -ec5218eec33a021945c28c72093382a5 *tests/data/fate/vsynth2-j2k.out.rawvideo -stddev: 4.54 PSNR: 34.99 MAXDIFF: 61 bytes: 7603200/ 7603200 diff --git a/ffmpeg/tests/ref/vsynth/vsynth2-ljpeg b/ffmpeg/tests/ref/vsynth/vsynth2-ljpeg index fa2f978..2136fe8 100644 --- a/ffmpeg/tests/ref/vsynth/vsynth2-ljpeg +++ b/ffmpeg/tests/ref/vsynth/vsynth2-ljpeg @@ -1,4 +1,4 @@ -db9fd56e154b1056c9443a82a96db6f5 *tests/data/fate/vsynth2-ljpeg.avi -4766902 tests/data/fate/vsynth2-ljpeg.avi +b691d815bb7e40ac4ff8c0e51d8c08ff *tests/data/fate/vsynth2-ljpeg.avi +4763454 tests/data/fate/vsynth2-ljpeg.avi dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth2-ljpeg.out.rawvideo stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/ffmpeg/tests/ref/vsynth/vsynth2-mpeg4 b/ffmpeg/tests/ref/vsynth/vsynth2-mpeg4 index 399ef58..0956543 100644 --- a/ffmpeg/tests/ref/vsynth/vsynth2-mpeg4 +++ b/ffmpeg/tests/ref/vsynth/vsynth2-mpeg4 @@ -1,4 +1,4 @@ -04f74c54f4db25e1d454ede9216632c1 *tests/data/fate/vsynth2-mpeg4.mp4 +3d99aa9393f2a1a9319580b78df2bf3d *tests/data/fate/vsynth2-mpeg4.mp4 119661 tests/data/fate/vsynth2-mpeg4.mp4 9a1e085d9e488c5ead0c940c9612a37a *tests/data/fate/vsynth2-mpeg4.out.rawvideo stddev: 5.34 PSNR: 33.57 MAXDIFF: 83 bytes: 7603200/ 7603200 diff --git a/ffmpeg/tests/ref/vsynth/vsynth2-prores b/ffmpeg/tests/ref/vsynth/vsynth2-prores index b5c80e2..99f56de 100644 --- a/ffmpeg/tests/ref/vsynth/vsynth2-prores +++ b/ffmpeg/tests/ref/vsynth/vsynth2-prores @@ -1,4 +1,4 @@ -a6351254cccdbc7147600951a798172a *tests/data/fate/vsynth2-prores.mov +af885572d77d28e5ede27932bd68cdde *tests/data/fate/vsynth2-prores.mov 2844076 tests/data/fate/vsynth2-prores.mov b5844025c0f4c7c37db702c3213db232 *tests/data/fate/vsynth2-prores.out.rawvideo stddev: 1.31 PSNR: 45.77 MAXDIFF: 11 bytes: 7603200/ 7603200 diff --git a/ffmpeg/tests/ref/vsynth/vsynth2-prores_kostya b/ffmpeg/tests/ref/vsynth/vsynth2-prores_kostya deleted file mode 100644 index 16b6078..0000000 --- a/ffmpeg/tests/ref/vsynth/vsynth2-prores_kostya +++ /dev/null @@ -1,4 +0,0 @@ -7de64c634620de738c98aa22e9df927d *tests/data/fate/vsynth2-prores_kostya.mov -3884596 tests/data/fate/vsynth2-prores_kostya.mov -ca2f6c1162635dedfa468c90f1fdc0ef *tests/data/fate/vsynth2-prores_kostya.out.rawvideo -stddev: 0.92 PSNR: 48.77 MAXDIFF: 10 bytes: 7603200/ 7603200 diff --git a/ffmpeg/tests/ref/vsynth/vsynth2-qtrle b/ffmpeg/tests/ref/vsynth/vsynth2-qtrle index 5f53608..0ae2d00 100644 --- a/ffmpeg/tests/ref/vsynth/vsynth2-qtrle +++ b/ffmpeg/tests/ref/vsynth/vsynth2-qtrle @@ -1,4 +1,4 @@ -f2aea57de225cccadb936bba4086a836 *tests/data/fate/vsynth2-qtrle.mov +3172f6a2c63e591048fe3309795f2d7a *tests/data/fate/vsynth2-qtrle.mov 14798345 tests/data/fate/vsynth2-qtrle.mov 98d0e2854731472c5bf13d8638502d0a *tests/data/fate/vsynth2-qtrle.out.rawvideo stddev: 1.26 PSNR: 46.10 MAXDIFF: 13 bytes: 7603200/ 7603200 diff --git a/ffmpeg/tests/ref/vsynth/vsynth2-qtrlegray b/ffmpeg/tests/ref/vsynth/vsynth2-qtrlegray index 4568391..8f01304 100644 --- a/ffmpeg/tests/ref/vsynth/vsynth2-qtrlegray +++ b/ffmpeg/tests/ref/vsynth/vsynth2-qtrlegray @@ -1,4 +1,4 @@ -fa10a87e9cf648d635340b90e41d2d38 *tests/data/fate/vsynth2-qtrlegray.mov +5304bbafd31bb8bf3d274f1d01db81f5 *tests/data/fate/vsynth2-qtrlegray.mov 5111283 tests/data/fate/vsynth2-qtrlegray.mov -f63b5ebdfdba750e547c25131b0a3fd1 *tests/data/fate/vsynth2-qtrlegray.out.rawvideo -stddev: 19.42 PSNR: 22.36 MAXDIFF: 72 bytes: 7603200/ 7603200 +d7bfbe259af9ae323bb94b09c33570a5 *tests/data/fate/vsynth2-qtrlegray.out.rawvideo +stddev: 18.65 PSNR: 22.72 MAXDIFF: 72 bytes: 7603200/ 7603200 diff --git a/ffmpeg/tests/ref/vsynth/vsynth2-svq1 b/ffmpeg/tests/ref/vsynth/vsynth2-svq1 index bdde55e..72cc6f9 100644 --- a/ffmpeg/tests/ref/vsynth/vsynth2-svq1 +++ b/ffmpeg/tests/ref/vsynth/vsynth2-svq1 @@ -1,4 +1,4 @@ -11da7948184b3fee455f66cc5f6f8ca5 *tests/data/fate/vsynth2-svq1.mov +ab9b1f922c4ae1b5d602bdeebc8b185d *tests/data/fate/vsynth2-svq1.mov 766701 tests/data/fate/vsynth2-svq1.mov aa03471dac3f49455a33a2b19fda1098 *tests/data/fate/vsynth2-svq1.out.rawvideo stddev: 3.23 PSNR: 37.93 MAXDIFF: 61 bytes: 7603200/ 7603200 diff --git a/ffmpeg/tests/tiny_psnr.c b/ffmpeg/tests/tiny_psnr.c index 264aa4d..b4fc02c 100644 --- a/ffmpeg/tests/tiny_psnr.c +++ b/ffmpeg/tests/tiny_psnr.c @@ -22,9 +22,12 @@ #include <stdlib.h> #include <string.h> #include <inttypes.h> -#include <assert.h> +#include <math.h> +#include <float.h> +#include <limits.h> #include "libavutil/intfloat.h" +#include "libavutil/intreadwrite.h" #define FFMIN(a, b) ((a) > (b) ? (b) : (a)) #define F 100 @@ -122,17 +125,22 @@ static float get_f32l(uint8_t *p) return v.f; } +static double get_f64l(uint8_t *p) +{ + return av_int2double(AV_RL64(p)); +} + static int run_psnr(FILE *f[2], int len, int shift, int skip_bytes) { int i, j; uint64_t sse = 0; - uint64_t dev; + double sse_d = 0.0; uint8_t buf[2][SIZE]; - uint64_t psnr; int64_t max = (1LL << (8 * len)) - 1; int size0 = 0; int size1 = 0; - int maxdist = 0; + uint64_t maxdist = 0; + double maxdist_d = 0.0; int noseek; noseek = fseek(f[0], 0, SEEK_SET) || @@ -169,23 +177,42 @@ static int run_psnr(FILE *f[2], int len, int shift, int skip_bytes) int s1 = fread(buf[1], 1, SIZE, f[1]); for (j = 0; j < FFMIN(s0, s1); j += len) { - int64_t a = buf[0][j]; - int64_t b = buf[1][j]; - int dist; - if (len == 2) { - a = get_s16l(buf[0] + j); - b = get_s16l(buf[1] + j); - } else if (len == 4) { - a = get_f32l(buf[0] + j) * (1 << 24); - b = get_f32l(buf[1] + j) * (1 << 24); - } else { - a = buf[0][j]; - b = buf[1][j]; + switch (len) { + case 1: + case 2: { + int64_t a = buf[0][j]; + int64_t b = buf[1][j]; + int dist; + if (len == 2) { + a = get_s16l(buf[0] + j); + b = get_s16l(buf[1] + j); + } else { + a = buf[0][j]; + b = buf[1][j]; + } + sse += (a - b) * (a - b); + dist = abs(a - b); + if (dist > maxdist) + maxdist = dist; + break; + } + case 4: + case 8: { + double dist, a, b; + if (len == 8) { + a = get_f64l(buf[0] + j); + b = get_f64l(buf[1] + j); + } else { + a = get_f32l(buf[0] + j); + b = get_f32l(buf[1] + j); + } + dist = fabs(a - b); + sse_d += (a - b) * (a - b); + if (dist > maxdist_d) + maxdist_d = dist; + break; + } } - sse += (a - b) * (a - b); - dist = abs(a - b); - if (dist > maxdist) - maxdist = dist; } size0 += s0; size1 += s1; @@ -196,18 +223,44 @@ static int run_psnr(FILE *f[2], int len, int shift, int skip_bytes) i = FFMIN(size0, size1) / len; if (!i) i = 1; - dev = int_sqrt(((sse / i) * F * F) + (((sse % i) * F * F) + i / 2) / i); - if (sse) - psnr = ((2 * log16(max << 16) + log16(i) - log16(sse)) * - 284619LL * F + (1LL << 31)) / (1LL << 32); - else - psnr = 1000 * F - 1; // floating point free infinity :) - - printf("stddev:%5d.%02d PSNR:%3d.%02d MAXDIFF:%5d bytes:%9d/%9d\n", - (int)(dev / F), (int)(dev % F), - (int)(psnr / F), (int)(psnr % F), - maxdist, size0, size1); - return psnr; + switch (len) { + case 1: + case 2: { + uint64_t psnr; + uint64_t dev = int_sqrt(((sse / i) * F * F) + (((sse % i) * F * F) + i / 2) / i); + if (sse) + psnr = ((2 * log16(max << 16) + log16(i) - log16(sse)) * + 284619LL * F + (1LL << 31)) / (1LL << 32); + else + psnr = 1000 * F - 1; // floating point free infinity :) + + printf("stddev:%5d.%02d PSNR:%3d.%02d MAXDIFF:%5"PRIu64" bytes:%9d/%9d\n", + (int)(dev / F), (int)(dev % F), + (int)(psnr / F), (int)(psnr % F), + maxdist, size0, size1); + return psnr; + } + case 4: + case 8: { + char psnr_str[64]; + double psnr = INT_MAX; + double dev = sqrt(sse_d / i); + uint64_t scale = (len == 4) ? (1ULL << 24) : (1ULL << 32); + + if (sse_d) { + psnr = 2 * log(DBL_MAX) - log(i / sse_d); + snprintf(psnr_str, sizeof(psnr_str), "%5.02f", psnr); + } else + snprintf(psnr_str, sizeof(psnr_str), "inf"); + + maxdist = maxdist_d * scale; + + printf("stddev:%10.2f PSNR:%s MAXDIFF:%10"PRIu64" bytes:%9d/%9d\n", + dev * scale, psnr_str, maxdist, size0, size1); + return psnr; + } + } + return -1; } int main(int argc, char *argv[]) @@ -228,6 +281,8 @@ int main(int argc, char *argv[]) len = 2; } else if (!strcmp(argv[3], "f32")) { len = 4; + } else if (!strcmp(argv[3], "f64")) { + len = 8; } else { char *end; len = strtol(argv[3], &end, 0); |