summaryrefslogtreecommitdiff
path: root/libavcodec/x86
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2013-01-20 21:57:35 -0800
committerRonald S. Bultje <rsbultje@gmail.com>2013-01-20 21:57:35 -0800
commit8a4f26206d7914eaf2903954ce97cb7686933382 (patch)
tree5e1880e5e21dcfc2386c3a28054a8e0c009d10d4 /libavcodec/x86
parentc9311f3e46649786556b6c8ba742129cdfa16f2e (diff)
dsputil: remove butterflies_float_interleave.
The function is unused.
Diffstat (limited to 'libavcodec/x86')
-rw-r--r--libavcodec/x86/dsputil.asm44
-rw-r--r--libavcodec/x86/dsputil_mmx.c7
2 files changed, 0 insertions, 51 deletions
diff --git a/libavcodec/x86/dsputil.asm b/libavcodec/x86/dsputil.asm
index b9990bb1ba..257e579c8e 100644
--- a/libavcodec/x86/dsputil.asm
+++ b/libavcodec/x86/dsputil.asm
@@ -632,50 +632,6 @@ VECTOR_FMUL_ADD
INIT_YMM avx
VECTOR_FMUL_ADD
-;-----------------------------------------------------------------------------
-; void ff_butterflies_float_interleave(float *dst, const float *src0,
-; const float *src1, int len);
-;-----------------------------------------------------------------------------
-
-%macro BUTTERFLIES_FLOAT_INTERLEAVE 0
-cglobal butterflies_float_interleave, 4,4,3, dst, src0, src1, len
-%if ARCH_X86_64
- movsxd lenq, lend
-%endif
- test lenq, lenq
- jz .end
- shl lenq, 2
- lea src0q, [src0q + lenq]
- lea src1q, [src1q + lenq]
- lea dstq, [ dstq + 2*lenq]
- neg lenq
-.loop:
- mova m0, [src0q + lenq]
- mova m1, [src1q + lenq]
- subps m2, m0, m1
- addps m0, m0, m1
- unpcklps m1, m0, m2
- unpckhps m0, m0, m2
-%if cpuflag(avx)
- vextractf128 [dstq + 2*lenq ], m1, 0
- vextractf128 [dstq + 2*lenq + 16], m0, 0
- vextractf128 [dstq + 2*lenq + 32], m1, 1
- vextractf128 [dstq + 2*lenq + 48], m0, 1
-%else
- mova [dstq + 2*lenq ], m1
- mova [dstq + 2*lenq + mmsize], m0
-%endif
- add lenq, mmsize
- jl .loop
-.end:
- REP_RET
-%endmacro
-
-INIT_XMM sse
-BUTTERFLIES_FLOAT_INTERLEAVE
-INIT_YMM avx
-BUTTERFLIES_FLOAT_INTERLEAVE
-
; %1 = aligned/unaligned
%macro BSWAP_LOOPS 1
mov r3, r2
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c
index 7a122ab653..828af9b047 100644
--- a/libavcodec/x86/dsputil_mmx.c
+++ b/libavcodec/x86/dsputil_mmx.c
@@ -1867,11 +1867,6 @@ void ff_vector_clip_int32_int_sse2(int32_t *dst, const int32_t *src,
void ff_vector_clip_int32_sse4 (int32_t *dst, const int32_t *src,
int32_t min, int32_t max, unsigned int len);
-extern void ff_butterflies_float_interleave_sse(float *dst, const float *src0,
- const float *src1, int len);
-extern void ff_butterflies_float_interleave_avx(float *dst, const float *src0,
- const float *src1, int len);
-
#define SET_QPEL_FUNCS(PFX, IDX, SIZE, CPU, PREFIX) \
do { \
c->PFX ## _pixels_tab[IDX][ 0] = PREFIX ## PFX ## SIZE ## _mc00_ ## CPU; \
@@ -2149,7 +2144,6 @@ static void dsputil_init_sse(DSPContext *c, AVCodecContext *avctx, int mm_flags)
c->vector_fmul_add = ff_vector_fmul_add_sse;
c->scalarproduct_float = ff_scalarproduct_float_sse;
- c->butterflies_float_interleave = ff_butterflies_float_interleave_sse;
#endif /* HAVE_YASM */
}
@@ -2300,7 +2294,6 @@ static void dsputil_init_avx(DSPContext *c, AVCodecContext *avctx, int mm_flags)
c->avg_h264_chroma_pixels_tab[0] = ff_avg_h264_chroma_mc8_10_avx;
}
}
- c->butterflies_float_interleave = ff_butterflies_float_interleave_avx;
c->vector_fmul_reverse = ff_vector_fmul_reverse_avx;
c->vector_fmul_add = ff_vector_fmul_add_avx;
#endif /* HAVE_AVX_EXTERNAL */