highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '16b7328058fa600d5158c84d9cc621a134eb88bc'

Browse Source 
* commit '16b7328058fa600d5158c84d9cc621a134eb88bc':
  build: Conditionally build and run DCT test program

Conflicts:
	libavcodec/Makefile
	libavcodec/dct-test.c
	tests/fate/libavcodec.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-21 22:02:23 +02:00
commit 9a436ae30f
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/Makefile
View File

@ -860,7 +860,7 @@ TESTPROGS = cabac \
rangecoder \ rangecoder \
snowenc \ snowenc \
TESTPROGS-$(CONFIG_DCT) += dct TESTPROGS-$(CONFIG_IDCTDSP) += dct
TESTPROGS-$(CONFIG_IIRFILTER) += iirfilter TESTPROGS-$(CONFIG_IIRFILTER) += iirfilter
TESTPROGS-$(HAVE_MMX) += motion TESTPROGS-$(HAVE_MMX) += motion

5
libavcodec/dct-test.c
View File

@ -490,7 +490,9 @@ int main(int argc, char **argv)
for (i = 0; idct_tab_arch[i].name; i++) for (i = 0; idct_tab_arch[i].name; i++)
if (!(~cpu_flags & idct_tab_arch[i].cpu_flag)) if (!(~cpu_flags & idct_tab_arch[i].cpu_flag))
err |= dct_error(&idct_tab_arch[i], test, test_idct, speed, bits); err |= dct_error(&idct_tab_arch[i], test, test_idct, speed, bits);
} else { }
#if CONFIG_FDCTDSP
else {
for (i = 0; i < FF_ARRAY_ELEMS(fdct_tab); i++) for (i = 0; i < FF_ARRAY_ELEMS(fdct_tab); i++)
err |= dct_error(&fdct_tab[i], test, test_idct, speed, bits); err |= dct_error(&fdct_tab[i], test, test_idct, speed, bits);
@ -498,6 +500,7 @@ int main(int argc, char **argv)
if (!(~cpu_flags & fdct_tab_arch[i].cpu_flag)) if (!(~cpu_flags & fdct_tab_arch[i].cpu_flag))
err |= dct_error(&fdct_tab_arch[i], test, test_idct, speed, bits); err |= dct_error(&fdct_tab_arch[i], test, test_idct, speed, bits);
} }
#endif /* CONFIG_FDCTDSP */
} }
if (err) if (err)

2
tests/fate/libavcodec.mak
View File

@ -3,7 +3,7 @@ fate-golomb: libavcodec/golomb-test$(EXESUF)
fate-golomb: CMD = run libavcodec/golomb-test fate-golomb: CMD = run libavcodec/golomb-test
fate-golomb: REF = /dev/null fate-golomb: REF = /dev/null
FATE_LIBAVCODEC-$(CONFIG_DCT) += fate-idct8x8 FATE_LIBAVCODEC-$(CONFIG_IDCTDSP) += fate-idct8x8
fate-idct8x8: libavcodec/dct-test$(EXESUF) fate-idct8x8: libavcodec/dct-test$(EXESUF)
fate-idct8x8: CMD = run libavcodec/dct-test -i fate-idct8x8: CMD = run libavcodec/dct-test -i
fate-idct8x8: CMP = null fate-idct8x8: CMP = null