Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa'

* commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa':
  cosmetics: Remove unnecessary extern keywords from function declarations

Conflicts:
	libswscale/x86/swscale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/13/merge
Michael Niedermayer 12 years ago
commit 63a97d5674
  1. 2
      libavcodec/mpeg12.h
  2. 36
      libavcodec/x86/ac3dsp_init.c
  3. 2
      libavcodec/x86/videodsp.asm
  4. 94
      libavcodec/x86/vp8dsp_init.c
  5. 102
      libavresample/x86/audio_convert_init.c
  6. 48
      libavresample/x86/audio_mix_init.c
  7. 11
      libavresample/x86/dither_init.c
  8. 8
      libavutil/ppc/float_dsp_altivec.h
  9. 14
      libavutil/x86/float_dsp_init.c
  10. 10
      libswscale/x86/swscale.c

@ -71,6 +71,6 @@ static inline int decode_dc(GetBitContext *gb, int component)
return diff; return diff;
} }
extern int ff_mpeg1_decode_block_intra(MpegEncContext *s, int16_t *block, int n); int ff_mpeg1_decode_block_intra(MpegEncContext *s, int16_t *block, int n);
#endif /* AVCODEC_MPEG12_H */ #endif /* AVCODEC_MPEG12_H */

@ -26,30 +26,30 @@
#include "libavcodec/ac3.h" #include "libavcodec/ac3.h"
#include "libavcodec/ac3dsp.h" #include "libavcodec/ac3dsp.h"
extern void ff_ac3_exponent_min_mmx (uint8_t *exp, int num_reuse_blocks, int nb_coefs); void ff_ac3_exponent_min_mmx (uint8_t *exp, int num_reuse_blocks, int nb_coefs);
extern void ff_ac3_exponent_min_mmxext(uint8_t *exp, int num_reuse_blocks, int nb_coefs); void ff_ac3_exponent_min_mmxext(uint8_t *exp, int num_reuse_blocks, int nb_coefs);
extern void ff_ac3_exponent_min_sse2 (uint8_t *exp, int num_reuse_blocks, int nb_coefs); void ff_ac3_exponent_min_sse2 (uint8_t *exp, int num_reuse_blocks, int nb_coefs);
extern int ff_ac3_max_msb_abs_int16_mmx (const int16_t *src, int len); int ff_ac3_max_msb_abs_int16_mmx (const int16_t *src, int len);
extern int ff_ac3_max_msb_abs_int16_mmxext(const int16_t *src, int len); int ff_ac3_max_msb_abs_int16_mmxext(const int16_t *src, int len);
extern int ff_ac3_max_msb_abs_int16_sse2 (const int16_t *src, int len); int ff_ac3_max_msb_abs_int16_sse2 (const int16_t *src, int len);
extern int ff_ac3_max_msb_abs_int16_ssse3(const int16_t *src, int len); int ff_ac3_max_msb_abs_int16_ssse3(const int16_t *src, int len);
extern void ff_ac3_lshift_int16_mmx (int16_t *src, unsigned int len, unsigned int shift); void ff_ac3_lshift_int16_mmx (int16_t *src, unsigned int len, unsigned int shift);
extern void ff_ac3_lshift_int16_sse2(int16_t *src, unsigned int len, unsigned int shift); void ff_ac3_lshift_int16_sse2(int16_t *src, unsigned int len, unsigned int shift);
extern void ff_ac3_rshift_int32_mmx (int32_t *src, unsigned int len, unsigned int shift); void ff_ac3_rshift_int32_mmx (int32_t *src, unsigned int len, unsigned int shift);
extern void ff_ac3_rshift_int32_sse2(int32_t *src, unsigned int len, unsigned int shift); void ff_ac3_rshift_int32_sse2(int32_t *src, unsigned int len, unsigned int shift);
extern void ff_float_to_fixed24_3dnow(int32_t *dst, const float *src, unsigned int len); void ff_float_to_fixed24_3dnow(int32_t *dst, const float *src, unsigned int len);
extern void ff_float_to_fixed24_sse (int32_t *dst, const float *src, unsigned int len); void ff_float_to_fixed24_sse (int32_t *dst, const float *src, unsigned int len);
extern void ff_float_to_fixed24_sse2 (int32_t *dst, const float *src, unsigned int len); void ff_float_to_fixed24_sse2 (int32_t *dst, const float *src, unsigned int len);
extern int ff_ac3_compute_mantissa_size_sse2(uint16_t mant_cnt[6][16]); int ff_ac3_compute_mantissa_size_sse2(uint16_t mant_cnt[6][16]);
extern void ff_ac3_extract_exponents_3dnow(uint8_t *exp, int32_t *coef, int nb_coefs); void ff_ac3_extract_exponents_3dnow(uint8_t *exp, int32_t *coef, int nb_coefs);
extern void ff_ac3_extract_exponents_sse2 (uint8_t *exp, int32_t *coef, int nb_coefs); void ff_ac3_extract_exponents_sse2 (uint8_t *exp, int32_t *coef, int nb_coefs);
extern void ff_ac3_extract_exponents_ssse3(uint8_t *exp, int32_t *coef, int nb_coefs); void ff_ac3_extract_exponents_ssse3(uint8_t *exp, int32_t *coef, int nb_coefs);
#if ARCH_X86_32 && defined(__INTEL_COMPILER) #if ARCH_X86_32 && defined(__INTEL_COMPILER)
# undef HAVE_7REGS # undef HAVE_7REGS

@ -23,7 +23,7 @@
SECTION .text SECTION .text
; extern void ff_emu_edge_core(uint8_t *buf, const uint8_t *src, x86_reg linesize, ; void ff_emu_edge_core(uint8_t *buf, const uint8_t *src, x86_reg linesize,
; x86_reg start_y, x86_reg end_y, x86_reg block_h, ; x86_reg start_y, x86_reg end_y, x86_reg block_h,
; x86_reg start_x, x86_reg end_x, x86_reg block_w); ; x86_reg start_x, x86_reg end_x, x86_reg block_w);
; ;

@ -30,91 +30,91 @@
/* /*
* MC functions * MC functions
*/ */
extern void ff_put_vp8_epel4_h4_mmxext(uint8_t *dst, ptrdiff_t dststride, void ff_put_vp8_epel4_h4_mmxext(uint8_t *dst, ptrdiff_t dststride,
uint8_t *src, ptrdiff_t srcstride, uint8_t *src, ptrdiff_t srcstride,
int height, int mx, int my); int height, int mx, int my);
extern void ff_put_vp8_epel4_h6_mmxext(uint8_t *dst, ptrdiff_t dststride, void ff_put_vp8_epel4_h6_mmxext(uint8_t *dst, ptrdiff_t dststride,
uint8_t *src, ptrdiff_t srcstride, uint8_t *src, ptrdiff_t srcstride,
int height, int mx, int my); int height, int mx, int my);
extern void ff_put_vp8_epel4_v4_mmxext(uint8_t *dst, ptrdiff_t dststride, void ff_put_vp8_epel4_v4_mmxext(uint8_t *dst, ptrdiff_t dststride,
uint8_t *src, ptrdiff_t srcstride, uint8_t *src, ptrdiff_t srcstride,
int height, int mx, int my); int height, int mx, int my);
extern void ff_put_vp8_epel4_v6_mmxext(uint8_t *dst, ptrdiff_t dststride, void ff_put_vp8_epel4_v6_mmxext(uint8_t *dst, ptrdiff_t dststride,
uint8_t *src, ptrdiff_t srcstride, uint8_t *src, ptrdiff_t srcstride,
int height, int mx, int my); int height, int mx, int my);
extern void ff_put_vp8_epel8_h4_sse2 (uint8_t *dst, ptrdiff_t dststride, void ff_put_vp8_epel8_h4_sse2 (uint8_t *dst, ptrdiff_t dststride,
uint8_t *src, ptrdiff_t srcstride, uint8_t *src, ptrdiff_t srcstride,
int height, int mx, int my); int height, int mx, int my);
extern void ff_put_vp8_epel8_h6_sse2 (uint8_t *dst, ptrdiff_t dststride, void ff_put_vp8_epel8_h6_sse2 (uint8_t *dst, ptrdiff_t dststride,
uint8_t *src, ptrdiff_t srcstride, uint8_t *src, ptrdiff_t srcstride,
int height, int mx, int my); int height, int mx, int my);
extern void ff_put_vp8_epel8_v4_sse2 (uint8_t *dst, ptrdiff_t dststride, void ff_put_vp8_epel8_v4_sse2 (uint8_t *dst, ptrdiff_t dststride,
uint8_t *src, ptrdiff_t srcstride, uint8_t *src, ptrdiff_t srcstride,
int height, int mx, int my); int height, int mx, int my);
extern void ff_put_vp8_epel8_v6_sse2 (uint8_t *dst, ptrdiff_t dststride, void ff_put_vp8_epel8_v6_sse2 (uint8_t *dst, ptrdiff_t dststride,
uint8_t *src, ptrdiff_t srcstride, uint8_t *src, ptrdiff_t srcstride,
int height, int mx, int my); int height, int mx, int my);
extern void ff_put_vp8_epel4_h4_ssse3 (uint8_t *dst, ptrdiff_t dststride, void ff_put_vp8_epel4_h4_ssse3 (uint8_t *dst, ptrdiff_t dststride,
uint8_t *src, ptrdiff_t srcstride, uint8_t *src, ptrdiff_t srcstride,
int height, int mx, int my); int height, int mx, int my);
extern void ff_put_vp8_epel4_h6_ssse3 (uint8_t *dst, ptrdiff_t dststride, void ff_put_vp8_epel4_h6_ssse3 (uint8_t *dst, ptrdiff_t dststride,
uint8_t *src, ptrdiff_t srcstride, uint8_t *src, ptrdiff_t srcstride,
int height, int mx, int my); int height, int mx, int my);
extern void ff_put_vp8_epel4_v4_ssse3 (uint8_t *dst, ptrdiff_t dststride, void ff_put_vp8_epel4_v4_ssse3 (uint8_t *dst, ptrdiff_t dststride,
uint8_t *src, ptrdiff_t srcstride, uint8_t *src, ptrdiff_t srcstride,
int height, int mx, int my); int height, int mx, int my);
extern void ff_put_vp8_epel4_v6_ssse3 (uint8_t *dst, ptrdiff_t dststride, void ff_put_vp8_epel4_v6_ssse3 (uint8_t *dst, ptrdiff_t dststride,
uint8_t *src, ptrdiff_t srcstride, uint8_t *src, ptrdiff_t srcstride,
int height, int mx, int my); int height, int mx, int my);
extern void ff_put_vp8_epel8_h4_ssse3 (uint8_t *dst, ptrdiff_t dststride, void ff_put_vp8_epel8_h4_ssse3 (uint8_t *dst, ptrdiff_t dststride,
uint8_t *src, ptrdiff_t srcstride, uint8_t *src, ptrdiff_t srcstride,
int height, int mx, int my); int height, int mx, int my);
extern void ff_put_vp8_epel8_h6_ssse3 (uint8_t *dst, ptrdiff_t dststride, void ff_put_vp8_epel8_h6_ssse3 (uint8_t *dst, ptrdiff_t dststride,
uint8_t *src, ptrdiff_t srcstride, uint8_t *src, ptrdiff_t srcstride,
int height, int mx, int my); int height, int mx, int my);
extern void ff_put_vp8_epel8_v4_ssse3 (uint8_t *dst, ptrdiff_t dststride, void ff_put_vp8_epel8_v4_ssse3 (uint8_t *dst, ptrdiff_t dststride,
uint8_t *src, ptrdiff_t srcstride, uint8_t *src, ptrdiff_t srcstride,
int height, int mx, int my); int height, int mx, int my);
extern void ff_put_vp8_epel8_v6_ssse3 (uint8_t *dst, ptrdiff_t dststride, void ff_put_vp8_epel8_v6_ssse3 (uint8_t *dst, ptrdiff_t dststride,
uint8_t *src, ptrdiff_t srcstride, uint8_t *src, ptrdiff_t srcstride,
int height, int mx, int my); int height, int mx, int my);
extern void ff_put_vp8_bilinear4_h_mmxext(uint8_t *dst, ptrdiff_t dststride, void ff_put_vp8_bilinear4_h_mmxext(uint8_t *dst, ptrdiff_t dststride,
uint8_t *src, ptrdiff_t srcstride, uint8_t *src, ptrdiff_t srcstride,
int height, int mx, int my); int height, int mx, int my);
extern void ff_put_vp8_bilinear8_h_sse2 (uint8_t *dst, ptrdiff_t dststride, void ff_put_vp8_bilinear8_h_sse2 (uint8_t *dst, ptrdiff_t dststride,
uint8_t *src, ptrdiff_t srcstride, uint8_t *src, ptrdiff_t srcstride,
int height, int mx, int my); int height, int mx, int my);
extern void ff_put_vp8_bilinear4_h_ssse3 (uint8_t *dst, ptrdiff_t dststride, void ff_put_vp8_bilinear4_h_ssse3 (uint8_t *dst, ptrdiff_t dststride,
uint8_t *src, ptrdiff_t srcstride, uint8_t *src, ptrdiff_t srcstride,
int height, int mx, int my); int height, int mx, int my);
extern void ff_put_vp8_bilinear8_h_ssse3 (uint8_t *dst, ptrdiff_t dststride, void ff_put_vp8_bilinear8_h_ssse3 (uint8_t *dst, ptrdiff_t dststride,
uint8_t *src, ptrdiff_t srcstride, uint8_t *src, ptrdiff_t srcstride,
int height, int mx, int my); int height, int mx, int my);
extern void ff_put_vp8_bilinear4_v_mmxext(uint8_t *dst, ptrdiff_t dststride, void ff_put_vp8_bilinear4_v_mmxext(uint8_t *dst, ptrdiff_t dststride,
uint8_t *src, ptrdiff_t srcstride, uint8_t *src, ptrdiff_t srcstride,
int height, int mx, int my); int height, int mx, int my);
extern void ff_put_vp8_bilinear8_v_sse2 (uint8_t *dst, ptrdiff_t dststride, void ff_put_vp8_bilinear8_v_sse2 (uint8_t *dst, ptrdiff_t dststride,
uint8_t *src, ptrdiff_t srcstride, uint8_t *src, ptrdiff_t srcstride,
int height, int mx, int my); int height, int mx, int my);
extern void ff_put_vp8_bilinear4_v_ssse3 (uint8_t *dst, ptrdiff_t dststride, void ff_put_vp8_bilinear4_v_ssse3 (uint8_t *dst, ptrdiff_t dststride,
uint8_t *src, ptrdiff_t srcstride, uint8_t *src, ptrdiff_t srcstride,
int height, int mx, int my); int height, int mx, int my);
extern void ff_put_vp8_bilinear8_v_ssse3 (uint8_t *dst, ptrdiff_t dststride, void ff_put_vp8_bilinear8_v_ssse3 (uint8_t *dst, ptrdiff_t dststride,
uint8_t *src, ptrdiff_t srcstride, uint8_t *src, ptrdiff_t srcstride,
int height, int mx, int my); int height, int mx, int my);
extern void ff_put_vp8_pixels8_mmx (uint8_t *dst, ptrdiff_t dststride, void ff_put_vp8_pixels8_mmx (uint8_t *dst, ptrdiff_t dststride,
uint8_t *src, ptrdiff_t srcstride, uint8_t *src, ptrdiff_t srcstride,
int height, int mx, int my); int height, int mx, int my);
extern void ff_put_vp8_pixels16_mmx(uint8_t *dst, ptrdiff_t dststride, void ff_put_vp8_pixels16_mmx(uint8_t *dst, ptrdiff_t dststride,
uint8_t *src, ptrdiff_t srcstride, uint8_t *src, ptrdiff_t srcstride,
int height, int mx, int my); int height, int mx, int my);
extern void ff_put_vp8_pixels16_sse(uint8_t *dst, ptrdiff_t dststride, void ff_put_vp8_pixels16_sse(uint8_t *dst, ptrdiff_t dststride,
uint8_t *src, ptrdiff_t srcstride, uint8_t *src, ptrdiff_t srcstride,
int height, int mx, int my); int height, int mx, int my);
@ -230,55 +230,53 @@ HVBILIN(ssse3, 8, 4, 8)
HVBILIN(ssse3, 8, 8, 16) HVBILIN(ssse3, 8, 8, 16)
HVBILIN(ssse3, 8, 16, 16) HVBILIN(ssse3, 8, 16, 16)
extern void ff_vp8_idct_dc_add_mmx(uint8_t *dst, int16_t block[16], void ff_vp8_idct_dc_add_mmx(uint8_t *dst, int16_t block[16],
ptrdiff_t stride); ptrdiff_t stride);
extern void ff_vp8_idct_dc_add_sse4(uint8_t *dst, int16_t block[16], void ff_vp8_idct_dc_add_sse4(uint8_t *dst, int16_t block[16],
ptrdiff_t stride); ptrdiff_t stride);
extern void ff_vp8_idct_dc_add4y_mmx(uint8_t *dst, int16_t block[4][16], void ff_vp8_idct_dc_add4y_mmx(uint8_t *dst, int16_t block[4][16],
ptrdiff_t stride); ptrdiff_t stride);
extern void ff_vp8_idct_dc_add4y_sse2(uint8_t *dst, int16_t block[4][16], void ff_vp8_idct_dc_add4y_sse2(uint8_t *dst, int16_t block[4][16],
ptrdiff_t stride); ptrdiff_t stride);
extern void ff_vp8_idct_dc_add4uv_mmx(uint8_t *dst, int16_t block[2][16], void ff_vp8_idct_dc_add4uv_mmx(uint8_t *dst, int16_t block[2][16],
ptrdiff_t stride);
extern void ff_vp8_luma_dc_wht_mmx(int16_t block[4][4][16], int16_t dc[16]);
extern void ff_vp8_luma_dc_wht_sse(int16_t block[4][4][16], int16_t dc[16]);
extern void ff_vp8_idct_add_mmx(uint8_t *dst, int16_t block[16],
ptrdiff_t stride);
extern void ff_vp8_idct_add_sse(uint8_t *dst, int16_t block[16],
ptrdiff_t stride); ptrdiff_t stride);
void ff_vp8_luma_dc_wht_mmx(int16_t block[4][4][16], int16_t dc[16]);
void ff_vp8_luma_dc_wht_sse(int16_t block[4][4][16], int16_t dc[16]);
void ff_vp8_idct_add_mmx(uint8_t *dst, int16_t block[16], ptrdiff_t stride);
void ff_vp8_idct_add_sse(uint8_t *dst, int16_t block[16], ptrdiff_t stride);
#define DECLARE_LOOP_FILTER(NAME) \ #define DECLARE_LOOP_FILTER(NAME) \
extern void ff_vp8_v_loop_filter_simple_ ## NAME(uint8_t *dst, \ void ff_vp8_v_loop_filter_simple_ ## NAME(uint8_t *dst, \
ptrdiff_t stride, \ ptrdiff_t stride, \
int flim); \ int flim); \
extern void ff_vp8_h_loop_filter_simple_ ## NAME(uint8_t *dst, \ void ff_vp8_h_loop_filter_simple_ ## NAME(uint8_t *dst, \
ptrdiff_t stride, \ ptrdiff_t stride, \
int flim); \ int flim); \
extern void ff_vp8_v_loop_filter16y_inner_ ## NAME (uint8_t *dst, \ void ff_vp8_v_loop_filter16y_inner_ ## NAME (uint8_t *dst, \
ptrdiff_t stride, \ ptrdiff_t stride, \
int e, int i, int hvt); \ int e, int i, int hvt); \
extern void ff_vp8_h_loop_filter16y_inner_ ## NAME (uint8_t *dst, \ void ff_vp8_h_loop_filter16y_inner_ ## NAME (uint8_t *dst, \
ptrdiff_t stride, \ ptrdiff_t stride, \
int e, int i, int hvt); \ int e, int i, int hvt); \
extern void ff_vp8_v_loop_filter8uv_inner_ ## NAME (uint8_t *dstU, \ void ff_vp8_v_loop_filter8uv_inner_ ## NAME (uint8_t *dstU, \
uint8_t *dstV, \ uint8_t *dstV, \
ptrdiff_t s, \ ptrdiff_t s, \
int e, int i, int hvt); \ int e, int i, int hvt); \
extern void ff_vp8_h_loop_filter8uv_inner_ ## NAME (uint8_t *dstU, \ void ff_vp8_h_loop_filter8uv_inner_ ## NAME (uint8_t *dstU, \
uint8_t *dstV, \ uint8_t *dstV, \
ptrdiff_t s, \ ptrdiff_t s, \
int e, int i, int hvt); \ int e, int i, int hvt); \
extern void ff_vp8_v_loop_filter16y_mbedge_ ## NAME(uint8_t *dst, \ void ff_vp8_v_loop_filter16y_mbedge_ ## NAME(uint8_t *dst, \
ptrdiff_t stride, \ ptrdiff_t stride, \
int e, int i, int hvt); \ int e, int i, int hvt); \
extern void ff_vp8_h_loop_filter16y_mbedge_ ## NAME(uint8_t *dst, \ void ff_vp8_h_loop_filter16y_mbedge_ ## NAME(uint8_t *dst, \
ptrdiff_t stride, \ ptrdiff_t stride, \
int e, int i, int hvt); \ int e, int i, int hvt); \
extern void ff_vp8_v_loop_filter8uv_mbedge_ ## NAME(uint8_t *dstU, \ void ff_vp8_v_loop_filter8uv_mbedge_ ## NAME(uint8_t *dstU, \
uint8_t *dstV, \ uint8_t *dstV, \
ptrdiff_t s, \ ptrdiff_t s, \
int e, int i, int hvt); \ int e, int i, int hvt); \
extern void ff_vp8_h_loop_filter8uv_mbedge_ ## NAME(uint8_t *dstU, \ void ff_vp8_h_loop_filter8uv_mbedge_ ## NAME(uint8_t *dstU, \
uint8_t *dstV, \ uint8_t *dstV, \
ptrdiff_t s, \ ptrdiff_t s, \
int e, int i, int hvt); int e, int i, int hvt);

@ -25,122 +25,122 @@
/* flat conversions */ /* flat conversions */
extern void ff_conv_s16_to_s32_sse2(int16_t *dst, const int32_t *src, int len); void ff_conv_s16_to_s32_sse2(int16_t *dst, const int32_t *src, int len);
extern void ff_conv_s16_to_flt_sse2(float *dst, const int16_t *src, int len); void ff_conv_s16_to_flt_sse2(float *dst, const int16_t *src, int len);
extern void ff_conv_s16_to_flt_sse4(float *dst, const int16_t *src, int len); void ff_conv_s16_to_flt_sse4(float *dst, const int16_t *src, int len);
extern void ff_conv_s32_to_s16_mmx (int16_t *dst, const int32_t *src, int len); void ff_conv_s32_to_s16_mmx (int16_t *dst, const int32_t *src, int len);
extern void ff_conv_s32_to_s16_sse2(int16_t *dst, const int32_t *src, int len); void ff_conv_s32_to_s16_sse2(int16_t *dst, const int32_t *src, int len);
extern void ff_conv_s32_to_flt_sse2(float *dst, const int32_t *src, int len); void ff_conv_s32_to_flt_sse2(float *dst, const int32_t *src, int len);
extern void ff_conv_s32_to_flt_avx (float *dst, const int32_t *src, int len); void ff_conv_s32_to_flt_avx (float *dst, const int32_t *src, int len);
extern void ff_conv_flt_to_s16_sse2(int16_t *dst, const float *src, int len); void ff_conv_flt_to_s16_sse2(int16_t *dst, const float *src, int len);
extern void ff_conv_flt_to_s32_sse2(int32_t *dst, const float *src, int len); void ff_conv_flt_to_s32_sse2(int32_t *dst, const float *src, int len);
extern void ff_conv_flt_to_s32_avx (int32_t *dst, const float *src, int len); void ff_conv_flt_to_s32_avx (int32_t *dst, const float *src, int len);
/* interleave conversions */ /* interleave conversions */
extern void ff_conv_s16p_to_s16_2ch_sse2(int16_t *dst, int16_t *const *src, void ff_conv_s16p_to_s16_2ch_sse2(int16_t *dst, int16_t *const *src,
int len, int channels); int len, int channels);
extern void ff_conv_s16p_to_s16_2ch_avx (int16_t *dst, int16_t *const *src, void ff_conv_s16p_to_s16_2ch_avx (int16_t *dst, int16_t *const *src,
int len, int channels); int len, int channels);
extern void ff_conv_s16p_to_s16_6ch_sse2(int16_t *dst, int16_t *const *src, void ff_conv_s16p_to_s16_6ch_sse2(int16_t *dst, int16_t *const *src,
int len, int channels); int len, int channels);
extern void ff_conv_s16p_to_s16_6ch_sse2slow(int16_t *dst, int16_t *const *src, void ff_conv_s16p_to_s16_6ch_sse2slow(int16_t *dst, int16_t *const *src,
int len, int channels); int len, int channels);
extern void ff_conv_s16p_to_s16_6ch_avx (int16_t *dst, int16_t *const *src, void ff_conv_s16p_to_s16_6ch_avx (int16_t *dst, int16_t *const *src,
int len, int channels); int len, int channels);
extern void ff_conv_s16p_to_flt_2ch_sse2(float *dst, int16_t *const *src, void ff_conv_s16p_to_flt_2ch_sse2(float *dst, int16_t *const *src,
int len, int channels); int len, int channels);
extern void ff_conv_s16p_to_flt_2ch_avx (float *dst, int16_t *const *src, void ff_conv_s16p_to_flt_2ch_avx (float *dst, int16_t *const *src,
int len, int channels); int len, int channels);
extern void ff_conv_s16p_to_flt_6ch_sse2 (float *dst, int16_t *const *src, void ff_conv_s16p_to_flt_6ch_sse2 (float *dst, int16_t *const *src,
int len, int channels); int len, int channels);
extern void ff_conv_s16p_to_flt_6ch_ssse3(float *dst, int16_t *const *src, void ff_conv_s16p_to_flt_6ch_ssse3(float *dst, int16_t *const *src,
int len, int channels); int len, int channels);
extern void ff_conv_s16p_to_flt_6ch_avx (float *dst, int16_t *const *src, void ff_conv_s16p_to_flt_6ch_avx (float *dst, int16_t *const *src,
int len, int channels); int len, int channels);
extern void ff_conv_fltp_to_s16_2ch_sse2 (int16_t *dst, float *const *src, void ff_conv_fltp_to_s16_2ch_sse2 (int16_t *dst, float *const *src,
int len, int channels); int len, int channels);
extern void ff_conv_fltp_to_s16_2ch_ssse3(int16_t *dst, float *const *src, void ff_conv_fltp_to_s16_2ch_ssse3(int16_t *dst, float *const *src,
int len, int channels); int len, int channels);
extern void ff_conv_fltp_to_s16_6ch_sse (int16_t *dst, float *const *src, void ff_conv_fltp_to_s16_6ch_sse (int16_t *dst, float *const *src,
int len, int channels); int len, int channels);
extern void ff_conv_fltp_to_s16_6ch_sse2(int16_t *dst, float *const *src, void ff_conv_fltp_to_s16_6ch_sse2(int16_t *dst, float *const *src,
int len, int channels); int len, int channels);
extern void ff_conv_fltp_to_s16_6ch_avx (int16_t *dst, float *const *src, void ff_conv_fltp_to_s16_6ch_avx (int16_t *dst, float *const *src,
int len, int channels); int len, int channels);
extern void ff_conv_fltp_to_flt_2ch_sse(float *dst, float *const *src, int len, void ff_conv_fltp_to_flt_2ch_sse(float *dst, float *const *src, int len,
int channels); int channels);
extern void ff_conv_fltp_to_flt_2ch_avx(float *dst, float *const *src, int len, void ff_conv_fltp_to_flt_2ch_avx(float *dst, float *const *src, int len,
int channels); int channels);
extern void ff_conv_fltp_to_flt_6ch_mmx (float *dst, float *const *src, int len, void ff_conv_fltp_to_flt_6ch_mmx (float *dst, float *const *src, int len,
int channels); int channels);
extern void ff_conv_fltp_to_flt_6ch_sse4(float *dst, float *const *src, int len, void ff_conv_fltp_to_flt_6ch_sse4(float *dst, float *const *src, int len,
int channels); int channels);
extern void ff_conv_fltp_to_flt_6ch_avx (float *dst, float *const *src, int len, void ff_conv_fltp_to_flt_6ch_avx (float *dst, float *const *src, int len,
int channels); int channels);
/* deinterleave conversions */ /* deinterleave conversions */
extern void ff_conv_s16_to_s16p_2ch_sse2(int16_t *const *dst, int16_t *src, void ff_conv_s16_to_s16p_2ch_sse2(int16_t *const *dst, int16_t *src,
int len, int channels); int len, int channels);
extern void ff_conv_s16_to_s16p_2ch_ssse3(int16_t *const *dst, int16_t *src, void ff_conv_s16_to_s16p_2ch_ssse3(int16_t *const *dst, int16_t *src,
int len, int channels); int len, int channels);
extern void ff_conv_s16_to_s16p_2ch_avx (int16_t *const *dst, int16_t *src, void ff_conv_s16_to_s16p_2ch_avx (int16_t *const *dst, int16_t *src,
int len, int channels); int len, int channels);
extern void ff_conv_s16_to_s16p_6ch_sse2 (int16_t *const *dst, int16_t *src, void ff_conv_s16_to_s16p_6ch_sse2 (int16_t *const *dst, int16_t *src,
int len, int channels); int len, int channels);
extern void ff_conv_s16_to_s16p_6ch_ssse3(int16_t *const *dst, int16_t *src, void ff_conv_s16_to_s16p_6ch_ssse3(int16_t *const *dst, int16_t *src,
int len, int channels); int len, int channels);
extern void ff_conv_s16_to_s16p_6ch_avx (int16_t *const *dst, int16_t *src, void ff_conv_s16_to_s16p_6ch_avx (int16_t *const *dst, int16_t *src,
int len, int channels); int len, int channels);
extern void ff_conv_s16_to_fltp_2ch_sse2(float *const *dst, int16_t *src, void ff_conv_s16_to_fltp_2ch_sse2(float *const *dst, int16_t *src,
int len, int channels); int len, int channels);
extern void ff_conv_s16_to_fltp_2ch_avx (float *const *dst, int16_t *src, void ff_conv_s16_to_fltp_2ch_avx (float *const *dst, int16_t *src,
int len, int channels); int len, int channels);
extern void ff_conv_s16_to_fltp_6ch_sse2 (float *const *dst, int16_t *src, void ff_conv_s16_to_fltp_6ch_sse2 (float *const *dst, int16_t *src,
int len, int channels); int len, int channels);
extern void ff_conv_s16_to_fltp_6ch_ssse3(float *const *dst, int16_t *src, void ff_conv_s16_to_fltp_6ch_ssse3(float *const *dst, int16_t *src,
int len, int channels); int len, int channels);
extern void ff_conv_s16_to_fltp_6ch_sse4 (float *const *dst, int16_t *src, void ff_conv_s16_to_fltp_6ch_sse4 (float *const *dst, int16_t *src,
int len, int channels); int len, int channels);
extern void ff_conv_s16_to_fltp_6ch_avx (float *const *dst, int16_t *src, void ff_conv_s16_to_fltp_6ch_avx (float *const *dst, int16_t *src,
int len, int channels); int len, int channels);
extern void ff_conv_flt_to_s16p_2ch_sse2(int16_t *const *dst, float *src, void ff_conv_flt_to_s16p_2ch_sse2(int16_t *const *dst, float *src,
int len, int channels); int len, int channels);
extern void ff_conv_flt_to_s16p_2ch_avx (int16_t *const *dst, float *src, void ff_conv_flt_to_s16p_2ch_avx (int16_t *const *dst, float *src,
int len, int channels); int len, int channels);
extern void ff_conv_flt_to_s16p_6ch_sse2 (int16_t *const *dst, float *src, void ff_conv_flt_to_s16p_6ch_sse2 (int16_t *const *dst, float *src,
int len, int channels); int len, int channels);
extern void ff_conv_flt_to_s16p_6ch_ssse3(int16_t *const *dst, float *src, void ff_conv_flt_to_s16p_6ch_ssse3(int16_t *const *dst, float *src,
int len, int channels); int len, int channels);
extern void ff_conv_flt_to_s16p_6ch_avx (int16_t *const *dst, float *src, void ff_conv_flt_to_s16p_6ch_avx (int16_t *const *dst, float *src,
int len, int channels); int len, int channels);
extern void ff_conv_flt_to_fltp_2ch_sse(float *const *dst, float *src, int len, void ff_conv_flt_to_fltp_2ch_sse(float *const *dst, float *src, int len,
int channels); int channels);
extern void ff_conv_flt_to_fltp_2ch_avx(float *const *dst, float *src, int len, void ff_conv_flt_to_fltp_2ch_avx(float *const *dst, float *src, int len,
int channels); int channels);
extern void ff_conv_flt_to_fltp_6ch_sse2(float *const *dst, float *src, int len, void ff_conv_flt_to_fltp_6ch_sse2(float *const *dst, float *src, int len,
int channels); int channels);
extern void ff_conv_flt_to_fltp_6ch_avx (float *const *dst, float *src, int len, void ff_conv_flt_to_fltp_6ch_avx (float *const *dst, float *src, int len,
int channels); int channels);
av_cold void ff_audio_convert_init_x86(AudioConvert *ac) av_cold void ff_audio_convert_init_x86(AudioConvert *ac)

