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

Merge commit 'caf5ef852bf71984d3322bbeaf48cfb04ac8255f'

Browse Source 
* commit 'caf5ef852bf71984d3322bbeaf48cfb04ac8255f':
  cpu-test: test av_cpu_count

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-08-04 04:05:25 +02:00
parent 01fc6533aa caf5ef852b
commit 7fd7aa6b2b
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libavutil/cpu.c
View File

@ -278,6 +278,7 @@ int av_cpu_count(void)
#ifdef TEST #ifdef TEST
#include <stdio.h> #include <stdio.h>
#include "avstring.h"
#if !HAVE_GETOPT #if !HAVE_GETOPT
#include "compat/getopt.c" #include "compat/getopt.c"
@ -343,12 +344,14 @@ int main(int argc, char **argv)
{ {
int cpu_flags_raw = av_get_cpu_flags(); int cpu_flags_raw = av_get_cpu_flags();
int cpu_flags_eff; int cpu_flags_eff;
int cpu_count = av_cpu_count();
char threads[5] = "auto";
if (cpu_flags_raw < 0) if (cpu_flags_raw < 0)
return 1; return 1;
for (;;) { for (;;) {
int c = getopt(argc, argv, "c:"); int c = getopt(argc, argv, "c:t:");
if (c == -1) if (c == -1)
break; break;
switch (c) { switch (c) {
@ -360,6 +363,14 @@ int main(int argc, char **argv)
av_set_cpu_flags_mask(cpuflags); av_set_cpu_flags_mask(cpuflags);
break; break;
} }
case 't':
{
int len = av_strlcpy(threads, optarg, sizeof(threads));
if (len >= sizeof(threads)) {
fprintf(stderr, "Invalid thread count '%s'\n", optarg);
return 2;
}
}
} }
} }
@ -370,6 +381,7 @@ int main(int argc, char **argv)
print_cpu_flags(cpu_flags_raw, "raw"); print_cpu_flags(cpu_flags_raw, "raw");
print_cpu_flags(cpu_flags_eff, "effective"); print_cpu_flags(cpu_flags_eff, "effective");
fprintf(stderr, "threads = %s (cpu_count = %d)\n", threads, cpu_count);
return 0; return 0;
} }

2
tests/fate/libavutil.mak
View File

@ -31,7 +31,7 @@ fate-bprint: CMD = run libavutil/bprint-test
FATE_LIBAVUTIL += fate-cpu FATE_LIBAVUTIL += fate-cpu
fate-cpu: libavutil/cpu-test$(EXESUF) fate-cpu: libavutil/cpu-test$(EXESUF)
fate-cpu: CMD = run libavutil/cpu-test $(CPUFLAGS:%=-c%) fate-cpu: CMD = run libavutil/cpu-test $(CPUFLAGS:%=-c%) $(THREADS:%=-t%)
fate-cpu: REF = /dev/null fate-cpu: REF = /dev/null
FATE_LIBAVUTIL += fate-crc FATE_LIBAVUTIL += fate-crc