opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-05-17 23:17:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/{x86,mips}/xvididct_init: Remove redundant checks

Browse Source 
ff_xvid_idct_init() already checks in case of high_bit_depth,
lowres or an incompatible idct_algo.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-03-27 02:57:20 +01:00
parent 1f2b8d7238
commit 3792cf52af
4 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/mips/xvididct_init_mips.c
View File

@ -22,20 +22,14 @@
#include "libavutil/mips/cpu.h" #include "libavutil/mips/cpu.h"
#include "xvididct_mips.h" #include "xvididct_mips.h"
av_cold void ff_xvid_idct_init_mips(IDCTDSPContext *c, AVCodecContext *avctx, av_cold void ff_xvid_idct_init_mips(IDCTDSPContext *c)
unsigned high_bit_depth)
{ {
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
if (have_mmi(cpu_flags)) { if (have_mmi(cpu_flags)) {
if (!high_bit_depth) {
if (avctx->idct_algo == FF_IDCT_AUTO ||
avctx->idct_algo == FF_IDCT_XVID) {
c->idct_put = ff_xvid_idct_put_mmi; c->idct_put = ff_xvid_idct_put_mmi;
c->idct_add = ff_xvid_idct_add_mmi; c->idct_add = ff_xvid_idct_add_mmi;
c->idct = ff_xvid_idct_mmi; c->idct = ff_xvid_idct_mmi;
c->perm_type = FF_IDCT_PERM_NONE; c->perm_type = FF_IDCT_PERM_NONE;
} }
}
}
} }

8
libavcodec/x86/xvididct_init.c
View File

@ -25,17 +25,11 @@
#include "xvididct.h" #include "xvididct.h"
av_cold void ff_xvid_idct_init_x86(IDCTDSPContext *c, AVCodecContext *avctx, av_cold void ff_xvid_idct_init_x86(IDCTDSPContext *c)
unsigned high_bit_depth)
{ {
#if HAVE_X86ASM #if HAVE_X86ASM
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
if (high_bit_depth ||
!(avctx->idct_algo == FF_IDCT_AUTO ||
avctx->idct_algo == FF_IDCT_XVID))
return;
if (EXTERNAL_SSE2(cpu_flags)) { if (EXTERNAL_SSE2(cpu_flags)) {
c->idct_put = ff_xvid_idct_put_sse2; c->idct_put = ff_xvid_idct_put_sse2;
c->idct_add = ff_xvid_idct_add_sse2; c->idct_add = ff_xvid_idct_add_sse2;

4
libavcodec/xvididct.c
View File

@ -347,9 +347,9 @@ av_cold void ff_xvid_idct_init(IDCTDSPContext *c, AVCodecContext *avctx)
} }
#if ARCH_X86 #if ARCH_X86
ff_xvid_idct_init_x86(c, avctx, high_bit_depth); ff_xvid_idct_init_x86(c);
#elif ARCH_MIPS #elif ARCH_MIPS
ff_xvid_idct_init_mips(c, avctx, high_bit_depth); ff_xvid_idct_init_mips(c);
#endif #endif
ff_init_scantable_permutation(c->idct_permutation, c->perm_type); ff_init_scantable_permutation(c->idct_permutation, c->perm_type);

6
libavcodec/xvididct.h
View File

@ -28,9 +28,7 @@ void ff_xvid_idct(int16_t *const in);
void ff_xvid_idct_init(IDCTDSPContext *c, AVCodecContext *avctx); void ff_xvid_idct_init(IDCTDSPContext *c, AVCodecContext *avctx);
void ff_xvid_idct_init_x86(IDCTDSPContext *c, AVCodecContext *avctx, void ff_xvid_idct_init_x86(IDCTDSPContext *c);
unsigned high_bit_depth); void ff_xvid_idct_init_mips(IDCTDSPContext *c);
void ff_xvid_idct_init_mips(IDCTDSPContext *c, AVCodecContext *avctx,
unsigned high_bit_depth);
#endif /* AVCODEC_XVIDIDCT_H */ #endif /* AVCODEC_XVIDIDCT_H */