diff options
| author | James Almer <jamrial@gmail.com> | 2021-12-01 20:30:06 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2021-12-01 20:30:06 -0300 |
| commit | 686c7c132d82c47446cbecc2d0096f33bfb09ca4 (patch) | |
| tree | b994977c0830bc9aaabb3680d5bd5e1cd096cb93 /tests/fate/ffmpeg.mak | |
| parent | bb0a28560d6c50f2fa1240e77ee387d610c6c74a (diff) | |
| download | ffmpeg-686c7c132d82c47446cbecc2d0096f33bfb09ca4.tar.gz | |
fate/ffmpeg: add missing bitexact flags to the shortest tests
Should fix fate failures on some targets.
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'tests/fate/ffmpeg.mak')
| -rw-r--r-- | tests/fate/ffmpeg.mak | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak index b43db423a9..279cb140ac 100644 --- a/tests/fate/ffmpeg.mak +++ b/tests/fate/ffmpeg.mak @@ -88,7 +88,7 @@ fate-unknown_layout-ac3: CMD = md5 -auto_conversion_filters \ FATE_FFMPEG-$(call ALLYES, SINE_FILTER AMIX_FILTER MPEG4_ENCODER AC3_FIXED_ENCODER) += fate-shortest fate-shortest: tests/data/vsynth_lena.yuv -fate-shortest: CMD = framemd5 -auto_conversion_filters -f lavfi -i "sine=3000:d=10" -f lavfi -i "sine=1000:d=1" -s 352x288 -pix_fmt yuv420p -i $(TARGET_PATH)/tests/data/vsynth_lena.yuv -filter_complex "[0:a:0][1:a:0]amix=inputs=2[audio]" -map 2:v:0 -map "[audio]" -c:v mpeg4 -c:a ac3_fixed -shortest +fate-shortest: CMD = framemd5 -auto_conversion_filters -f lavfi -i "sine=3000:d=10" -f lavfi -i "sine=1000:d=1" -sws_flags +accurate_rnd+bitexact -s 352x288 -pix_fmt yuv420p -i $(TARGET_PATH)/tests/data/vsynth_lena.yuv -filter_complex "[0:a:0][1:a:0]amix=inputs=2[audio]" -map 2:v:0 -map "[audio]" -sws_flags +accurate_rnd+bitexact -c:v mpeg4 -c:a ac3_fixed -shortest FATE_STREAMCOPY-$(call ALLYES, EAC3_DEMUXER MOV_MUXER) += fate-copy-trac3074 fate-copy-trac3074: $(SAMPLES)/eac3/csi_miami_stereo_128_spx.eac3 @@ -134,18 +134,19 @@ FATE_STREAMCOPY-$(CONFIG_FLV_DEMUXER) += fate-ffmpeg-streamloop fate-ffmpeg-streamloop: $(SAMPLES)/flv/streamloop.flv fate-ffmpeg-streamloop: CMD = framemd5 -stream_loop 2 -i $(TARGET_SAMPLES)/flv/streamloop.flv -c copy -FATE_STREAMCOPY-$(call ALLYES, SINE_FILTER AMIX_FILTER AC3_FIXED_ENCODER) += fate-copy-shortest1 -fate-copy-shortest1: tests/data/vsynth_lena.yuv -fate-copy-shortest1: CMD = framemd5 -auto_conversion_filters -f lavfi -i "sine=3000:d=10" -f lavfi -i "sine=1000:d=1" -s 352x288 -pix_fmt yuv420p -i $(TARGET_PATH)/tests/data/vsynth_lena.yuv -filter_complex "[0:a:0][1:a:0]amix=inputs=2[audio]" -map 2:v:0 -map "[audio]" -c:v copy -c:a ac3_fixed -shortest - tests/data/audio_shorter_than_video.nut: TAG = GEN tests/data/audio_shorter_than_video.nut: tests/data/vsynth_lena.yuv tests/data/audio_shorter_than_video.nut: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \ - -s 352x288 -pix_fmt yuv420p -i $(TARGET_PATH)/tests/data/vsynth_lena.yuv -c:v mpeg4 \ - -f lavfi -i "sine=1000:d=1" -c:a pcm_s16le \ + -sws_flags +accurate_rnd+bitexact -s 352x288 -pix_fmt yuv420p -i $(TARGET_PATH)/tests/data/vsynth_lena.yuv \ + -f lavfi -i "sine=1000:d=1" \ + -sws_flags +accurate_rnd+bitexact -c:v mpeg4 -c:a pcm_s16le -bitexact \ -y $(TARGET_PATH)/tests/data/audio_shorter_than_video.nut 2>/dev/null +FATE_STREAMCOPY-$(call ALLYES, SINE_FILTER AMIX_FILTER NUT_MUXER PCM_S16LE_ENCODER MPEG4_ENCODER AC3_FIXED_ENCODER) += fate-copy-shortest1 +fate-copy-shortest1: tests/data/audio_shorter_than_video.nut +fate-copy-shortest1: CMD = framemd5 -auto_conversion_filters -f lavfi -i "sine=3000:d=10" -f lavfi -i "sine=1000:d=1" -i $(TARGET_PATH)/tests/data/audio_shorter_than_video.nut -filter_complex "[0:a:0][1:a:0]amix=inputs=2[audio]" -map 2:v:0 -map "[audio]" -c:v copy -c:a ac3_fixed -shortest + FATE_STREAMCOPY-$(call ALLYES, SINE_FILTER AMIX_FILTER NUT_MUXER PCM_S16LE_ENCODER MPEG4_ENCODER AC3_FIXED_ENCODER) += fate-copy-shortest2 fate-copy-shortest2: tests/data/audio_shorter_than_video.nut fate-copy-shortest2: CMD = framemd5 -auto_conversion_filters -f lavfi -i "sine=3000:d=10" -i $(TARGET_PATH)/tests/data/audio_shorter_than_video.nut -filter_complex "[0:a:0][1:a:0]amix=inputs=2[audio]" -map 1:v:0 -map "[audio]" -c:v copy -c:a ac3_fixed -shortest |