February 2015 - ffmpeg-cvslog

Merge commit 'd74a8cb7e42f703be5796eeb485f06af710ae8ca'
by git＠videolan.org 28 Feb '15

28 Feb '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Feb 28 23:56:45 2015 +0100| [5c17377e28e818d3074a608d42821d66f1d26e8d] | committer: Michael Niedermayer Merge commit 'd74a8cb7e42f703be5796eeb485f06af710ae8ca' * commit 'd74a8cb7e42f703be5796eeb485f06af710ae8ca': fmtconvert: drop unused functions Conflicts: libavcodec/arm/fmtconvert_vfp_armv6.S libavcodec/x86/fmtconvert.asm libavcodec/x86/fmtconvert_init.c Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5c17377e28e818d30… ---

1 0

fmtconvert: drop unused functions
by git＠videolan.org 28 Feb '15

28 Feb '15

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Sat Feb 21 11:37:52 2015 +0100| [d74a8cb7e42f703be5796eeb485f06af710ae8ca] | committer: Anton Khirnov fmtconvert: drop unused functions > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d74a8cb7e42f703be… --- libavcodec/arm/Makefile | 1 - libavcodec/arm/fmtconvert_init_arm.c | 14 -- libavcodec/arm/fmtconvert_neon.S | 341 ------------------------------- libavcodec/arm/fmtconvert_vfp_armv6.S | 78 ------- libavcodec/fmtconvert.c | 49 ----- libavcodec/fmtconvert.h | 48 ----- libavcodec/ppc/fmtconvert_altivec.c | 111 ---------- libavcodec/x86/fmtconvert.asm | 362 --------------------------------- libavcodec/x86/fmtconvert_init.c | 97 --------- 9 files changed, 1101 deletions(-) diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile index 2a2ca97..8fba0c6 100644 --- a/libavcodec/arm/Makefile +++ b/libavcodec/arm/Makefile @@ -91,7 +91,6 @@ VFP-OBJS += arm/fmtconvert_vfp.o # subsystems VFP-OBJS-$(CONFIG_FFT) += arm/fft_vfp.o VFP-OBJS-$(CONFIG_MDCT) += arm/mdct_vfp.o -VFP-OBJS-$(HAVE_ARMV6) += arm/fmtconvert_vfp_armv6.o # decoders/encoders VFP-OBJS-$(CONFIG_DCA_DECODER) += arm/dcadsp_vfp.o \ diff --git a/libavcodec/arm/fmtconvert_init_arm.c b/libavcodec/arm/fmtconvert_init_arm.c index 7c5bd91..27d3c88 100644 --- a/libavcodec/arm/fmtconvert_init_arm.c +++ b/libavcodec/arm/fmtconvert_init_arm.c @@ -34,11 +34,6 @@ void ff_int32_to_float_fmul_array8_vfp(FmtConvertContext *c, float *dst, const int32_t *src, const float *mul, int len); -void ff_float_to_int16_neon(int16_t *dst, const float *src, long len); -void ff_float_to_int16_interleave_neon(int16_t *, const float **, long, int); - -void ff_float_to_int16_vfp(int16_t *dst, const float *src, long len); - av_cold void ff_fmt_convert_init_arm(FmtConvertContext *c, AVCodecContext *avctx) { int cpu_flags = av_get_cpu_flags(); @@ -48,18 +43,9 @@ av_cold void ff_fmt_convert_init_arm(FmtConvertContext *c, AVCodecContext *avctx c->int32_to_float_fmul_scalar = ff_int32_to_float_fmul_scalar_vfp; c->int32_to_float_fmul_array8 = ff_int32_to_float_fmul_array8_vfp; } - - if (have_armv6(cpu_flags)) { - c->float_to_int16 = ff_float_to_int16_vfp; - } } if (have_neon(cpu_flags)) { c->int32_to_float_fmul_scalar = ff_int32_to_float_fmul_scalar_neon; - - if (!(avctx->flags & CODEC_FLAG_BITEXACT)) { - c->float_to_int16 = ff_float_to_int16_neon; - c->float_to_int16_interleave = ff_float_to_int16_interleave_neon; - } } } diff --git a/libavcodec/arm/fmtconvert_neon.S b/libavcodec/arm/fmtconvert_neon.S index e11e82c..5e0ac68 100644 --- a/libavcodec/arm/fmtconvert_neon.S +++ b/libavcodec/arm/fmtconvert_neon.S @@ -22,347 +22,6 @@ #include "config.h" #include "libavutil/arm/asm.S" -function ff_float_to_int16_neon, export=1 - subs r2, r2, #8 - vld1.64 {d0-d1}, [r1,:128]! - vcvt.s32.f32 q8, q0, #16 - vld1.64 {d2-d3}, [r1,:128]! - vcvt.s32.f32 q9, q1, #16 - beq 3f - bics ip, r2, #15 - beq 2f -1: subs ip, ip, #16 - vshrn.s32 d4, q8, #16 - vld1.64 {d0-d1}, [r1,:128]! - vcvt.s32.f32 q0, q0, #16 - vshrn.s32 d5, q9, #16 - vld1.64 {d2-d3}, [r1,:128]! - vcvt.s32.f32 q1, q1, #16 - vshrn.s32 d6, q0, #16 - vst1.64 {d4-d5}, [r0,:128]! - vshrn.s32 d7, q1, #16 - vld1.64 {d16-d17},[r1,:128]! - vcvt.s32.f32 q8, q8, #16 - vld1.64 {d18-d19},[r1,:128]! - vcvt.s32.f32 q9, q9, #16 - vst1.64 {d6-d7}, [r0,:128]! - bne 1b - ands r2, r2, #15 - beq 3f -2: vld1.64 {d0-d1}, [r1,:128]! - vshrn.s32 d4, q8, #16 - vcvt.s32.f32 q0, q0, #16 - vld1.64 {d2-d3}, [r1,:128]! - vshrn.s32 d5, q9, #16 - vcvt.s32.f32 q1, q1, #16 - vshrn.s32 d6, q0, #16 - vst1.64 {d4-d5}, [r0,:128]! - vshrn.s32 d7, q1, #16 - vst1.64 {d6-d7}, [r0,:128]! - bx lr -3: vshrn.s32 d4, q8, #16 - vshrn.s32 d5, q9, #16 - vst1.64 {d4-d5}, [r0,:128]! - bx lr -endfunc - -function ff_float_to_int16_interleave_neon, export=1 - cmp r3, #2 - itt lt - ldrlt r1, [r1] - blt X(ff_float_to_int16_neon) - bne 4f - - ldr r3, [r1] - ldr r1, [r1, #4] - - subs r2, r2, #8 - vld1.64 {d0-d1}, [r3,:128]! - vcvt.s32.f32 q8, q0, #16 - vld1.64 {d2-d3}, [r3,:128]! - vcvt.s32.f32 q9, q1, #16 - vld1.64 {d20-d21},[r1,:128]! - vcvt.s32.f32 q10, q10, #16 - vld1.64 {d22-d23},[r1,:128]! - vcvt.s32.f32 q11, q11, #16 - beq 3f - bics ip, r2, #15 - beq 2f -1: subs ip, ip, #16 - vld1.64 {d0-d1}, [r3,:128]! - vcvt.s32.f32 q0, q0, #16 - vsri.32 q10, q8, #16 - vld1.64 {d2-d3}, [r3,:128]! - vcvt.s32.f32 q1, q1, #16 - vld1.64 {d24-d25},[r1,:128]! - vcvt.s32.f32 q12, q12, #16 - vld1.64 {d26-d27},[r1,:128]! - vsri.32 q11, q9, #16 - vst1.64 {d20-d21},[r0,:128]! - vcvt.s32.f32 q13, q13, #16 - vst1.64 {d22-d23},[r0,:128]! - vsri.32 q12, q0, #16 - vld1.64 {d16-d17},[r3,:128]! - vsri.32 q13, q1, #16 - vst1.64 {d24-d25},[r0,:128]! - vcvt.s32.f32 q8, q8, #16 - vld1.64 {d18-d19},[r3,:128]! - vcvt.s32.f32 q9, q9, #16 - vld1.64 {d20-d21},[r1,:128]! - vcvt.s32.f32 q10, q10, #16 - vld1.64 {d22-d23},[r1,:128]! - vcvt.s32.f32 q11, q11, #16 - vst1.64 {d26-d27},[r0,:128]! - bne 1b - ands r2, r2, #15 - beq 3f -2: vsri.32 q10, q8, #16 - vld1.64 {d0-d1}, [r3,:128]! - vcvt.s32.f32 q0, q0, #16 - vld1.64 {d2-d3}, [r3,:128]! - vcvt.s32.f32 q1, q1, #16 - vld1.64 {d24-d25},[r1,:128]! - vcvt.s32.f32 q12, q12, #16 - vsri.32 q11, q9, #16 - vld1.64 {d26-d27},[r1,:128]! - vcvt.s32.f32 q13, q13, #16 - vst1.64 {d20-d21},[r0,:128]! - vsri.32 q12, q0, #16 - vst1.64 {d22-d23},[r0,:128]! - vsri.32 q13, q1, #16 - vst1.64 {d24-d27},[r0,:128]! - bx lr -3: vsri.32 q10, q8, #16 - vsri.32 q11, q9, #16 - vst1.64 {d20-d23},[r0,:128]! - bx lr - -4: push {r4-r8,lr} - cmp r3, #4 - lsl ip, r3, #1 - blt 4f - - @ 4 channels -5: ldmia r1!, {r4-r7} - mov lr, r2 - mov r8, r0 - vld1.64 {d16-d17},[r4,:128]! - vcvt.s32.f32 q8, q8, #16 - vld1.64 {d18-d19},[r5,:128]! - vcvt.s32.f32 q9, q9, #16 - vld1.64 {d20-d21},[r6,:128]! - vcvt.s32.f32 q10, q10, #16 - vld1.64 {d22-d23},[r7,:128]! - vcvt.s32.f32 q11, q11, #16 -6: subs lr, lr, #8 - vld1.64 {d0-d1}, [r4,:128]! - vcvt.s32.f32 q0, q0, #16 - vsri.32 q9, q8, #16 - vld1.64 {d2-d3}, [r5,:128]! - vcvt.s32.f32 q1, q1, #16 - vsri.32 q11, q10, #16 - vld1.64 {d4-d5}, [r6,:128]! - vcvt.s32.f32 q2, q2, #16 - vzip.32 d18, d22 - vld1.64 {d6-d7}, [r7,:128]! - vcvt.s32.f32 q3, q3, #16 - vzip.32 d19, d23 - vst1.64 {d18}, [r8], ip - vsri.32 q1, q0, #16 - vst1.64 {d22}, [r8], ip - vsri.32 q3, q2, #16 - vst1.64 {d19}, [r8], ip - vzip.32 d2, d6 - vst1.64 {d23}, [r8], ip - vzip.32 d3, d7 - beq 7f - vld1.64 {d16-d17},[r4,:128]! - vcvt.s32.f32 q8, q8, #16 - vst1.64 {d2}, [r8], ip - vld1.64 {d18-d19},[r5,:128]! - vcvt.s32.f32 q9, q9, #16 - vst1.64 {d6}, [r8], ip - vld1.64 {d20-d21},[r6,:128]! - vcvt.s32.f32 q10, q10, #16 - vst1.64 {d3}, [r8], ip - vld1.64 {d22-d23},[r7,:128]! - vcvt.s32.f32 q11, q11, #16 - vst1.64 {d7}, [r8], ip - b 6b -7: vst1.64 {d2}, [r8], ip - vst1.64 {d6}, [r8], ip - vst1.64 {d3}, [r8], ip - vst1.64 {d7}, [r8], ip - subs r3, r3, #4 - it eq - popeq {r4-r8,pc} - cmp r3, #4 - add r0, r0, #8 - bge 5b - - @ 2 channels -4: cmp r3, #2 - blt 4f - ldmia r1!, {r4-r5} - mov lr, r2 - mov r8, r0 - tst lr, #8 - vld1.64 {d16-d17},[r4,:128]! - vcvt.s32.f32 q8, q8, #16 - vld1.64 {d18-d19},[r5,:128]! - vcvt.s32.f32 q9, q9, #16 - vld1.64 {d20-d21},[r4,:128]! - vcvt.s32.f32 q10, q10, #16 - vld1.64 {d22-d23},[r5,:128]! - vcvt.s32.f32 q11, q11, #16 - beq 6f - subs lr, lr, #8 - beq 7f - vsri.32 d18, d16, #16 - vsri.32 d19, d17, #16 - vld1.64 {d16-d17},[r4,:128]! - vcvt.s32.f32 q8, q8, #16 - vst1.32 {d18[0]}, [r8], ip - vsri.32 d22, d20, #16 - vst1.32 {d18[1]}, [r8], ip - vsri.32 d23, d21, #16 - vst1.32 {d19[0]}, [r8], ip - vst1.32 {d19[1]}, [r8], ip - vld1.64 {d18-d19},[r5,:128]! - vcvt.s32.f32 q9, q9, #16 - vst1.32 {d22[0]}, [r8], ip - vst1.32 {d22[1]}, [r8], ip - vld1.64 {d20-d21},[r4,:128]! - vcvt.s32.f32 q10, q10, #16 - vst1.32 {d23[0]}, [r8], ip - vst1.32 {d23[1]}, [r8], ip - vld1.64 {d22-d23},[r5,:128]! - vcvt.s32.f32 q11, q11, #16 -6: subs lr, lr, #16 - vld1.64 {d0-d1}, [r4,:128]! - vcvt.s32.f32 q0, q0, #16 - vsri.32 d18, d16, #16 - vld1.64 {d2-d3}, [r5,:128]! - vcvt.s32.f32 q1, q1, #16 - vsri.32 d19, d17, #16 - vld1.64 {d4-d5}, [r4,:128]! - vcvt.s32.f32 q2, q2, #16 - vld1.64 {d6-d7}, [r5,:128]! - vcvt.s32.f32 q3, q3, #16 - vst1.32 {d18[0]}, [r8], ip - vsri.32 d22, d20, #16 - vst1.32 {d18[1]}, [r8], ip - vsri.32 d23, d21, #16 - vst1.32 {d19[0]}, [r8], ip - vsri.32 d2, d0, #16 - vst1.32 {d19[1]}, [r8], ip - vsri.32 d3, d1, #16 - vst1.32 {d22[0]}, [r8], ip - vsri.32 d6, d4, #16 - vst1.32 {d22[1]}, [r8], ip - vsri.32 d7, d5, #16 - vst1.32 {d23[0]}, [r8], ip - vst1.32 {d23[1]}, [r8], ip - beq 6f - vld1.64 {d16-d17},[r4,:128]! - vcvt.s32.f32 q8, q8, #16 - vst1.32 {d2[0]}, [r8], ip - vst1.32 {d2[1]}, [r8], ip - vld1.64 {d18-d19},[r5,:128]! - vcvt.s32.f32 q9, q9, #16 - vst1.32 {d3[0]}, [r8], ip - vst1.32 {d3[1]}, [r8], ip - vld1.64 {d20-d21},[r4,:128]! - vcvt.s32.f32 q10, q10, #16 - vst1.32 {d6[0]}, [r8], ip - vst1.32 {d6[1]}, [r8], ip - vld1.64 {d22-d23},[r5,:128]! - vcvt.s32.f32 q11, q11, #16 - vst1.32 {d7[0]}, [r8], ip - vst1.32 {d7[1]}, [r8], ip - bgt 6b -6: vst1.32 {d2[0]}, [r8], ip - vst1.32 {d2[1]}, [r8], ip - vst1.32 {d3[0]}, [r8], ip - vst1.32 {d3[1]}, [r8], ip - vst1.32 {d6[0]}, [r8], ip - vst1.32 {d6[1]}, [r8], ip - vst1.32 {d7[0]}, [r8], ip - vst1.32 {d7[1]}, [r8], ip - b 8f -7: vsri.32 d18, d16, #16 - vsri.32 d19, d17, #16 - vst1.32 {d18[0]}, [r8], ip - vsri.32 d22, d20, #16 - vst1.32 {d18[1]}, [r8], ip - vsri.32 d23, d21, #16 - vst1.32 {d19[0]}, [r8], ip - vst1.32 {d19[1]}, [r8], ip - vst1.32 {d22[0]}, [r8], ip - vst1.32 {d22[1]}, [r8], ip - vst1.32 {d23[0]}, [r8], ip - vst1.32 {d23[1]}, [r8], ip -8: subs r3, r3, #2 - add r0, r0, #4 - it eq - popeq {r4-r8,pc} - - @ 1 channel -4: ldr r4, [r1],#4 - tst r2, #8 - mov lr, r2 - mov r5, r0 - vld1.64 {d0-d1}, [r4,:128]! - vcvt.s32.f32 q0, q0, #16 - vld1.64 {d2-d3}, [r4,:128]! - vcvt.s32.f32 q1, q1, #16 - bne 8f -6: subs lr, lr, #16 - vld1.64 {d4-d5}, [r4,:128]! - vcvt.s32.f32 q2, q2, #16 - vld1.64 {d6-d7}, [r4,:128]! - vcvt.s32.f32 q3, q3, #16 - vst1.16 {d0[1]}, [r5,:16], ip - vst1.16 {d0[3]}, [r5,:16], ip - vst1.16 {d1[1]}, [r5,:16], ip - vst1.16 {d1[3]}, [r5,:16], ip - vst1.16 {d2[1]}, [r5,:16], ip - vst1.16 {d2[3]}, [r5,:16], ip - vst1.16 {d3[1]}, [r5,:16], ip - vst1.16 {d3[3]}, [r5,:16], ip - beq 7f - vld1.64 {d0-d1}, [r4,:128]! - vcvt.s32.f32 q0, q0, #16 - vld1.64 {d2-d3}, [r4,:128]! - vcvt.s32.f32 q1, q1, #16 -7: vst1.16 {d4[1]}, [r5,:16], ip - vst1.16 {d4[3]}, [r5,:16], ip - vst1.16 {d5[1]}, [r5,:16], ip - vst1.16 {d5[3]}, [r5,:16], ip - vst1.16 {d6[1]}, [r5,:16], ip - vst1.16 {d6[3]}, [r5,:16], ip - vst1.16 {d7[1]}, [r5,:16], ip - vst1.16 {d7[3]}, [r5,:16], ip - bgt 6b - pop {r4-r8,pc} -8: subs lr, lr, #8 - vst1.16 {d0[1]}, [r5,:16], ip - vst1.16 {d0[3]}, [r5,:16], ip - vst1.16 {d1[1]}, [r5,:16], ip - vst1.16 {d1[3]}, [r5,:16], ip - vst1.16 {d2[1]}, [r5,:16], ip - vst1.16 {d2[3]}, [r5,:16], ip - vst1.16 {d3[1]}, [r5,:16], ip - vst1.16 {d3[3]}, [r5,:16], ip - it eq - popeq {r4-r8,pc} - vld1.64 {d0-d1}, [r4,:128]! - vcvt.s32.f32 q0, q0, #16 - vld1.64 {d2-d3}, [r4,:128]! - vcvt.s32.f32 q1, q1, #16 - b 6b -endfunc - function ff_int32_to_float_fmul_scalar_neon, export=1 VFP vdup.32 q0, d0[0] VFP len .req r2 diff --git a/libavcodec/arm/fmtconvert_vfp_armv6.S b/libavcodec/arm/fmtconvert_vfp_armv6.S deleted file mode 100644 index fb12de1..0000000 --- a/libavcodec/arm/fmtconvert_vfp_armv6.S +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (c) 2008 Siarhei Siamashka <ssvb(a)users.sourceforge.net> - * - * This file is part of Libav. - * - * Libav is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * Libav is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "config.h" -#include "libavutil/arm/asm.S" - -/** - * ARM VFP optimized float to int16 conversion. - * Assume that len is a positive number and is multiple of 8, destination - * buffer is at least 4 bytes aligned (8 bytes alignment is better for - * performance), little-endian byte sex. - */ -@ void ff_float_to_int16_vfp(int16_t *dst, const float *src, int len) -function ff_float_to_int16_vfp, export=1 - push {r4-r8,lr} - vpush {d8-d11} - vldmia r1!, {s16-s23} - vcvt.s32.f32 s0, s16 - vcvt.s32.f32 s1, s17 - vcvt.s32.f32 s2, s18 - vcvt.s32.f32 s3, s19 - vcvt.s32.f32 s4, s20 - vcvt.s32.f32 s5, s21 - vcvt.s32.f32 s6, s22 - vcvt.s32.f32 s7, s23 -1: - subs r2, r2, #8 - vmov r3, r4, s0, s1 - vmov r5, r6, s2, s3 - vmov r7, r8, s4, s5 - vmov ip, lr, s6, s7 - it gt - vldmiagt r1!, {s16-s23} - ssat r4, #16, r4 - ssat r3, #16, r3 - ssat r6, #16, r6 - ssat r5, #16, r5 - pkhbt r3, r3, r4, lsl #16 - pkhbt r4, r5, r6, lsl #16 - itttt gt - vcvtgt.s32.f32 s0, s16 - vcvtgt.s32.f32 s1, s17 - vcvtgt.s32.f32 s2, s18 - vcvtgt.s32.f32 s3, s19 - itttt gt - vcvtgt.s32.f32 s4, s20 - vcvtgt.s32.f32 s5, s21 - vcvtgt.s32.f32 s6, s22 - vcvtgt.s32.f32 s7, s23 - ssat r8, #16, r8 - ssat r7, #16, r7 - ssat lr, #16, lr - ssat ip, #16, ip - pkhbt r5, r7, r8, lsl #16 - pkhbt r6, ip, lr, lsl #16 - stmia r0!, {r3-r6} - bgt 1b - - vpop {d8-d11} - pop {r4-r8,pc} -endfunc diff --git a/libavcodec/fmtconvert.c b/libavcodec/fmtconvert.c index 63f62c3..2dff704 100644 --- a/libavcodec/fmtconvert.c +++ b/libavcodec/fmtconvert.c @@ -41,59 +41,10 @@ static void int32_to_float_fmul_array8_c(FmtConvertContext *c, float *dst, c->int32_to_float_fmul_scalar(&dst[i], &src[i], *mul++, 8); } -static av_always_inline int float_to_int16_one(const float *src){ - return av_clip_int16(lrintf(*src)); -} - -static void float_to_int16_c(int16_t *dst, const float *src, long len) -{ - int i; - for(i=0; i<len; i++) - dst[i] = float_to_int16_one(src+i); -} - -static void float_to_int16_interleave_c(int16_t *dst, const float **src, - long len, int channels) -{ - int i,j,c; - if(channels==2){ - for(i=0; i<len; i++){ - dst[2*i] = float_to_int16_one(src[0]+i); - dst[2*i+1] = float_to_int16_one(src[1]+i); - } - }else{ - for(c=0; c<channels; c++) - for(i=0, j=c; i<len; i++, j+=channels) - dst[j] = float_to_int16_one(src[c]+i); - } -} - -void ff_float_interleave_c(float *dst, const float **src, unsigned int len, - int channels) -{ - int j, c; - unsigned int i; - if (channels == 2) { - for (i = 0; i < len; i++) { - dst[2*i] = src[0][i]; - dst[2*i+1] = src[1][i]; - } - } else if (channels == 1 && len < INT_MAX / sizeof(float)) { - memcpy(dst, src[0], len * sizeof(float)); - } else { - for (c = 0; c < channels; c++) - for (i = 0, j = c; i < len; i++, j += channels) - dst[j] = src[c][i]; - } -} - av_cold void ff_fmt_convert_init(FmtConvertContext *c, AVCodecContext *avctx) { c->int32_to_float_fmul_scalar = int32_to_float_fmul_scalar_c; c->int32_to_float_fmul_array8 = int32_to_float_fmul_array8_c; - c->float_to_int16 = float_to_int16_c; - c->float_to_int16_interleave = float_to_int16_interleave_c; - c->float_interleave = ff_float_interleave_c; if (ARCH_ARM) ff_fmt_convert_init_arm(c, avctx); if (ARCH_PPC) ff_fmt_convert_init_ppc(c, avctx); diff --git a/libavcodec/fmtconvert.h b/libavcodec/fmtconvert.h index bd833ef..7de890b 100644 --- a/libavcodec/fmtconvert.h +++ b/libavcodec/fmtconvert.h @@ -54,56 +54,8 @@ typedef struct FmtConvertContext { float *dst, const int32_t *src, const float *mul, int len); - /** - * Convert an array of float to an array of int16_t. - * - * Convert floats from in the range [-32768.0,32767.0] to ints - * without rescaling - * - * @param dst destination array of int16_t. - * constraints: 16-byte aligned - * @param src source array of float. - * constraints: 16-byte aligned - * @param len number of elements to convert. - * constraints: multiple of 8 - */ - void (*float_to_int16)(int16_t *dst, const float *src, long len); - - /** - * Convert multiple arrays of float to an interleaved array of int16_t. - * - * Convert floats from in the range [-32768.0,32767.0] to ints - * without rescaling - * - * @param dst destination array of interleaved int16_t. - * constraints: 16-byte aligned - * @param src source array of float arrays, one for each channel. - * constraints: 16-byte aligned - * @param len number of elements to convert. - * constraints: multiple of 8 - * @param channels number of channels - */ - void (*float_to_int16_interleave)(int16_t *dst, const float **src, - long len, int channels); - - /** - * Convert multiple arrays of float to an array of interleaved float. - * - * @param dst destination array of interleaved float. - * constraints: 16-byte aligned - * @param src source array of float arrays, one for each channel. - * constraints: 16-byte aligned - * @param len number of elements to convert. - * constraints: multiple of 8 - * @param channels number of channels - */ - void (*float_interleave)(float *dst, const float **src, unsigned int len, - int channels); } FmtConvertContext; -void ff_float_interleave_c(float *dst, const float **src, unsigned int len, - int channels); - void ff_fmt_convert_init(FmtConvertContext *c, AVCodecContext *avctx); void ff_fmt_convert_init_arm(FmtConvertContext *c, AVCodecContext *avctx); diff --git a/libavcodec/ppc/fmtconvert_altivec.c b/libavcodec/ppc/fmtconvert_altivec.c index 14aaf6b..7536703 100644 --- a/libavcodec/ppc/fmtconvert_altivec.c +++ b/libavcodec/ppc/fmtconvert_altivec.c @@ -52,113 +52,6 @@ static void int32_to_float_fmul_scalar_altivec(float *dst, const int32_t *src, } } - -static vector signed short float_to_int16_one_altivec(const float *src) -{ - vector float s0 = vec_ld(0, src); - vector float s1 = vec_ld(16, src); - vector signed int t0 = vec_cts(s0, 0); - vector signed int t1 = vec_cts(s1, 0); - return vec_packs(t0,t1); -} - -static void float_to_int16_altivec(int16_t *dst, const float *src, long len) -{ - int i; - vector signed short d0, d1, d; - vector unsigned char align; - if (((long)dst) & 15) { //FIXME - for (i = 0; i < len - 7; i += 8) { - d0 = vec_ld(0, dst+i); - d = float_to_int16_one_altivec(src + i); - d1 = vec_ld(15, dst+i); - d1 = vec_perm(d1, d0, vec_lvsl(0, dst + i)); - align = vec_lvsr(0, dst + i); - d0 = vec_perm(d1, d, align); - d1 = vec_perm(d, d1, align); - vec_st(d0, 0, dst + i); - vec_st(d1, 15, dst + i); - } - } else { - for (i = 0; i < len - 7; i += 8) { - d = float_to_int16_one_altivec(src + i); - vec_st(d, 0, dst + i); - } - } -} - -#define VSTE_INC(dst, v, elem, inc) do { \ - vector signed short s = vec_splat(v, elem); \ - vec_ste(s, 0, dst); \ - dst += inc; \ - } while (0) - -static void float_to_int16_stride_altivec(int16_t *dst, const float *src, - long len, int stride) -{ - int i; - vector signed short d; - - for (i = 0; i < len - 7; i += 8) { - d = float_to_int16_one_altivec(src + i); - VSTE_INC(dst, d, 0, stride); - VSTE_INC(dst, d, 1, stride); - VSTE_INC(dst, d, 2, stride); - VSTE_INC(dst, d, 3, stride); - VSTE_INC(dst, d, 4, stride); - VSTE_INC(dst, d, 5, stride); - VSTE_INC(dst, d, 6, stride); - VSTE_INC(dst, d, 7, stride); - } -} - -static void float_to_int16_interleave_altivec(int16_t *dst, const float **src, - long len, int channels) -{ - int i; - vector signed short d0, d1, d2, c0, c1, t0, t1; - vector unsigned char align; - - if (channels == 1) - float_to_int16_altivec(dst, src[0], len); - else { - if (channels == 2) { - if (((long)dst) & 15) { - for (i = 0; i < len - 7; i += 8) { - d0 = vec_ld(0, dst + i); - t0 = float_to_int16_one_altivec(src[0] + i); - d1 = vec_ld(31, dst + i); - t1 = float_to_int16_one_altivec(src[1] + i); - c0 = vec_mergeh(t0, t1); - c1 = vec_mergel(t0, t1); - d2 = vec_perm(d1, d0, vec_lvsl(0, dst + i)); - align = vec_lvsr(0, dst + i); - d0 = vec_perm(d2, c0, align); - d1 = vec_perm(c0, c1, align); - vec_st(d0, 0, dst + i); - d0 = vec_perm(c1, d2, align); - vec_st(d1, 15, dst + i); - vec_st(d0, 31, dst + i); - dst += 8; - } - } else { - for (i = 0; i < len - 7; i += 8) { - t0 = float_to_int16_one_altivec(src[0] + i); - t1 = float_to_int16_one_altivec(src[1] + i); - d0 = vec_mergeh(t0, t1); - d1 = vec_mergel(t0, t1); - vec_st(d0, 0, dst + i); - vec_st(d1, 16, dst + i); - dst += 8; - } - } - } else { - for (i = 0; i < channels; i++) - float_to_int16_stride_altivec(dst + i, src[i], len, channels); - } - } -} - #endif /* HAVE_ALTIVEC */ av_cold void ff_fmt_convert_init_ppc(FmtConvertContext *c, @@ -169,9 +62,5 @@ av_cold void ff_fmt_convert_init_ppc(FmtConvertContext *c, return; c->int32_to_float_fmul_scalar = int32_to_float_fmul_scalar_altivec; - if (!(avctx->flags & CODEC_FLAG_BITEXACT)) { - c->float_to_int16 = float_to_int16_altivec; - c->float_to_int16_interleave = float_to_int16_interleave_altivec; - } #endif /* HAVE_ALTIVEC */ } diff --git a/libavcodec/x86/fmtconvert.asm b/libavcodec/x86/fmtconvert.asm index 8184376..e82f149 100644 --- a/libavcodec/x86/fmtconvert.asm +++ b/libavcodec/x86/fmtconvert.asm @@ -23,14 +23,6 @@ SECTION_TEXT -%macro CVTPS2PI 2 -%if cpuflag(sse) - cvtps2pi %1, %2 -%elif cpuflag(3dnow) - pf2id %1, %2 -%endif -%endmacro - ;------------------------------------------------------------------------------ ; void ff_int32_to_float_fmul_scalar(float *dst, const int32_t *src, float mul, ; int len); @@ -76,357 +68,3 @@ INIT_XMM sse INT32_TO_FLOAT_FMUL_SCALAR 5 INIT_XMM sse2 INT32_TO_FLOAT_FMUL_SCALAR 3 - - -;------------------------------------------------------------------------------ -; void ff_float_to_int16(int16_t *dst, const float *src, long len); -;------------------------------------------------------------------------------ -%macro FLOAT_TO_INT16 1 -cglobal float_to_int16, 3, 3, %1, dst, src, len - add lenq, lenq - lea srcq, [srcq+2*lenq] - add dstq, lenq - neg lenq -.loop: -%if cpuflag(sse2) - cvtps2dq m0, [srcq+2*lenq ] - cvtps2dq m1, [srcq+2*lenq+16] - packssdw m0, m1 - mova [dstq+lenq], m0 -%else - CVTPS2PI m0, [srcq+2*lenq ] - CVTPS2PI m1, [srcq+2*lenq+ 8] - CVTPS2PI m2, [srcq+2*lenq+16] - CVTPS2PI m3, [srcq+2*lenq+24] - packssdw m0, m1 - packssdw m2, m3 - mova [dstq+lenq ], m0 - mova [dstq+lenq+8], m2 -%endif - add lenq, 16 - js .loop -%if mmsize == 8 - emms -%endif - REP_RET -%endmacro - -INIT_XMM sse2 -FLOAT_TO_INT16 2 -INIT_MMX sse -FLOAT_TO_INT16 0 -INIT_MMX 3dnow -FLOAT_TO_INT16 0 - -;------------------------------------------------------------------------------ -; void ff_float_to_int16_step(int16_t *dst, const float *src, long len, long step); -;------------------------------------------------------------------------------ -%macro FLOAT_TO_INT16_STEP 1 -cglobal float_to_int16_step, 4, 7, %1, dst, src, len, step, step3, v1, v2 - add lenq, lenq - lea srcq, [srcq+2*lenq] - lea step3q, [stepq*3] - neg lenq -.loop: -%if cpuflag(sse2) - cvtps2dq m0, [srcq+2*lenq ] - cvtps2dq m1, [srcq+2*lenq+16] - packssdw m0, m1 - movd v1d, m0 - psrldq m0, 4 - movd v2d, m0 - psrldq m0, 4 - mov [dstq], v1w - mov [dstq+stepq*4], v2w - shr v1d, 16 - shr v2d, 16 - mov [dstq+stepq*2], v1w - mov [dstq+step3q*2], v2w - lea dstq, [dstq+stepq*8] - movd v1d, m0 - psrldq m0, 4 - movd v2d, m0 - mov [dstq], v1w - mov [dstq+stepq*4], v2w - shr v1d, 16 - shr v2d, 16 - mov [dstq+stepq*2], v1w - mov [dstq+step3q*2], v2w - lea dstq, [dstq+stepq*8] -%else - CVTPS2PI m0, [srcq+2*lenq ] - CVTPS2PI m1, [srcq+2*lenq+ 8] - CVTPS2PI m2, [srcq+2*lenq+16] - CVTPS2PI m3, [srcq+2*lenq+24] - packssdw m0, m1 - packssdw m2, m3 - movd v1d, m0 - psrlq m0, 32 - movd v2d, m0 - mov [dstq], v1w - mov [dstq+stepq*4], v2w - shr v1d, 16 - shr v2d, 16 - mov [dstq+stepq*2], v1w - mov [dstq+step3q*2], v2w - lea dstq, [dstq+stepq*8] - movd v1d, m2 - psrlq m2, 32 - movd v2d, m2 - mov [dstq], v1w - mov [dstq+stepq*4], v2w - shr v1d, 16 - shr v2d, 16 - mov [dstq+stepq*2], v1w - mov [dstq+step3q*2], v2w - lea dstq, [dstq+stepq*8] -%endif - add lenq, 16 - js .loop -%if mmsize == 8 - emms -%endif - REP_RET -%endmacro - -INIT_XMM sse2 -FLOAT_TO_INT16_STEP 2 -INIT_MMX sse -FLOAT_TO_INT16_STEP 0 -INIT_MMX 3dnow -FLOAT_TO_INT16_STEP 0 - -;------------------------------------------------------------------------------- -; void ff_float_to_int16_interleave2(int16_t *dst, const float **src, long len); -;------------------------------------------------------------------------------- -%macro FLOAT_TO_INT16_INTERLEAVE2 0 -cglobal float_to_int16_interleave2, 3, 4, 2, dst, src0, src1, len - lea lenq, [4*r2q] - mov src1q, [src0q+gprsize] - mov src0q, [src0q] - add dstq, lenq - add src0q, lenq - add src1q, lenq - neg lenq -.loop: -%if cpuflag(sse2) - cvtps2dq m0, [src0q+lenq] - cvtps2dq m1, [src1q+lenq] - packssdw m0, m1 - movhlps m1, m0 - punpcklwd m0, m1 - mova [dstq+lenq], m0 -%else - CVTPS2PI m0, [src0q+lenq ] - CVTPS2PI m1, [src0q+lenq+8] - CVTPS2PI m2, [src1q+lenq ] - CVTPS2PI m3, [src1q+lenq+8] - packssdw m0, m1 - packssdw m2, m3 - mova m1, m0 - punpcklwd m0, m2 - punpckhwd m1, m2 - mova [dstq+lenq ], m0 - mova [dstq+lenq+8], m1 -%endif - add lenq, 16 - js .loop -%if mmsize == 8 - emms -%endif - REP_RET -%endmacro - -INIT_MMX 3dnow -FLOAT_TO_INT16_INTERLEAVE2 -INIT_MMX sse -FLOAT_TO_INT16_INTERLEAVE2 -INIT_XMM sse2 -FLOAT_TO_INT16_INTERLEAVE2 - -;----------------------------------------------------------------------------- -; void ff_float_to_int16_interleave6(int16_t *dst, const float **src, int len) -;----------------------------------------------------------------------------- -%macro FLOAT_TO_INT16_INTERLEAVE6 0 -cglobal float_to_int16_interleave6, 2, 8, 0, dst, src, src1, src2, src3, src4, src5, len -%if ARCH_X86_64 - mov lend, r2d -%else - %define lend dword r2m -%endif - mov src1q, [srcq+1*gprsize] - mov src2q, [srcq+2*gprsize] - mov src3q, [srcq+3*gprsize] - mov src4q, [srcq+4*gprsize] - mov src5q, [srcq+5*gprsize] - mov srcq, [srcq] - sub src1q, srcq - sub src2q, srcq - sub src3q, srcq - sub src4q, srcq - sub src5q, srcq -.loop: - CVTPS2PI mm0, [srcq] - CVTPS2PI mm1, [srcq+src1q] - CVTPS2PI mm2, [srcq+src2q] - CVTPS2PI mm3, [srcq+src3q] - CVTPS2PI mm4, [srcq+src4q] - CVTPS2PI mm5, [srcq+src5q] - packssdw mm0, mm3 - packssdw mm1, mm4 - packssdw mm2, mm5 - PSWAPD mm3, mm0 - punpcklwd mm0, mm1 - punpckhwd mm1, mm2 - punpcklwd mm2, mm3 - PSWAPD mm3, mm0 - punpckldq mm0, mm2 - punpckhdq mm2, mm1 - punpckldq mm1, mm3 - movq [dstq ], mm0 - movq [dstq+16], mm2 - movq [dstq+ 8], mm1 - add srcq, 8 - add dstq, 24 - sub lend, 2 - jg .loop - emms - RET -%endmacro ; FLOAT_TO_INT16_INTERLEAVE6 - -INIT_MMX sse -FLOAT_TO_INT16_INTERLEAVE6 -INIT_MMX 3dnow -FLOAT_TO_INT16_INTERLEAVE6 -INIT_MMX 3dnowext -FLOAT_TO_INT16_INTERLEAVE6 - -;----------------------------------------------------------------------------- -; void ff_float_interleave6(float *dst, const float **src, unsigned int len); -;----------------------------------------------------------------------------- - -%macro FLOAT_INTERLEAVE6 1 -cglobal float_interleave6, 2, 8, %1, dst, src, src1, src2, src3, src4, src5, len -%if ARCH_X86_64 - mov lend, r2d -%else - %define lend dword r2m -%endif - mov src1q, [srcq+1*gprsize] - mov src2q, [srcq+2*gprsize] - mov src3q, [srcq+3*gprsize] - mov src4q, [srcq+4*gprsize] - mov src5q, [srcq+5*gprsize] - mov srcq, [srcq] - sub src1q, srcq - sub src2q, srcq - sub src3q, srcq - sub src4q, srcq - sub src5q, srcq -.loop: -%if cpuflag(sse) - movaps m0, [srcq] - movaps m1, [srcq+src1q] - movaps m2, [srcq+src2q] - movaps m3, [srcq+src3q] - movaps m4, [srcq+src4q] - movaps m5, [srcq+src5q] - - SBUTTERFLYPS 0, 1, 6 - SBUTTERFLYPS 2, 3, 6 - SBUTTERFLYPS 4, 5, 6 - - movaps m6, m4 - shufps m4, m0, 0xe4 - movlhps m0, m2 - movhlps m6, m2 - movaps [dstq ], m0 - movaps [dstq+16], m4 - movaps [dstq+32], m6 - - movaps m6, m5 - shufps m5, m1, 0xe4 - movlhps m1, m3 - movhlps m6, m3 - movaps [dstq+48], m1 - movaps [dstq+64], m5 - movaps [dstq+80], m6 -%else ; mmx - movq m0, [srcq] - movq m1, [srcq+src1q] - movq m2, [srcq+src2q] - movq m3, [srcq+src3q] - movq m4, [srcq+src4q] - movq m5, [srcq+src5q] - - SBUTTERFLY dq, 0, 1, 6 - SBUTTERFLY dq, 2, 3, 6 - SBUTTERFLY dq, 4, 5, 6 - movq [dstq ], m0 - movq [dstq+ 8], m2 - movq [dstq+16], m4 - movq [dstq+24], m1 - movq [dstq+32], m3 - movq [dstq+40], m5 -%endif - add srcq, mmsize - add dstq, mmsize*6 - sub lend, mmsize/4 - jg .loop -%if mmsize == 8 - emms -%endif - REP_RET -%endmacro - -INIT_MMX mmx -FLOAT_INTERLEAVE6 0 -INIT_XMM sse -FLOAT_INTERLEAVE6 7 - -;----------------------------------------------------------------------------- -; void ff_float_interleave2(float *dst, const float **src, unsigned int len); -;----------------------------------------------------------------------------- - -%macro FLOAT_INTERLEAVE2 1 -cglobal float_interleave2, 3, 4, %1, dst, src, len, src1 - mov src1q, [srcq+gprsize] - mov srcq, [srcq ] - sub src1q, srcq -.loop: - mova m0, [srcq ] - mova m1, [srcq+src1q ] - mova m3, [srcq +mmsize] - mova m4, [srcq+src1q+mmsize] - - mova m2, m0 - PUNPCKLDQ m0, m1 - PUNPCKHDQ m2, m1 - - mova m1, m3 - PUNPCKLDQ m3, m4 - PUNPCKHDQ m1, m4 - - mova [dstq ], m0 - mova [dstq+1*mmsize], m2 - mova [dstq+2*mmsize], m3 - mova [dstq+3*mmsize], m1 - - add srcq, mmsize*2 - add dstq, mmsize*4 - sub lend, mmsize/2 - jg .loop -%if mmsize == 8 - emms -%endif - REP_RET -%endmacro - -INIT_MMX mmx -%define PUNPCKLDQ punpckldq -%define PUNPCKHDQ punpckhdq -FLOAT_INTERLEAVE2 0 -INIT_XMM sse -%define PUNPCKLDQ unpcklps -%define PUNPCKHDQ unpckhps -FLOAT_INTERLEAVE2 5 diff --git a/libavcodec/x86/fmtconvert_init.c b/libavcodec/x86/fmtconvert_init.c index 3d75df9..1871b47 100644 --- a/libavcodec/x86/fmtconvert_init.c +++ b/libavcodec/x86/fmtconvert_init.c @@ -33,84 +33,6 @@ void ff_int32_to_float_fmul_scalar_sse (float *dst, const int32_t *src, float mul, int len); void ff_int32_to_float_fmul_scalar_sse2(float *dst, const int32_t *src, float mul, int len); -void ff_float_to_int16_3dnow(int16_t *dst, const float *src, long len); -void ff_float_to_int16_sse (int16_t *dst, const float *src, long len); -void ff_float_to_int16_sse2 (int16_t *dst, const float *src, long len); - -void ff_float_to_int16_step_3dnow(int16_t *dst, const float *src, long len, long step); -void ff_float_to_int16_step_sse (int16_t *dst, const float *src, long len, long step); -void ff_float_to_int16_step_sse2 (int16_t *dst, const float *src, long len, long step); - -void ff_float_to_int16_interleave2_3dnow(int16_t *dst, const float **src, long len); -void ff_float_to_int16_interleave2_sse (int16_t *dst, const float **src, long len); -void ff_float_to_int16_interleave2_sse2 (int16_t *dst, const float **src, long len); - -void ff_float_to_int16_interleave6_sse(int16_t *dst, const float **src, int len); -void ff_float_to_int16_interleave6_3dnow(int16_t *dst, const float **src, int len); -void ff_float_to_int16_interleave6_3dnowext(int16_t *dst, const float **src, int len); - -#define ff_float_to_int16_interleave6_sse2 ff_float_to_int16_interleave6_sse - -#define FLOAT_TO_INT16_INTERLEAVE(cpu) \ -/* gcc pessimizes register allocation if this is in the same function as float_to_int16_interleave_sse2*/\ -static av_noinline void float_to_int16_interleave_misc_##cpu(int16_t *dst, const float **src, long len, int channels){\ - int c;\ - for(c=0; c<channels; c++){\ - ff_float_to_int16_step_##cpu(dst+c, src[c], len, channels);\ - }\ -}\ -\ -static void float_to_int16_interleave_##cpu(int16_t *dst, const float **src, long len, int channels){\ - if(channels==1)\ - ff_float_to_int16_##cpu(dst, src[0], len);\ - else if(channels==2){\ - ff_float_to_int16_interleave2_##cpu(dst, src, len);\ - }else if(channels==6){\ - ff_float_to_int16_interleave6_##cpu(dst, src, len);\ - }else\ - float_to_int16_interleave_misc_##cpu(dst, src, len, channels);\ -} - -FLOAT_TO_INT16_INTERLEAVE(3dnow) -FLOAT_TO_INT16_INTERLEAVE(sse) -FLOAT_TO_INT16_INTERLEAVE(sse2) - -static void float_to_int16_interleave_3dnowext(int16_t *dst, const float **src, - long len, int channels) -{ - if(channels==6) - ff_float_to_int16_interleave6_3dnowext(dst, src, len); - else - float_to_int16_interleave_3dnow(dst, src, len, channels); -} - -void ff_float_interleave2_mmx(float *dst, const float **src, unsigned int len); -void ff_float_interleave2_sse(float *dst, const float **src, unsigned int len); - -void ff_float_interleave6_mmx(float *dst, const float **src, unsigned int len); -void ff_float_interleave6_sse(float *dst, const float **src, unsigned int len); - -static void float_interleave_mmx(float *dst, const float **src, - unsigned int len, int channels) -{ - if (channels == 2) { - ff_float_interleave2_mmx(dst, src, len); - } else if (channels == 6) - ff_float_interleave6_mmx(dst, src, len); - else - ff_float_interleave_c(dst, src, len, channels); -} - -static void float_interleave_sse(float *dst, const float **src, - unsigned int len, int channels) -{ - if (channels == 2) { - ff_float_interleave2_sse(dst, src, len); - } else if (channels == 6) - ff_float_interleave6_sse(dst, src, len); - else - ff_float_interleave_c(dst, src, len, channels); -} #endif /* HAVE_YASM */ av_cold void ff_fmt_convert_init_x86(FmtConvertContext *c, AVCodecContext *avctx) @@ -118,30 +40,11 @@ av_cold void ff_fmt_convert_init_x86(FmtConvertContext *c, AVCodecContext *avctx #if HAVE_YASM int cpu_flags = av_get_cpu_flags(); - if (EXTERNAL_MMX(cpu_flags)) { - c->float_interleave = float_interleave_mmx; - } - if (EXTERNAL_AMD3DNOW(cpu_flags)) { - if (!(avctx->flags & CODEC_FLAG_BITEXACT)) { - c->float_to_int16 = ff_float_to_int16_3dnow; - c->float_to_int16_interleave = float_to_int16_interleave_3dnow; - } - } - if (EXTERNAL_AMD3DNOWEXT(cpu_flags)) { - if (!(avctx->flags & CODEC_FLAG_BITEXACT)) { - c->float_to_int16_interleave = float_to_int16_interleave_3dnowext; - } - } if (EXTERNAL_SSE(cpu_flags)) { c->int32_to_float_fmul_scalar = ff_int32_to_float_fmul_scalar_sse; - c->float_to_int16 = ff_float_to_int16_sse; - c->float_to_int16_interleave = float_to_int16_interleave_sse; - c->float_interleave = float_interleave_sse; } if (EXTERNAL_SSE2(cpu_flags)) { c->int32_to_float_fmul_scalar = ff_int32_to_float_fmul_scalar_sse2; - c->float_to_int16 = ff_float_to_int16_sse2; - c->float_to_int16_interleave = float_to_int16_interleave_sse2; } #endif /* HAVE_YASM */ }