@ -23,78 +23,78 @@
#include "libavutil/x86/cpu.h" #include "libavutil/x86/cpu.h"
#include "libavresample/audio_mix.h" #include "libavresample/audio_mix.h"
extern void ff_mix_2_to_1_fltp_flt_sse(float **src, float **matrix, int len, void ff_mix_2_to_1_fltp_flt_sse(float **src, float **matrix, int len,
int out_ch, int in_ch); int out_ch, int in_ch);
extern void ff_mix_2_to_1_fltp_flt_avx(float **src, float **matrix, int len, void ff_mix_2_to_1_fltp_flt_avx(float **src, float **matrix, int len,
int out_ch, int in_ch); int out_ch, int in_ch);
extern void ff_mix_2_to_1_s16p_flt_sse2(int16_t **src, float **matrix, int len, void ff_mix_2_to_1_s16p_flt_sse2(int16_t **src, float **matrix, int len,
int out_ch, int in_ch); int out_ch, int in_ch);
extern void ff_mix_2_to_1_s16p_flt_sse4(int16_t **src, float **matrix, int len, void ff_mix_2_to_1_s16p_flt_sse4(int16_t **src, float **matrix, int len,
int out_ch, int in_ch); int out_ch, int in_ch);
extern void ff_mix_2_to_1_s16p_q8_sse2(int16_t **src, int16_t **matrix, void ff_mix_2_to_1_s16p_q8_sse2(int16_t **src, int16_t **matrix,
int len, int out_ch, int in_ch); int len, int out_ch, int in_ch);
extern void ff_mix_1_to_2_fltp_flt_sse(float **src, float **matrix, int len, void ff_mix_1_to_2_fltp_flt_sse(float **src, float **matrix, int len,
int out_ch, int in_ch); int out_ch, int in_ch);
extern void ff_mix_1_to_2_fltp_flt_avx(float **src, float **matrix, int len, void ff_mix_1_to_2_fltp_flt_avx(float **src, float **matrix, int len,
int out_ch, int in_ch); int out_ch, int in_ch);
extern void ff_mix_1_to_2_s16p_flt_sse2(int16_t **src, float **matrix, int len, void ff_mix_1_to_2_s16p_flt_sse2(int16_t **src, float **matrix, int len,
int out_ch, int in_ch); int out_ch, int in_ch);
extern void ff_mix_1_to_2_s16p_flt_sse4(int16_t **src, float **matrix, int len, void ff_mix_1_to_2_s16p_flt_sse4(int16_t **src, float **matrix, int len,
int out_ch, int in_ch); int out_ch, int in_ch);
extern void ff_mix_1_to_2_s16p_flt_avx (int16_t **src, float **matrix, int len, void ff_mix_1_to_2_s16p_flt_avx (int16_t **src, float **matrix, int len,
int out_ch, int in_ch); int out_ch, int in_ch);
#define DEFINE_MIX_3_8_TO_1_2(chan) \ #define DEFINE_MIX_3_8_TO_1_2(chan) \
extern void ff_mix_ ## chan ## _to_1_fltp_flt_sse(float **src, \ void ff_mix_ ## chan ## _to_1_fltp_flt_sse(float **src, \
float **matrix, int len, \ float **matrix, int len, \
int out_ch, int in_ch); \ int out_ch, int in_ch); \
extern void ff_mix_ ## chan ## _to_2_fltp_flt_sse(float **src, \ void ff_mix_ ## chan ## _to_2_fltp_flt_sse(float **src, \
float **matrix, int len, \ float **matrix, int len, \
int out_ch, int in_ch); \ int out_ch, int in_ch); \
\ \
extern void ff_mix_ ## chan ## _to_1_s16p_flt_sse2(int16_t **src, \ void ff_mix_ ## chan ## _to_1_s16p_flt_sse2(int16_t **src, \
float **matrix, int len, \ float **matrix, int len, \
int out_ch, int in_ch); \ int out_ch, int in_ch); \
extern void ff_mix_ ## chan ## _to_2_s16p_flt_sse2(int16_t **src, \ void ff_mix_ ## chan ## _to_2_s16p_flt_sse2(int16_t **src, \
float **matrix, int len, \ float **matrix, int len, \
int out_ch, int in_ch); \ int out_ch, int in_ch); \
\ \
extern void ff_mix_ ## chan ## _to_1_s16p_flt_sse4(int16_t **src, \ void ff_mix_ ## chan ## _to_1_s16p_flt_sse4(int16_t **src, \
float **matrix, int len, \ float **matrix, int len, \
int out_ch, int in_ch); \ int out_ch, int in_ch); \
extern void ff_mix_ ## chan ## _to_2_s16p_flt_sse4(int16_t **src, \ void ff_mix_ ## chan ## _to_2_s16p_flt_sse4(int16_t **src, \
float **matrix, int len, \ float **matrix, int len, \
int out_ch, int in_ch); \ int out_ch, int in_ch); \
\ \
extern void ff_mix_ ## chan ## _to_1_fltp_flt_avx(float **src, \ void ff_mix_ ## chan ## _to_1_fltp_flt_avx(float **src, \
float **matrix, int len, \ float **matrix, int len, \
int out_ch, int in_ch); \ int out_ch, int in_ch); \
extern void ff_mix_ ## chan ## _to_2_fltp_flt_avx(float **src, \ void ff_mix_ ## chan ## _to_2_fltp_flt_avx(float **src, \
float **matrix, int len, \ float **matrix, int len, \
int out_ch, int in_ch); \ int out_ch, int in_ch); \
\ \
extern void ff_mix_ ## chan ## _to_1_s16p_flt_avx(int16_t **src, \ void ff_mix_ ## chan ## _to_1_s16p_flt_avx(int16_t **src, \
float **matrix, int len, \ float **matrix, int len, \
int out_ch, int in_ch); \ int out_ch, int in_ch); \
extern void ff_mix_ ## chan ## _to_2_s16p_flt_avx(int16_t **src, \ void ff_mix_ ## chan ## _to_2_s16p_flt_avx(int16_t **src, \
float **matrix, int len, \ float **matrix, int len, \
int out_ch, int in_ch); \ int out_ch, int in_ch); \
\ \
extern void ff_mix_ ## chan ## _to_1_fltp_flt_fma4(float **src, \ void ff_mix_ ## chan ## _to_1_fltp_flt_fma4(float **src, \
float **matrix, int len, \ float **matrix, int len, \
int out_ch, int in_ch); \ int out_ch, int in_ch); \
extern void ff_mix_ ## chan ## _to_2_fltp_flt_fma4(float **src, \ void ff_mix_ ## chan ## _to_2_fltp_flt_fma4(float **src, \
float **matrix, int len, \ float **matrix, int len, \
int out_ch, int in_ch); \ int out_ch, int in_ch); \
\ \
extern void ff_mix_ ## chan ## _to_1_s16p_flt_fma4(int16_t **src, \ void ff_mix_ ## chan ## _to_1_s16p_flt_fma4(int16_t **src, \
float **matrix, int len, \ float **matrix, int len, \
int out_ch, int in_ch); \ int out_ch, int in_ch); \
extern void ff_mix_ ## chan ## _to_2_s16p_flt_fma4(int16_t **src, \ void ff_mix_ ## chan ## _to_2_s16p_flt_fma4(int16_t **src, \
float **matrix, int len, \ float **matrix, int len, \
int out_ch, int in_ch); int out_ch, int in_ch);

@ -23,14 +23,13 @@
#include "libavutil/x86/cpu.h" #include "libavutil/x86/cpu.h"
#include "libavresample/dither.h" #include "libavresample/dither.h"
extern void ff_quantize_sse2(int16_t *dst, const float *src, float *dither, void ff_quantize_sse2(int16_t *dst, const float *src, float *dither, int len);
int len);
extern void ff_dither_int_to_float_rectangular_sse2(float *dst, int *src, int len); void ff_dither_int_to_float_rectangular_sse2(float *dst, int *src, int len);
extern void ff_dither_int_to_float_rectangular_avx(float *dst, int *src, int len); void ff_dither_int_to_float_rectangular_avx(float *dst, int *src, int len);
extern void ff_dither_int_to_float_triangular_sse2(float *dst, int *src0, int len); void ff_dither_int_to_float_triangular_sse2(float *dst, int *src0, int len);
extern void ff_dither_int_to_float_triangular_avx(float *dst, int *src0, int len); void ff_dither_int_to_float_triangular_avx(float *dst, int *src0, int len);
av_cold void ff_dither_init_x86(DitherDSPContext *ddsp, av_cold void ff_dither_init_x86(DitherDSPContext *ddsp,
enum AVResampleDitherMethod method) enum AVResampleDitherMethod method)

@ -21,18 +21,18 @@
#ifndef AVUTIL_PPC_FLOAT_DSP_ALTIVEC_H #ifndef AVUTIL_PPC_FLOAT_DSP_ALTIVEC_H
#define AVUTIL_PPC_FLOAT_DSP_ALTIVEC_H #define AVUTIL_PPC_FLOAT_DSP_ALTIVEC_H
extern void ff_vector_fmul_altivec(float *dst, const float *src0, void ff_vector_fmul_altivec(float *dst, const float *src0,
const float *src1, int len); const float *src1, int len);
extern void ff_vector_fmul_window_altivec(float *dst, const float *src0, void ff_vector_fmul_window_altivec(float *dst, const float *src0,
const float *src1, const float *win, const float *src1, const float *win,
int len); int len);
extern void ff_vector_fmul_add_altivec(float *dst, const float *src0, void ff_vector_fmul_add_altivec(float *dst, const float *src0,
const float *src1, const float *src2, const float *src1, const float *src2,
int len); int len);
extern void ff_vector_fmul_reverse_altivec(float *dst, const float *src0, void ff_vector_fmul_reverse_altivec(float *dst, const float *src0,
const float *src1, int len); const float *src1, int len);
#endif /* AVUTIL_PPC_FLOAT_DSP_ALTIVEC_H */ #endif /* AVUTIL_PPC_FLOAT_DSP_ALTIVEC_H */

