chacha/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

all: Replace if (ARCH_FOO) checks by #if ARCH_FOO

Browse Source 
This is more spec-compliant because it does not rely
on dead-code elimination by the compiler. Especially
MSVC has problems with this, as can be seen in
https://ffmpeg.org/pipermail/ffmpeg-devel/2022-May/296373.html
or
https://ffmpeg.org/pipermail/ffmpeg-devel/2022-May/297022.html

This commit does not eliminate every instance where we rely
on dead code elimination: It only tackles branching to
the initialization of arch-specific dsp code, not e.g. all
uses of CONFIG_ and HAVE_ checks. But maybe it is already
enough to compile FFmpeg with MSVC with whole-programm-optimizations
enabled (if one does not disable too many components).

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2022-06-12 05:51:12 +02:00
parent e5f6707a7b
commit 40e6575aa3
131 changed files with 738 additions and 567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libswresample/audioconvert.c
View File

@@ -176,9 +176,13 @@ AudioConvert *swri_audio_convert_alloc(enum AVSampleFormat out_fmt,
}
}
if(HAVE_X86ASM && HAVE_MMX) swri_audio_convert_init_x86(ctx, out_fmt, in_fmt, channels);
if(ARCH_ARM) swri_audio_convert_init_arm(ctx, out_fmt, in_fmt, channels);
if(ARCH_AARCH64) swri_audio_convert_init_aarch64(ctx, out_fmt, in_fmt, channels);
#if ARCH_X86 && HAVE_X86ASM && HAVE_MMX
swri_audio_convert_init_x86(ctx, out_fmt, in_fmt, channels);
#elif ARCH_ARM
swri_audio_convert_init_arm(ctx, out_fmt, in_fmt, channels);
#elif ARCH_AARCH64
swri_audio_convert_init_aarch64(ctx, out_fmt, in_fmt, channels);
#endif
return ctx;
}

5
libswresample/rematrix.c
View File

@@ -565,8 +565,9 @@ av_cold int swri_rematrix_init(SwrContext *s){
s->matrix_ch[i][0]= ch_in;
}
if(HAVE_X86ASM && HAVE_MMX)
return swri_rematrix_init_x86(s);
#if ARCH_X86 && HAVE_X86ASM && HAVE_MMX
return swri_rematrix_init_x86(s);
#endif
return 0;
}

10
libswresample/resample_dsp.c
View File

@@ -68,7 +68,11 @@ void swri_resample_dsp_init(ResampleContext *c)
break;
}
if (ARCH_X86) swri_resample_dsp_x86_init(c);
else if (ARCH_ARM) swri_resample_dsp_arm_init(c);
else if (ARCH_AARCH64) swri_resample_dsp_aarch64_init(c);
#if ARCH_X86
swri_resample_dsp_x86_init(c);
#elif ARCH_ARM
swri_resample_dsp_arm_init(c);
#elif ARCH_AARCH64
swri_resample_dsp_aarch64_init(c);
#endif
}