1 0

Merge commit 'ee964145b5d229571e00bf6883a44189d02babe2'
by git＠videolan.org 28 Feb '15

28 Feb '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Feb 28 23:41:36 2015 +0100| [e82b0e612607d652c1519ee31d30272113775679] | committer: Michael Niedermayer Merge commit 'ee964145b5d229571e00bf6883a44189d02babe2' * commit 'ee964145b5d229571e00bf6883a44189d02babe2': lavc: remove unused traces of fmtconvert usage Conflicts: libavcodec/aac.h libavcodec/aacdec.c libavcodec/atrac3.c libavcodec/vorbisdec.c libavcodec/wma.c libavcodec/wma.h Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e82b0e612607d652c… ---

1 0

lavc: remove unused traces of fmtconvert usage
by git＠videolan.org 28 Feb '15

28 Feb '15

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Sat Feb 21 11:00:59 2015 +0100| [ee964145b5d229571e00bf6883a44189d02babe2] | committer: Anton Khirnov lavc: remove unused traces of fmtconvert usage Those decoders have been switched to float output and so do not use fmtconvert anymore. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ee964145b5d229571… --- libavcodec/aac.h | 2 -- libavcodec/aacdec.c | 2 -- libavcodec/atrac3.c | 3 --- libavcodec/binkaudio.c | 1 - libavcodec/nellymoserdec.c | 1 - libavcodec/vorbisdec.c | 3 --- libavcodec/wma.c | 1 - libavcodec/wma.h | 2 -- 8 files changed, 15 deletions(-) diff --git a/libavcodec/aac.h b/libavcodec/aac.h index b71e8b6..fed6bf4 100644 --- a/libavcodec/aac.h +++ b/libavcodec/aac.h @@ -36,7 +36,6 @@ #include "fft.h" #include "mpeg4audio.h" #include "sbr.h" -#include "fmtconvert.h" #include <stdint.h> @@ -293,7 +292,6 @@ typedef struct AACContext { FFTContext mdct_ld; FFTContext mdct_ltp; IMDCT15Context *mdct480; - FmtConvertContext fmt_conv; AVFloatDSPContext fdsp; int random_state; /** @} */ diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 9a93182..c4234e7 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -86,7 +86,6 @@ #include "get_bits.h" #include "fft.h" #include "imdct15.h" -#include "fmtconvert.h" #include "lpc.h" #include "kbdwin.h" #include "sinewin.h" @@ -1043,7 +1042,6 @@ static av_cold int aac_decode_init(AVCodecContext *avctx) ff_aac_sbr_init(); - ff_fmt_convert_init(&ac->fmt_conv, avctx); avpriv_float_dsp_init(&ac->fdsp, avctx->flags & CODEC_FLAG_BITEXACT); ac->random_state = 0x1f2e3d4c; diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c index 31f4844..e8d2e2a 100644 --- a/libavcodec/atrac3.c +++ b/libavcodec/atrac3.c @@ -41,7 +41,6 @@ #include "avcodec.h" #include "bytestream.h" #include "fft.h" -#include "fmtconvert.h" #include "get_bits.h" #include "internal.h" @@ -107,7 +106,6 @@ typedef struct ATRAC3Context { AtracGCContext gainc_ctx; FFTContext mdct_ctx; - FmtConvertContext fmt_conv; AVFloatDSPContext fdsp; } ATRAC3Context; @@ -910,7 +908,6 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) ff_atrac_init_gain_compensation(&q->gainc_ctx, 4, 3); avpriv_float_dsp_init(&q->fdsp, avctx->flags & CODEC_FLAG_BITEXACT); - ff_fmt_convert_init(&q->fmt_conv, avctx); q->units = av_mallocz(sizeof(*q->units) * avctx->channels); if (!q->units) { diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c index ffc8f87..0b427bf 100644 --- a/libavcodec/binkaudio.c +++ b/libavcodec/binkaudio.c @@ -34,7 +34,6 @@ #include "get_bits.h" #include "dct.h" #include "rdft.h" -#include "fmtconvert.h" #include "internal.h" #include "wma_freqs.h" #include "libavutil/intfloat.h" diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c index 3b9b77c..e868466 100644 --- a/libavcodec/nellymoserdec.c +++ b/libavcodec/nellymoserdec.c @@ -37,7 +37,6 @@ #include "libavutil/random_seed.h" #include "avcodec.h" #include "fft.h" -#include "fmtconvert.h" #include "internal.h" #include "nellymoser.h" #include "sinewin.h" diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c index d52bfd5..59c582b 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -30,7 +30,6 @@ #include "avcodec.h" #include "get_bits.h" #include "fft.h" -#include "fmtconvert.h" #include "internal.h" #include "vorbis.h" @@ -123,7 +122,6 @@ typedef struct vorbis_context_s { GetBitContext gb; VorbisDSPContext dsp; AVFloatDSPContext fdsp; - FmtConvertContext fmt_conv; FFTContext mdct[2]; uint8_t first_frame; @@ -1018,7 +1016,6 @@ static av_cold int vorbis_decode_init(AVCodecContext *avctx) vc->avctx = avctx; ff_vorbisdsp_init(&vc->dsp); avpriv_float_dsp_init(&vc->fdsp, avctx->flags & CODEC_FLAG_BITEXACT); - ff_fmt_convert_init(&vc->fmt_conv, avctx); avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; diff --git a/libavcodec/wma.c b/libavcodec/wma.c index 9fd2a11..ad948d1 100644 --- a/libavcodec/wma.c +++ b/libavcodec/wma.c @@ -94,7 +94,6 @@ av_cold int ff_wma_init(AVCodecContext *avctx, int flags2) avctx->bit_rate <= 0) return -1; - ff_fmt_convert_init(&s->fmt_conv, avctx); avpriv_float_dsp_init(&s->fdsp, avctx->flags & CODEC_FLAG_BITEXACT); if (avctx->codec->id == AV_CODEC_ID_WMAV1) diff --git a/libavcodec/wma.h b/libavcodec/wma.h index 3a9de40..afa3b0d 100644 --- a/libavcodec/wma.h +++ b/libavcodec/wma.h @@ -25,7 +25,6 @@ #include "libavutil/float_dsp.h" #include "fft.h" -#include "fmtconvert.h" #include "get_bits.h" #include "put_bits.h" @@ -131,7 +130,6 @@ typedef struct WMACodecContext { float lsp_pow_e_table[256]; float lsp_pow_m_table1[(1 << LSP_POW_BITS)]; float lsp_pow_m_table2[(1 << LSP_POW_BITS)]; - FmtConvertContext fmt_conv; AVFloatDSPContext fdsp; #ifdef TRACE

