falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

Merge remote-tracking branch 'qatar/master' 

* qatar/master:
  mips64: mark hi/lo registers clobbered in MAC64/MLS64 macros
  fate: list lavfi tests in a makefile

Conflicts:
	configure
	tests/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n1.1
Michael Niedermayer 13 years ago
parent
9317b73f11 b93e934aee
commit
3777e6b3bf
4 changed files with 64 additions and 22 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -13
      configure
  2. +4
    -2
      libavcodec/mips/mathops.h
  3. +1
    -7
      tests/Makefile
  4. +58
    -0
      tests/fate/avfilter.mak

+ 1
- 13
configure View File

@@ -1962,16 +1962,6 @@ htmlpages_deps="texi2html"
txtpages_deps="makeinfo" txtpages_deps="makeinfo"
doc_deps_any="manpages htmlpages podpages txtpages" doc_deps_any="manpages htmlpages podpages txtpages"


# tests
colormatrix1_test_deps="colormatrix_filter"
colormatrix2_test_deps="colormatrix_filter"
pp_test_deps="mp_filter"
pp2_test_deps="mp_filter"
pp3_test_deps="mp_filter"
pp4_test_deps="mp_filter"
pp5_test_deps="mp_filter"
pp6_test_deps="mp_filter"

# default parameters # default parameters


logfile="config.log" logfile="config.log"
@@ -2142,9 +2132,8 @@ find_tests(){
} }


LAVF_FATE_TESTS=$(find_tests lavf-fate) LAVF_FATE_TESTS=$(find_tests lavf-fate)
LAVFI_TESTS=$(find_tests lavfi)


ALL_TESTS="$LAVF_FATE_TESTS $LAVFI_TESTS"
ALL_TESTS="$LAVF_FATE_TESTS"


for n in $COMPONENT_LIST; do for n in $COMPONENT_LIST; do
v=$(toupper ${n%s})_LIST v=$(toupper ${n%s})_LIST
@@ -4292,7 +4281,6 @@ print_config CONFIG_ "$config_files" $CONFIG_LIST \


cat >>config.mak <<EOF cat >>config.mak <<EOF
LAVF_FATE_TESTS=$(print_enabled -n _test $LAVF_FATE_TESTS) LAVF_FATE_TESTS=$(print_enabled -n _test $LAVF_FATE_TESTS)
LAVFI_TESTS=$(print_enabled -n _test $LAVFI_TESTS)
EOF EOF


echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH


+ 4
- 2
libavcodec/mips/mathops.h View File

@@ -57,7 +57,8 @@ static inline av_const int64_t MAC64(int64_t d, int a, int b)
__asm__ ("dmult %2, %3 \n\t" __asm__ ("dmult %2, %3 \n\t"
"mflo %1 \n\t" "mflo %1 \n\t"
"daddu %0, %0, %1 \n\t" "daddu %0, %0, %1 \n\t"
: "+r"(d), "=&r"(m) : "r"(a), "r"(b));
: "+r"(d), "=&r"(m) : "r"(a), "r"(b)
: "hi", "lo");
return d; return d;
} }
#define MAC64(d, a, b) ((d) = MAC64(d, a, b)) #define MAC64(d, a, b) ((d) = MAC64(d, a, b))
@@ -68,7 +69,8 @@ static inline av_const int64_t MLS64(int64_t d, int a, int b)
__asm__ ("dmult %2, %3 \n\t" __asm__ ("dmult %2, %3 \n\t"
"mflo %1 \n\t" "mflo %1 \n\t"
"dsubu %0, %0, %1 \n\t" "dsubu %0, %0, %1 \n\t"
: "+r"(d), "=&r"(m) : "r"(a), "r"(b));
: "+r"(d), "=&r"(m) : "r"(a), "r"(b)
: "hi", "lo");
return d; return d;
} }
#define MLS64(d, a, b) ((d) = MLS64(d, a, b)) #define MLS64(d, a, b) ((d) = MLS64(d, a, b))


+ 1
- 7
tests/Makefile View File

