mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-06 08:08:58 +02:00
fate: add -fflags +bitexact to the relevant targets
This fixes fate with FF_API_LAVF_BITEXACT disabled. Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
This commit is contained in:
parent
c34363acd2
commit
c64060d56a
@ -48,7 +48,7 @@ tests/data/ffprobe-test.nut: ffmpeg$(EXESUF) tests/test_copy.ffmeta
|
||||
$(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \
|
||||
-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 $(TARGET_PATH)/tests/test_copy.ffmeta \
|
||||
-flags +bitexact -map 0:0 -map 0:1 -map 0:2 -map_metadata 1 \
|
||||
-flags +bitexact -fflags +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 \
|
||||
-vcodec rawvideo -acodec pcm_s16le \
|
||||
-y $(TARGET_PATH)/$@ 2>/dev/null
|
||||
|
@ -102,11 +102,11 @@ ffmpeg(){
|
||||
}
|
||||
|
||||
framecrc(){
|
||||
ffmpeg "$@" -flags +bitexact -f framecrc -
|
||||
ffmpeg "$@" -flags +bitexact -fflags +bitexact -f framecrc -
|
||||
}
|
||||
|
||||
framemd5(){
|
||||
ffmpeg "$@" -flags +bitexact -f framemd5 -
|
||||
ffmpeg "$@" -flags +bitexact -fflags +bitexact -f framemd5 -
|
||||
}
|
||||
|
||||
crc(){
|
||||
@ -124,7 +124,7 @@ pcm(){
|
||||
fmtstdout(){
|
||||
fmt=$1
|
||||
shift 1
|
||||
ffmpeg -flags +bitexact "$@" -f $fmt -
|
||||
ffmpeg -flags +bitexact -fflags +bitexact "$@" -f $fmt -
|
||||
}
|
||||
|
||||
enc_dec_pcm(){
|
||||
@ -137,7 +137,7 @@ enc_dec_pcm(){
|
||||
cleanfiles=$encfile
|
||||
encfile=$(target_path ${encfile})
|
||||
ffmpeg -i $src_file "$@" -f $out_fmt -y ${encfile} || return
|
||||
ffmpeg -flags +bitexact -i ${encfile} -c:a pcm_${pcm_fmt} -f ${dec_fmt} -
|
||||
ffmpeg -flags +bitexact -fflags +bitexact -i ${encfile} -c:a pcm_${pcm_fmt} -f ${dec_fmt} -
|
||||
}
|
||||
|
||||
FLAGS="-flags +bitexact -sws_flags +accurate_rnd+bitexact -fflags +bitexact"
|
||||
@ -231,16 +231,16 @@ gapless(){
|
||||
cleanfiles="$cleanfiles $decfile1 $decfile2 $decfile3"
|
||||
|
||||
# test packet data
|
||||
ffmpeg $extra_args -i "$sample" -flags +bitexact -c:a copy -f framecrc -y $decfile1
|
||||
ffmpeg $extra_args -i "$sample" -flags +bitexact -fflags +bitexact -c:a copy -f framecrc -y $decfile1
|
||||
do_md5sum $decfile1
|
||||
# test decoded (and cut) data
|
||||
ffmpeg $extra_args -i "$sample" -flags +bitexact -f wav md5:
|
||||
ffmpeg $extra_args -i "$sample" -flags +bitexact -fflags +bitexact -f wav md5:
|
||||
# the same as above again, with seeking to the start
|
||||
ffmpeg $extra_args -ss 0 -seek_timestamp 1 -i "$sample" -flags +bitexact -c:a copy -f framecrc -y $decfile2
|
||||
ffmpeg $extra_args -ss 0 -seek_timestamp 1 -i "$sample" -flags +bitexact -fflags +bitexact -c:a copy -f framecrc -y $decfile2
|
||||
do_md5sum $decfile2
|
||||
ffmpeg $extra_args -ss 0 -seek_timestamp 1 -i "$sample" -flags +bitexact -f wav md5:
|
||||
ffmpeg $extra_args -ss 0 -seek_timestamp 1 -i "$sample" -flags +bitexact -fflags +bitexact -f wav md5:
|
||||
# test packet data, with seeking to a specific position
|
||||
ffmpeg $extra_args -ss 5 -seek_timestamp 1 -i "$sample" -flags +bitexact -c:a copy -f framecrc -y $decfile3
|
||||
ffmpeg $extra_args -ss 5 -seek_timestamp 1 -i "$sample" -flags +bitexact -fflags +bitexact -c:a copy -f framecrc -y $decfile3
|
||||
do_md5sum $decfile3
|
||||
}
|
||||
|
||||
|
@ -5,7 +5,7 @@ fate-mpeg4-resolution-change-%: CMD = framemd5 -flags +bitexact -idct simple -i
|
||||
|
||||
FATE_MPEG4-$(call DEMDEC, H263, H263) := $(addprefix fate-mpeg4-resolution-change-, $(MPEG4_RESOLUTION_CHANGE))
|
||||
|
||||
fate-mpeg4-bsf-unpack-bframes: CMD = md5 -i $(TARGET_SAMPLES)/mpeg4/packed_bframes.avi -flags +bitexact -c:v copy -bsf mpeg4_unpack_bframes -f avi
|
||||
fate-mpeg4-bsf-unpack-bframes: CMD = md5 -i $(TARGET_SAMPLES)/mpeg4/packed_bframes.avi -flags +bitexact -fflags +bitexact -c:v copy -bsf mpeg4_unpack_bframes -f avi
|
||||
FATE_MPEG4-$(call ALLYES, AVI_DEMUXER MPEG4_UNPACK_BFRAMES_BSF AVI_MUXER) += fate-mpeg4-bsf-unpack-bframes
|
||||
|
||||
FATE_SAMPLES_AVCONV += $(FATE_MPEG4-yes)
|
||||
|
@ -11,7 +11,7 @@ FATE_SUBTITLES_ASS-$(CONFIG_ASS_DEMUXER) += fate-sub-ssa-to-ass-remux
|
||||
fate-sub-ssa-to-ass-remux: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/a9-misc.ssa -c copy
|
||||
|
||||
FATE_SUBTITLES-$(call ALLYES, ASS_DEMUXER, MATROSKA_MUXER) += fate-binsub-mksenc
|
||||
fate-binsub-mksenc: CMD = md5 -i $(TARGET_SAMPLES)/sub/1ededcbd7b.ass -c copy -f matroska -flags +bitexact
|
||||
fate-binsub-mksenc: CMD = md5 -i $(TARGET_SAMPLES)/sub/1ededcbd7b.ass -c copy -f matroska -flags +bitexact -fflags +bitexact
|
||||
|
||||
FATE_SUBTITLES_ASS-$(call DEMDEC, JACOSUB, JACOSUB) += fate-sub-jacosub
|
||||
fate-sub-jacosub: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/JACOsub_capability_tester.jss
|
||||
@ -26,7 +26,7 @@ FATE_SUBTITLES_ASS-$(call DEMDEC, MOV, MOVTEXT) += fate-sub-movtext
|
||||
fate-sub-movtext: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/MovText_capability_tester.mp4
|
||||
|
||||
FATE_SUBTITLES-$(call ENCDEC, MOVTEXT, MOV) += fate-binsub-movtextenc
|
||||
fate-binsub-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-binsub-movtextenc: CMD = md5 -i $(TARGET_SAMPLES)/sub/MovText_capability_tester.mp4 -map 0 -scodec mov_text -f mp4 -flags +bitexact -fflags +bitexact -movflags frag_keyframe+empty_moov
|
||||
|
||||
FATE_SUBTITLES_ASS-$(call DEMDEC, MPL2, MPL2) += fate-sub-mpl2
|
||||
fate-sub-mpl2: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/MPL2_capability_tester.txt
|
||||
|
@ -4,7 +4,7 @@ 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 $(TARGET_SAMPLES)/vqf/achterba.vqf -acodec copy -flags bitexact -f framecrc
|
||||
fate-vqf-demux: CMD = md5 -i $(TARGET_SAMPLES)/vqf/achterba.vqf -acodec copy -flags bitexact -fflags +bitexact -f framecrc
|
||||
|
||||
FATE_VQF += $(FATE_VQF-yes)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user