RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-19 22:10:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '96a06dbaf278e8152487e08772946f63bd2a3843'

Browse Source 
* commit '96a06dbaf278e8152487e08772946f63bd2a3843':
  FATE: add support for testing hwaccels

Conflicts:
	tests/Makefile
	tests/fate-run.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-10 10:58:44 +01:00
commit 14ab6f9a26
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Makefile
View File

@ -195,7 +195,7 @@ fate:: $(FATE)
$(FATE) $(FATE_TESTS-no): $(FATE_UTILS:%=tests/%$(HOSTEXESUF)) $(FATE) $(FATE_TESTS-no): $(FATE_UTILS:%=tests/%$(HOSTEXESUF))
@echo "TEST $(@:fate-%=%)" @echo "TEST $(@:fate-%=%)"
$(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(TARGET_SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)' '$(CPUFLAGS)' '$(CMP_SHIFT)' '$(CMP_TARGET)' '$(SIZE_TOLERANCE)' '$(CMP_UNIT)' '$(GEN)' $(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(TARGET_SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)' '$(CPUFLAGS)' '$(CMP_SHIFT)' '$(CMP_TARGET)' '$(SIZE_TOLERANCE)' '$(CMP_UNIT)' '$(GEN)' '$(HWACCEL)'
fate-list: fate-list:
@printf '%s\n' $(sort $(FATE)) @printf '%s\n' $(sort $(FATE))

3
tests/fate-run.sh
View File

@ -23,6 +23,7 @@ cmp_target=${13:-0}
size_tolerance=${14:-0} size_tolerance=${14:-0}
cmp_unit=${15:-2} cmp_unit=${15:-2}
gen=${16:-no} gen=${16:-no}
hwaccel=${17:-none}
outdir="tests/data/fate" outdir="tests/data/fate"
outfile="${outdir}/${test}" outfile="${outdir}/${test}"
@ -91,7 +92,7 @@ probeframes(){
} }
ffmpeg(){ ffmpeg(){
dec_opts="-threads $threads -thread_type $thread_type" dec_opts="-hwaccel $hwaccel -threads $threads -thread_type $thread_type"
ffmpeg_args="-nostats -cpuflags $cpuflags" ffmpeg_args="-nostats -cpuflags $cpuflags"
for arg in $@; do for arg in $@; do
[ x${arg} = x-i ] && ffmpeg_args="${ffmpeg_args} ${dec_opts}" [ x${arg} = x-i ] && ffmpeg_args="${ffmpeg_args} ${dec_opts}"