@@ -57,6 +57,7 @@ ENCDEC2 = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER \
include $(SRC_PATH)/tests/fate/acodec.mak include $(SRC_PATH)/tests/fate/acodec.mak
include $(SRC_PATH)/tests/fate/vcodec.mak include $(SRC_PATH)/tests/fate/vcodec.mak
include $(SRC_PATH)/tests/fate/avformat.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/seek.mak


include $(SRC_PATH)/tests/fate/aac.mak include $(SRC_PATH)/tests/fate/aac.mak
@@ -111,9 +112,6 @@ include $(SRC_PATH)/tests/fate/wavpack.mak
include $(SRC_PATH)/tests/fate/wma.mak include $(SRC_PATH)/tests/fate/wma.mak


FATE_LAVF_FATE = $(LAVF_FATE_TESTS:%=fate-lavf-fate-%) FATE_LAVF_FATE = $(LAVF_FATE_TESTS:%=fate-lavf-fate-%)
FATE_LAVFI = $(LAVFI_TESTS:%=fate-lavfi-%)

FATE_AVCONV += $(FATE_LAVFI) \


FATE_FFMPEG += $(FATE_FFMPEG-yes) $(FATE_AVCONV) $(FATE_AVCONV-yes) FATE_FFMPEG += $(FATE_FFMPEG-yes) $(FATE_AVCONV) $(FATE_AVCONV-yes)
FATE-$(CONFIG_FFMPEG) += $(FATE_FFMPEG) FATE-$(CONFIG_FFMPEG) += $(FATE_FFMPEG)
@@ -132,13 +130,9 @@ $(FATE_FFMPEG) $(FATE_LAVF_FATE) $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG):


$(FATE_FFPROBE): ffprobe$(EXESUF) $(FATE_FFPROBE): ffprobe$(EXESUF)


$(FATE_LAVFI): $(VREF) libavfilter/filtfmts-test$(EXESUF)

$(FATE_LAVF_FATE): CMD = lavffatetest $(FATE_LAVF_FATE): CMD = lavffatetest
$(FATE_LAVFI): CMD = lavfitest


fate-lavf-fate: $(FATE_LAVF_FATE) fate-lavf-fate: $(FATE_LAVF_FATE)
fate-lavfi: $(FATE_LAVFI)


ifdef SAMPLES ifdef SAMPLES
FATE += $(FATE_LAVF_FATE) FATE += $(FATE_LAVF_FATE)


+ 58
- 0
tests/fate/avfilter.mak View File

@@ -0,0 +1,58 @@
FATE_LAVFI = fate-lavfi-alphaextract_rgb \
fate-lavfi-alphaextract_yuv \
fate-lavfi-alphamerge_rgb \
fate-lavfi-alphamerge_yuv \
fate-lavfi-colormatrix1 \
fate-lavfi-colormatrix2 \
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-idet \
fate-lavfi-life \
fate-lavfi-null \
fate-lavfi-overlay \
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_super2xsai \
fate-lavfi-pixfmts_vflip \
fate-lavfi-scale200 \
fate-lavfi-scale500 \
fate-lavfi-select \
fate-lavfi-setdar \
fate-lavfi-setsar \
fate-lavfi-testsrc \
fate-lavfi-thumbnail \
fate-lavfi-tile \
fate-lavfi-tinterlace_merge \
fate-lavfi-tinterlace_pad \
fate-lavfi-transpose \
fate-lavfi-unsharp \
fate-lavfi-vflip \
fate-lavfi-vflip_crop \
fate-lavfi-vflip_vflip \

FATE_LAVFI-$(CONFIG_MP_FILTER) += fate-lavfi-pp \
fate-lavfi-pp2 \
fate-lavfi-pp3 \
fate-lavfi-pp4 \
fate-lavfi-pp5 \
fate-lavfi-pp6 \

FATE_LAVFI += $(FATE_LAVFI-yes)

$(FATE_LAVFI): $(VREF) libavfilter/filtfmts-test$(EXESUF)
$(FATE_LAVFI): CMD = lavfitest

FATE_AVCONV += $(FATE_LAVFI)
fate-lavfi: $(FATE_LAVFI)


Write Preview
Loading…
Cancel
Save