Commit 11733202 authored by Diego Biurrun's avatar Diego Biurrun

dsputil: Drop unused bit_depth parameter from all init functions

parent df2aa222
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
#include "libavcodec/dsputil.h" #include "libavcodec/dsputil.h"
void ff_dsputil_init_armv6(DSPContext *c, AVCodecContext *avctx, void ff_dsputil_init_armv6(DSPContext *c, AVCodecContext *avctx);
unsigned high_bit_depth);
#endif /* AVCODEC_ARM_DSPUTIL_ARM_H */ #endif /* AVCODEC_ARM_DSPUTIL_ARM_H */
...@@ -28,11 +28,10 @@ ...@@ -28,11 +28,10 @@
#include "libavcodec/dsputil.h" #include "libavcodec/dsputil.h"
#include "dsputil_arm.h" #include "dsputil_arm.h"
av_cold void ff_dsputil_init_arm(DSPContext *c, AVCodecContext *avctx, av_cold void ff_dsputil_init_arm(DSPContext *c, AVCodecContext *avctx)
unsigned high_bit_depth)
{ {
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
if (have_armv6(cpu_flags)) if (have_armv6(cpu_flags))
ff_dsputil_init_armv6(c, avctx, high_bit_depth); ff_dsputil_init_armv6(c, avctx);
} }
...@@ -39,8 +39,7 @@ int ff_pix_abs8_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2, ...@@ -39,8 +39,7 @@ int ff_pix_abs8_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2,
int ff_sse16_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2, int ff_sse16_armv6(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2,
int line_size, int h); int line_size, int h);
av_cold void ff_dsputil_init_armv6(DSPContext *c, AVCodecContext *avctx, av_cold void ff_dsputil_init_armv6(DSPContext *c, AVCodecContext *avctx)
unsigned high_bit_depth)
{ {
c->pix_abs[0][0] = ff_pix_abs16_armv6; c->pix_abs[0][0] = ff_pix_abs16_armv6;
c->pix_abs[0][1] = ff_pix_abs16_x2_armv6; c->pix_abs[0][1] = ff_pix_abs16_x2_armv6;
......
...@@ -902,8 +902,6 @@ av_cold void ff_dsputil_static_init(void) ...@@ -902,8 +902,6 @@ av_cold void ff_dsputil_static_init(void)
av_cold void ff_dsputil_init(DSPContext *c, AVCodecContext *avctx) av_cold void ff_dsputil_init(DSPContext *c, AVCodecContext *avctx)
{ {
const unsigned high_bit_depth = avctx->bits_per_raw_sample > 8;
c->sum_abs_dctelem = sum_abs_dctelem_c; c->sum_abs_dctelem = sum_abs_dctelem_c;
/* TODO [0] 16 [1] 8 */ /* TODO [0] 16 [1] 8 */
...@@ -946,9 +944,9 @@ av_cold void ff_dsputil_init(DSPContext *c, AVCodecContext *avctx) ...@@ -946,9 +944,9 @@ av_cold void ff_dsputil_init(DSPContext *c, AVCodecContext *avctx)
c->nsse[1] = nsse8_c; c->nsse[1] = nsse8_c;
if (ARCH_ARM) if (ARCH_ARM)
ff_dsputil_init_arm(c, avctx, high_bit_depth); ff_dsputil_init_arm(c, avctx);
if (ARCH_PPC) if (ARCH_PPC)
ff_dsputil_init_ppc(c, avctx, high_bit_depth); ff_dsputil_init_ppc(c, avctx);
if (ARCH_X86) if (ARCH_X86)
ff_dsputil_init_x86(c, avctx, high_bit_depth); ff_dsputil_init_x86(c, avctx);
} }
...@@ -78,11 +78,8 @@ void ff_dsputil_init(DSPContext *p, AVCodecContext *avctx); ...@@ -78,11 +78,8 @@ void ff_dsputil_init(DSPContext *p, AVCodecContext *avctx);
void ff_set_cmp(DSPContext *c, me_cmp_func *cmp, int type); void ff_set_cmp(DSPContext *c, me_cmp_func *cmp, int type);
void ff_dsputil_init_arm(DSPContext *c, AVCodecContext *avctx, void ff_dsputil_init_arm(DSPContext *c, AVCodecContext *avctx);
unsigned high_bit_depth); void ff_dsputil_init_ppc(DSPContext *c, AVCodecContext *avctx);
void ff_dsputil_init_ppc(DSPContext *c, AVCodecContext *avctx, void ff_dsputil_init_x86(DSPContext *c, AVCodecContext *avctx);
unsigned high_bit_depth);
void ff_dsputil_init_x86(DSPContext *c, AVCodecContext *avctx,
unsigned high_bit_depth);
#endif /* AVCODEC_DSPUTIL_H */ #endif /* AVCODEC_DSPUTIL_H */
...@@ -741,8 +741,7 @@ static int hadamard8_diff16_altivec(MpegEncContext *s, uint8_t *dst, ...@@ -741,8 +741,7 @@ static int hadamard8_diff16_altivec(MpegEncContext *s, uint8_t *dst,
return score; return score;
} }
av_cold void ff_dsputil_init_altivec(DSPContext *c, AVCodecContext *avctx, av_cold void ff_dsputil_init_altivec(DSPContext *c, AVCodecContext *avctx)
unsigned high_bit_depth)
{ {
c->pix_abs[0][1] = sad16_x2_altivec; c->pix_abs[0][1] = sad16_x2_altivec;
c->pix_abs[0][2] = sad16_y2_altivec; c->pix_abs[0][2] = sad16_y2_altivec;
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include "libavcodec/dsputil.h" #include "libavcodec/dsputil.h"
void ff_dsputil_init_altivec(DSPContext *c, AVCodecContext *avctx, void ff_dsputil_init_altivec(DSPContext *c, AVCodecContext *avctx);
unsigned high_bit_depth);
#endif /* AVCODEC_PPC_DSPUTIL_ALTIVEC_H */ #endif /* AVCODEC_PPC_DSPUTIL_ALTIVEC_H */
...@@ -29,10 +29,9 @@ ...@@ -29,10 +29,9 @@
#include "libavcodec/dsputil.h" #include "libavcodec/dsputil.h"
#include "dsputil_altivec.h" #include "dsputil_altivec.h"
av_cold void ff_dsputil_init_ppc(DSPContext *c, AVCodecContext *avctx, av_cold void ff_dsputil_init_ppc(DSPContext *c, AVCodecContext *avctx)
unsigned high_bit_depth)
{ {
if (PPC_ALTIVEC(av_get_cpu_flags())) { if (PPC_ALTIVEC(av_get_cpu_flags())) {
ff_dsputil_init_altivec(c, avctx, high_bit_depth); ff_dsputil_init_altivec(c, avctx);
} }
} }
...@@ -24,9 +24,8 @@ ...@@ -24,9 +24,8 @@
#include "libavcodec/dsputil.h" #include "libavcodec/dsputil.h"
#include "dsputil_x86.h" #include "dsputil_x86.h"
av_cold void ff_dsputil_init_x86(DSPContext *c, AVCodecContext *avctx, av_cold void ff_dsputil_init_x86(DSPContext *c, AVCodecContext *avctx)
unsigned high_bit_depth)
{ {
if (CONFIG_ENCODERS) if (CONFIG_ENCODERS)
ff_dsputilenc_init_mmx(c, avctx, high_bit_depth); ff_dsputilenc_init_mmx(c, avctx);
} }
...@@ -27,8 +27,7 @@ ...@@ -27,8 +27,7 @@
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
#include "libavcodec/dsputil.h" #include "libavcodec/dsputil.h"
void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx, void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx);
unsigned high_bit_depth);
void ff_dsputil_init_pix_mmx(DSPContext *c, AVCodecContext *avctx); void ff_dsputil_init_pix_mmx(DSPContext *c, AVCodecContext *avctx);
#endif /* AVCODEC_X86_DSPUTIL_X86_H */ #endif /* AVCODEC_X86_DSPUTIL_X86_H */
...@@ -813,8 +813,7 @@ hadamard_func(mmxext) ...@@ -813,8 +813,7 @@ hadamard_func(mmxext)
hadamard_func(sse2) hadamard_func(sse2)
hadamard_func(ssse3) hadamard_func(ssse3)
av_cold void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx, av_cold void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx)
unsigned high_bit_depth)
{ {
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment