virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '07d8fa58121be8fe315bd51ab760547fe209a745'

Browse Source 
* commit '07d8fa58121be8fe315bd51ab760547fe209a745':
  fate: add informative cpu test

Conflicts:
	tests/fate/libavutil.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-04 03:51:17 +02:00
commit 01fc6533aa
2 changed files with 44 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
libavutil/cpu.c
View File

@ -279,6 +279,10 @@ int av_cpu_count(void)
#include <stdio.h>
#if !HAVE_GETOPT
#include "compat/getopt.c"
#endif
static const struct {
int flag;
const char *name;
@ -322,17 +326,50 @@ static const struct {
{ 0 }
};
int main(void)
static void print_cpu_flags(int cpu_flags, const char *type)
{
int cpu_flags = av_get_cpu_flags();
int i;
printf("cpu_flags = 0x%08X\n", cpu_flags);
printf("cpu_flags =");
fprintf(stderr, "cpu_flags(%s) = 0x%08X\n", type, cpu_flags);
fprintf(stderr, "cpu_flags_str(%s) =", type);
for (i = 0; cpu_flag_tab[i].flag; i++)
if (cpu_flags & cpu_flag_tab[i].flag)
printf(" %s", cpu_flag_tab[i].name);
printf("\n");
fprintf(stderr, " %s", cpu_flag_tab[i].name);
fprintf(stderr, "\n");
}
int main(int argc, char **argv)
{
int cpu_flags_raw = av_get_cpu_flags();
int cpu_flags_eff;
if (cpu_flags_raw < 0)
return 1;
for (;;) {
int c = getopt(argc, argv, "c:");
if (c == -1)
break;
switch (c) {
case 'c':
{
int cpuflags = av_parse_cpu_flags(optarg);
if (cpuflags < 0)
return 2;
av_set_cpu_flags_mask(cpuflags);
break;
}
}
}
cpu_flags_eff = av_get_cpu_flags();
if (cpu_flags_eff < 0)
return 3;
print_cpu_flags(cpu_flags_raw, "raw");
print_cpu_flags(cpu_flags_eff, "effective");
return 0;
}

3
tests/fate/libavutil.mak
View File

@ -31,9 +31,8 @@ fate-bprint: CMD = run libavutil/bprint-test
FATE_LIBAVUTIL += fate-cpu
fate-cpu: libavutil/cpu-test$(EXESUF)
fate-cpu: CMD = runecho libavutil/cpu-test
fate-cpu: CMD = run libavutil/cpu-test $(CPUFLAGS:%=-c%)
fate-cpu: REF = /dev/null
fate-cpu: CMP = null
FATE_LIBAVUTIL += fate-crc
fate-crc: libavutil/crc-test$(EXESUF)