Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

dsputil: Drop unused bit_depth parameter from all init functions

Browse Source
pull/77/head
Diego Biurrun 11 years ago
parent df2aa22203
commit 1173320249
11 changed files with 18 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      libavcodec/arm/dsputil_arm.h
  2. 5
      libavcodec/arm/dsputil_init_arm.c
  3. 3
      libavcodec/arm/dsputil_init_armv6.c
  4. 8
      libavcodec/dsputil.c
  5. 9
      libavcodec/dsputil.h
  6. 3
      libavcodec/ppc/dsputil_altivec.c
  7. 3
      libavcodec/ppc/dsputil_altivec.h
  8. 5
      libavcodec/ppc/dsputil_ppc.c
  9. 5
      libavcodec/x86/dsputil_init.c
  10. 3
      libavcodec/x86/dsputil_x86.h
  11. 3
      libavcodec/x86/dsputilenc_mmx.c

3
libavcodec/arm/dsputil_arm.h
Unescape View File

@ -24,7 +24,6 @@
#include "libavcodec/avcodec.h"
#include "libavcodec/dsputil.h"
void ff_dsputil_init_armv6(DSPContext *c, AVCodecContext *avctx,
unsigned high_bit_depth);
void ff_dsputil_init_armv6(DSPContext *c, AVCodecContext *avctx);
#endif /* AVCODEC_ARM_DSPUTIL_ARM_H */

5
libavcodec/arm/dsputil_init_arm.c
Unescape View File

@ -28,11 +28,10 @@
#include "libavcodec/dsputil.h"
#include "dsputil_arm.h"
av_cold void ff_dsputil_init_arm(DSPContext *c, AVCodecContext *avctx,
unsigned high_bit_depth)
av_cold void ff_dsputil_init_arm(DSPContext *c, AVCodecContext *avctx)
{
int cpu_flags = av_get_cpu_flags();
if (have_armv6(cpu_flags))
ff_dsputil_init_armv6(c, avctx, high_bit_depth);
ff_dsputil_init_armv6(c, avctx);
}

3
libavcodec/arm/dsputil_init_armv6.c
Unescape View File

@ -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 line_size, int h);
av_cold void ff_dsputil_init_armv6(DSPContext *c, AVCodecContext *avctx,
unsigned high_bit_depth)
av_cold void ff_dsputil_init_armv6(DSPContext *c, AVCodecContext *avctx)
{
c->pix_abs[0][0] = ff_pix_abs16_armv6;
c->pix_abs[0][1] = ff_pix_abs16_x2_armv6;

8
libavcodec/dsputil.c
Unescape View File

@ -902,8 +902,6 @@ av_cold void ff_dsputil_static_init(void)
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;
/* TODO [0] 16 [1] 8 */
@ -946,9 +944,9 @@ av_cold void ff_dsputil_init(DSPContext *c, AVCodecContext *avctx)
c->nsse[1] = nsse8_c;
if (ARCH_ARM)
ff_dsputil_init_arm(c, avctx, high_bit_depth);
ff_dsputil_init_arm(c, avctx);
if (ARCH_PPC)
ff_dsputil_init_ppc(c, avctx, high_bit_depth);
ff_dsputil_init_ppc(c, avctx);
if (ARCH_X86)
ff_dsputil_init_x86(c, avctx, high_bit_depth);
ff_dsputil_init_x86(c, avctx);
}

9
libavcodec/dsputil.h
Unescape View File

@ -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_dsputil_init_arm(DSPContext *c, AVCodecContext *avctx,
unsigned high_bit_depth);
void ff_dsputil_init_ppc(DSPContext *c, AVCodecContext *avctx,
unsigned high_bit_depth);
void ff_dsputil_init_x86(DSPContext *c, AVCodecContext *avctx,
unsigned high_bit_depth);
void ff_dsputil_init_arm(DSPContext *c, AVCodecContext *avctx);
void ff_dsputil_init_ppc(DSPContext *c, AVCodecContext *avctx);
void ff_dsputil_init_x86(DSPContext *c, AVCodecContext *avctx);
#endif /* AVCODEC_DSPUTIL_H */

3
libavcodec/ppc/dsputil_altivec.c
Unescape View File

@ -741,8 +741,7 @@ static int hadamard8_diff16_altivec(MpegEncContext *s, uint8_t *dst,
return score;
}
av_cold void ff_dsputil_init_altivec(DSPContext *c, AVCodecContext *avctx,
unsigned high_bit_depth)
av_cold void ff_dsputil_init_altivec(DSPContext *c, AVCodecContext *avctx)
{
c->pix_abs[0][1] = sad16_x2_altivec;
c->pix_abs[0][2] = sad16_y2_altivec;

3
libavcodec/ppc/dsputil_altivec.h
Unescape View File

@ -27,7 +27,6 @@
#include "libavcodec/dsputil.h"
void ff_dsputil_init_altivec(DSPContext *c, AVCodecContext *avctx,
unsigned high_bit_depth);
void ff_dsputil_init_altivec(DSPContext *c, AVCodecContext *avctx);
#endif /* AVCODEC_PPC_DSPUTIL_ALTIVEC_H */

5
libavcodec/ppc/dsputil_ppc.c
Unescape View File

@ -29,10 +29,9 @@
#include "libavcodec/dsputil.h"
#include "dsputil_altivec.h"
av_cold void ff_dsputil_init_ppc(DSPContext *c, AVCodecContext *avctx,
unsigned high_bit_depth)
av_cold void ff_dsputil_init_ppc(DSPContext *c, AVCodecContext *avctx)
{
if (PPC_ALTIVEC(av_get_cpu_flags())) {
ff_dsputil_init_altivec(c, avctx, high_bit_depth);
ff_dsputil_init_altivec(c, avctx);
}
}

5
libavcodec/x86/dsputil_init.c
Unescape View File

@ -24,9 +24,8 @@
#include "libavcodec/dsputil.h"
#include "dsputil_x86.h"
av_cold void ff_dsputil_init_x86(DSPContext *c, AVCodecContext *avctx,
unsigned high_bit_depth)
av_cold void ff_dsputil_init_x86(DSPContext *c, AVCodecContext *avctx)
{
if (CONFIG_ENCODERS)
ff_dsputilenc_init_mmx(c, avctx, high_bit_depth);
ff_dsputilenc_init_mmx(c, avctx);
}

3
libavcodec/x86/dsputil_x86.h
Unescape View File

@ -27,8 +27,7 @@
#include "libavcodec/avcodec.h"
#include "libavcodec/dsputil.h"
void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx,
unsigned high_bit_depth);
void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx);
void ff_dsputil_init_pix_mmx(DSPContext *c, AVCodecContext *avctx);
#endif /* AVCODEC_X86_DSPUTIL_X86_H */

3
libavcodec/x86/dsputilenc_mmx.c
Unescape View File

@ -813,8 +813,7 @@ hadamard_func(mmxext)
hadamard_func(sse2)
hadamard_func(ssse3)
av_cold void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx,
unsigned high_bit_depth)
av_cold void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx)
{
int cpu_flags = av_get_cpu_flags();

Write Preview
Loading…
Cancel
Save