1 0

Merge commit 'b9d2d6843a49f9df1d1ae1afe817d9b48c445919'
by git＠videolan.org 28 Feb '15

28 Feb '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Feb 28 23:32:33 2015 +0100| [ca6fee7606866a0cb7676b95db4c462500cc8d2d] | committer: Michael Niedermayer Merge commit 'b9d2d6843a49f9df1d1ae1afe817d9b48c445919' * commit 'b9d2d6843a49f9df1d1ae1afe817d9b48c445919': tls: Pass AVOptions dictionaries through to the chained protocol Conflicts: libavformat/tls.c Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ca6fee7606866a0cb… ---

1 0

tls: Pass AVOptions dictionaries through to the chained protocol
by git＠videolan.org 28 Feb '15

28 Feb '15

ffmpeg | branch: master | Martin Storsjö <martin(a)martin.st> | Sat Feb 28 02:15:55 2015 +0200| [b9d2d6843a49f9df1d1ae1afe817d9b48c445919] | committer: Martin Storsjö tls: Pass AVOptions dictionaries through to the chained protocol Signed-off-by: Martin Storsjö <martin(a)martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b9d2d6843a49f9df1… --- libavformat/tls.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/tls.c b/libavformat/tls.c index 1832f2b..d5de5ee 100644 --- a/libavformat/tls.c +++ b/libavformat/tls.c @@ -137,7 +137,7 @@ static int do_tls_poll(URLContext *h, int ret) return 0; } -static int tls_open(URLContext *h, const char *uri, int flags) +static int tls_open(URLContext *h, const char *uri, int flags, AVDictionary **options) { TLSContext *c = h->priv_data; int ret; @@ -189,7 +189,7 @@ static int tls_open(URLContext *h, const char *uri, int flags) } ret = ffurl_open(&c->tcp, buf, AVIO_FLAG_READ_WRITE, - &h->interrupt_callback, NULL); + &h->interrupt_callback, options); if (ret) goto fail; c->fd = ffurl_get_file_handle(c->tcp); @@ -360,7 +360,7 @@ static int tls_close(URLContext *h) URLProtocol ff_tls_protocol = { .name = "tls", - .url_open = tls_open, + .url_open2 = tls_open, .url_read = tls_read, .url_write = tls_write, .url_close = tls_close,

1 0

Merge commit 'e14f98c62fdf8744b07419314095d1b3248cce75'
by git＠videolan.org 28 Feb '15

28 Feb '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Feb 28 23:20:39 2015 +0100| [c5c4e5839ad1459bdbd69ffa7d33949577662a6c] | committer: Michael Niedermayer Merge commit 'e14f98c62fdf8744b07419314095d1b3248cce75' * commit 'e14f98c62fdf8744b07419314095d1b3248cce75': tcp: Clarify the units for the timeout avoptions Conflicts: libavformat/tcp.c Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c5c4e5839ad1459bd… ---

1 0

tcp: Clarify the units for the timeout avoptions
by git＠videolan.org 28 Feb '15

28 Feb '15

ffmpeg | branch: master | Martin Storsjö <martin(a)martin.st> | Sat Feb 28 01:37:18 2015 +0200| [e14f98c62fdf8744b07419314095d1b3248cce75] | committer: Martin Storsjö tcp: Clarify the units for the timeout avoptions Signed-off-by: Martin Storsjö <martin(a)martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e14f98c62fdf8744b… --- libavformat/tcp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/tcp.c b/libavformat/tcp.c index a242611..9585dc0 100644 --- a/libavformat/tcp.c +++ b/libavformat/tcp.c @@ -43,8 +43,8 @@ typedef struct TCPContext { #define E AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { { "listen", "Listen for incoming connections", OFFSET(listen), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, .flags = D|E }, - { "timeout", "Connection timeout", OFFSET(timeout), AV_OPT_TYPE_INT, { .i64 = 10000 }, INT_MIN, INT_MAX, .flags = D|E }, - { "listen_timeout", "Bind timeout", OFFSET(listen_timeout), AV_OPT_TYPE_INT, { .i64 = -1 }, INT_MIN, INT_MAX, .flags = D|E }, + { "timeout", "Connection timeout (in milliseconds)", OFFSET(timeout), AV_OPT_TYPE_INT, { .i64 = 10000 }, INT_MIN, INT_MAX, .flags = D|E }, + { "listen_timeout", "Bind timeout (in milliseconds)", OFFSET(listen_timeout), AV_OPT_TYPE_INT, { .i64 = -1 }, INT_MIN, INT_MAX, .flags = D|E }, { NULL } };

1 0

Merge commit 'c86d8aed748adc3ba8df96fb1fe14aa45da77a31'
by git＠videolan.org 28 Feb '15

28 Feb '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Feb 28 23:02:36 2015 +0100| [1fb3642317768c02db0eaf8d0d118d37a970f091] | committer: Michael Niedermayer Merge commit 'c86d8aed748adc3ba8df96fb1fe14aa45da77a31' * commit 'c86d8aed748adc3ba8df96fb1fe14aa45da77a31': avio: Rename avclass symbols relating to avio Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1fb3642317768c02d… ---

1 0

avio: Rename avclass symbols relating to avio
by git＠videolan.org 28 Feb '15

28 Feb '15

ffmpeg | branch: master | Martin Storsjö <martin(a)martin.st> | Sat Feb 28 01:06:28 2015 +0200| [c86d8aed748adc3ba8df96fb1fe14aa45da77a31] | committer: Martin Storsjö avio: Rename avclass symbols relating to avio Don't prefix them ffio_url, which is misleading, sounding too much like the urlprotocol layer (like ffurl_*). Signed-off-by: Martin Storsjö <martin(a)martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c86d8aed748adc3ba… --- libavformat/avio_internal.h | 2 +- libavformat/aviobuf.c | 16 ++++++++-------- libavformat/options.c | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libavformat/avio_internal.h b/libavformat/avio_internal.h index f8c9c93..c8630ab 100644 --- a/libavformat/avio_internal.h +++ b/libavformat/avio_internal.h @@ -25,7 +25,7 @@ #include "libavutil/log.h" -extern const AVClass ffio_url_class; +extern const AVClass ff_avio_class; int ffio_init_context(AVIOContext *s, unsigned char *buffer, diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 8dc805a..fb941c6 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -40,28 +40,28 @@ */ #define SHORT_SEEK_THRESHOLD 4096 -static void *ffio_url_child_next(void *obj, void *prev) +static void *ff_avio_child_next(void *obj, void *prev) { AVIOContext *s = obj; return prev ? NULL : s->opaque; } -static const AVClass *ffio_url_child_class_next(const AVClass *prev) +static const AVClass *ff_avio_child_class_next(const AVClass *prev) { return prev ? NULL : &ffurl_context_class; } -static const AVOption ffio_url_options[] = { +static const AVOption ff_avio_options[] = { { NULL }, }; -const AVClass ffio_url_class = { +const AVClass ff_avio_class = { .class_name = "AVIOContext", .item_name = av_default_item_name, .version = LIBAVUTIL_VERSION_INT, - .option = ffio_url_options, - .child_next = ffio_url_child_next, - .child_class_next = ffio_url_child_class_next, + .option = ff_avio_options, + .child_next = ff_avio_child_next, + .child_class_next = ff_avio_child_class_next, }; static void fill_buffer(AVIOContext *s); @@ -703,7 +703,7 @@ int ffio_fdopen(AVIOContext **s, URLContext *h) (*s)->read_pause = (int (*)(void *, int))h->prot->url_read_pause; (*s)->read_seek = (int64_t (*)(void *, int, int64_t, int))h->prot->url_read_seek; } - (*s)->av_class = &ffio_url_class; + (*s)->av_class = &ff_avio_class; return 0; } diff --git a/libavformat/options.c b/libavformat/options.c index 227c36f..996dc31 100644 --- a/libavformat/options.c +++ b/libavformat/options.c @@ -55,7 +55,7 @@ static const AVClass *format_child_class_next(const AVClass *prev) AVOutputFormat *ofmt = NULL; if (!prev) - return &ffio_url_class; + return &ff_avio_class; while ((ifmt = av_iformat_next(ifmt))) if (ifmt->priv_class == prev)

1 0