avcodec/idctdsp: Only try to initialize xvid idct if it is used

This allows to remove checks from ff_xvid_idct_init() (and also the AVCodecContext* parameter).

Andreas Rheinhardt committed 1 year ago

Commit 2e8a3e61 parent 6349a333 files · +6 −12Browse files

Unified · Split

3 files

                 c->idct      = ff_faanidct;
                 c->perm_type = FF_IDCT_PERM_NONE;
 #endif /* CONFIG_FAANIDCT */
+#if CONFIG_MPEG4_DECODER
+            } else if (avctx->idct_algo == FF_IDCT_XVID) {
+                ff_xvid_idct_init(c);
+#endif
             } else { // accurate/default
                 c->idct_put  = ff_simple_idct_put_int16_8bit;
                 c->idct_add  = ff_simple_idct_add_int16_8bit;
     c->put_signed_pixels_clamped = put_signed_pixels_clamped_c;
     c->add_pixels_clamped        = ff_add_pixels_clamped_c;
-    if (CONFIG_MPEG4_DECODER && avctx->idct_algo == FF_IDCT_XVID)
-        ff_xvid_idct_init(c, avctx);
 #if ARCH_AARCH64
     ff_idctdsp_init_aarch64(c, avctx, high_bit_depth);
 #elif ARCH_ARM

 #include "config.h"
 #include "libavutil/attributes.h"
-#include "avcodec.h"
 #include "idctdsp.h"
 #include "xvididct.h"
     ff_add_pixels_clamped_c(block, dest, line_size);
 }
-av_cold void ff_xvid_idct_init(IDCTDSPContext *c, AVCodecContext *avctx)
+av_cold void ff_xvid_idct_init(IDCTDSPContext *c)
 {
-    const unsigned high_bit_depth = avctx->bits_per_raw_sample > 8;
-    if (high_bit_depth || avctx->lowres)
-        return;
     c->idct_put  = xvid_idct_put;
     c->idct_add  = xvid_idct_add;
     c->idct      = ff_xvid_idct;

@@ -21,12 +21,11 @@ · 20 unmodified lines
21		21
22	#include <stdint.h>	22	#include <stdint.h>
23		23
24	#include "avcodec.h"
25	#include "idctdsp.h"	24	#include "idctdsp.h"
26		25
27	void ff_xvid_idct(int16_t *const in);	26	void ff_xvid_idct(int16_t *const in);
28		27
29	void ff_xvid_idct_init(IDCTDSPContext c, AVCodecContext avctx);	28	void ff_xvid_idct_init(IDCTDSPContext *c);
30		29
31	void ff_xvid_idct_init_x86(IDCTDSPContext *c);	30	void ff_xvid_idct_init_x86(IDCTDSPContext *c);
32	void ff_xvid_idct_init_mips(IDCTDSPContext *c);	31	void ff_xvid_idct_init_mips(IDCTDSPContext *c);

Keyboard shortcuts