@ -23,22 +23,22 @@
#include "cpu.h" #include "cpu.h"
#include "asm.h" #include "asm.h"
extern void ff_vector_fmul_sse(float *dst, const float *src0, const float *src1, void ff_vector_fmul_sse(float *dst, const float *src0, const float *src1,
int len); int len);
extern void ff_vector_fmul_avx(float *dst, const float *src0, const float *src1, void ff_vector_fmul_avx(float *dst, const float *src0, const float *src1,
int len); int len);
extern void ff_vector_fmac_scalar_sse(float *dst, const float *src, float mul, void ff_vector_fmac_scalar_sse(float *dst, const float *src, float mul,
int len); int len);
extern void ff_vector_fmac_scalar_avx(float *dst, const float *src, float mul, void ff_vector_fmac_scalar_avx(float *dst, const float *src, float mul,
int len); int len);
extern void ff_vector_fmul_scalar_sse(float *dst, const float *src, float mul, void ff_vector_fmul_scalar_sse(float *dst, const float *src, float mul,
int len); int len);
extern void ff_vector_dmul_scalar_sse2(double *dst, const double *src, void ff_vector_dmul_scalar_sse2(double *dst, const double *src,
double mul, int len); double mul, int len);
extern void ff_vector_dmul_scalar_avx(double *dst, const double *src, void ff_vector_dmul_scalar_avx(double *dst, const double *src,
double mul, int len); double mul, int len);
void ff_vector_fmul_add_sse(float *dst, const float *src0, const float *src1, void ff_vector_fmul_add_sse(float *dst, const float *src0, const float *src1,

@ -279,7 +279,7 @@ static void yuv2yuvX_sse3(const int16_t *filter, int filterSize,
#endif /* HAVE_INLINE_ASM */ #endif /* HAVE_INLINE_ASM */
#define SCALE_FUNC(filter_n, from_bpc, to_bpc, opt) \ #define SCALE_FUNC(filter_n, from_bpc, to_bpc, opt) \
extern void ff_hscale ## from_bpc ## to ## to_bpc ## _ ## filter_n ## _ ## opt( \ void ff_hscale ## from_bpc ## to ## to_bpc ## _ ## filter_n ## _ ## opt( \
SwsContext *c, int16_t *data, \ SwsContext *c, int16_t *data, \
int dstW, const uint8_t *src, \ int dstW, const uint8_t *src, \
const int16_t *filter, \ const int16_t *filter, \
@ -318,7 +318,7 @@ SCALE_FUNCS_SSE(ssse3);
SCALE_FUNCS_SSE(sse4); SCALE_FUNCS_SSE(sse4);
#define VSCALEX_FUNC(size, opt) \ #define VSCALEX_FUNC(size, opt) \
extern void ff_yuv2planeX_ ## size ## _ ## opt(const int16_t *filter, int filterSize, \ void ff_yuv2planeX_ ## size ## _ ## opt(const int16_t *filter, int filterSize, \
const int16_t **src, uint8_t *dest, int dstW, \ const int16_t **src, uint8_t *dest, int dstW, \
const uint8_t *dither, int offset) const uint8_t *dither, int offset)
#define VSCALEX_FUNCS(opt) \ #define VSCALEX_FUNCS(opt) \
@ -335,7 +335,7 @@ VSCALEX_FUNC(16, sse4);
VSCALEX_FUNCS(avx); VSCALEX_FUNCS(avx);
#define VSCALE_FUNC(size, opt) \ #define VSCALE_FUNC(size, opt) \
extern void ff_yuv2plane1_ ## size ## _ ## opt(const int16_t *src, uint8_t *dst, int dstW, \ void ff_yuv2plane1_ ## size ## _ ## opt(const int16_t *src, uint8_t *dst, int dstW, \
const uint8_t *dither, int offset) const uint8_t *dither, int offset)
#define VSCALE_FUNCS(opt1, opt2) \ #define VSCALE_FUNCS(opt1, opt2) \
VSCALE_FUNC(8, opt1); \ VSCALE_FUNC(8, opt1); \
@ -351,11 +351,11 @@ VSCALE_FUNC(16, sse4);
VSCALE_FUNCS(avx, avx); VSCALE_FUNCS(avx, avx);
#define INPUT_Y_FUNC(fmt, opt) \ #define INPUT_Y_FUNC(fmt, opt) \
extern void ff_ ## fmt ## ToY_ ## opt(uint8_t *dst, const uint8_t *src, \ void ff_ ## fmt ## ToY_ ## opt(uint8_t *dst, const uint8_t *src, \
const uint8_t *unused1, const uint8_t *unused2, \ const uint8_t *unused1, const uint8_t *unused2, \
int w, uint32_t *unused) int w, uint32_t *unused)
#define INPUT_UV_FUNC(fmt, opt) \ #define INPUT_UV_FUNC(fmt, opt) \
extern void ff_ ## fmt ## ToUV_ ## opt(uint8_t *dstU, uint8_t *dstV, \ void ff_ ## fmt ## ToUV_ ## opt(uint8_t *dstU, uint8_t *dstV, \
const uint8_t *unused0, \ const uint8_t *unused0, \
const uint8_t *src1, \ const uint8_t *src1, \
const uint8_t *src2, \ const uint8_t *src2, \

Loading…
Cancel
Save