Merge commit '4958f35a2ebc307049ff2104ffb944f5f457feb3'

* commit '4958f35a2ebc307049ff2104ffb944f5f457feb3':
  dsputil: Move apply_window_int16 to ac3dsp

Conflicts:
	libavcodec/arm/ac3dsp_init_arm.c
	libavcodec/arm/ac3dsp_neon.S
	libavcodec/x86/ac3dsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/ac3dsp.c
index 6df3a68,e792bcf..feda6dd
--- 1/libavcodec/ac3dsp.c
--- 2/libavcodec/ac3dsp.c
+++ b/libavcodec/ac3dsp.c
@@@ -250,9 -221,8 +263,10 @@@ av_cold void ff_ac3dsp_init(AC3DSPConte
      c->update_bap_counts = ac3_update_bap_counts_c;
      c->compute_mantissa_size = ac3_compute_mantissa_size_c;
      c->extract_exponents = ac3_extract_exponents_c;
 +    c->sum_square_butterfly_int32 = ac3_sum_square_butterfly_int32_c;
 +    c->sum_square_butterfly_float = ac3_sum_square_butterfly_float_c;
      c->downmix = ac3_downmix_c;
+     c->apply_window_int16 = apply_window_int16_c;
  
      if (ARCH_ARM)
          ff_ac3dsp_init_arm(c, bit_exact);

diff --cc libavcodec/ac3dsp.h
index bafbc89,e350c88..bced597
--- 1/libavcodec/ac3dsp.h
--- 2/libavcodec/ac3dsp.h
+++ b/libavcodec/ac3dsp.h
@@@ -126,14 -126,22 +126,28 @@@ typedef struct AC3DSPContext 
  
      void (*extract_exponents)(uint8_t *exp, int32_t *coef, int nb_coefs);
  
 +    void (*sum_square_butterfly_int32)(int64_t sum[4], const int32_t *coef0,
 +                                       const int32_t *coef1, int len);
 +
 +    void (*sum_square_butterfly_float)(float sum[4], const float *coef0,
 +                                       const float *coef1, int len);
 +
      void (*downmix)(float **samples, float (*matrix)[2], int out_ch,
                      int in_ch, int len);
+ 
+     /**
+      * Apply symmetric window in 16-bit fixed-point.
+      * @param output destination array
+      *               constraints: 16-byte aligned
+      * @param input  source array
+      *               constraints: 16-byte aligned
+      * @param window window array
+      *               constraints: 16-byte aligned, at least len/2 elements
+      * @param len    full window length
+      *               constraints: multiple of ? greater than zero
+      */
+     void (*apply_window_int16)(int16_t *output, const int16_t *input,
+                                const int16_t *window, unsigned int len);
  } AC3DSPContext;
  
  void ff_ac3dsp_init    (AC3DSPContext *c, int bit_exact);

diff --cc libavcodec/ac3enc_fixed.c
Simple merge

diff --cc libavcodec/ac3enc_float.c
Simple merge

diff --cc libavcodec/ac3enc_template.c
Simple merge

diff --cc libavcodec/arm/ac3dsp_init_arm.c
index ffe0747,a48353a..a3c32ff
--- 1/libavcodec/arm/ac3dsp_init_arm.c
--- 2/libavcodec/arm/ac3dsp_init_arm.c
+++ b/libavcodec/arm/ac3dsp_init_arm.c
@@@ -31,14 -31,8 +31,16 @@@ void ff_ac3_lshift_int16_neon(int16_t *
  void ff_ac3_rshift_int32_neon(int32_t *src, unsigned len, unsigned shift);
  void ff_float_to_fixed24_neon(int32_t *dst, const float *src, unsigned int len);
  void ff_ac3_extract_exponents_neon(uint8_t *exp, int32_t *coef, int nb_coefs);
+ void ff_apply_window_int16_neon(int16_t *dst, const int16_t *src,
+                                 const int16_t *window, unsigned n);
 +void ff_ac3_sum_square_butterfly_int32_neon(int64_t sum[4],
 +                                            const int32_t *coef0,
 +                                            const int32_t *coef1,
 +                                            int len);
 +void ff_ac3_sum_square_butterfly_float_neon(float sum[4],
 +                                            const float *coef0,
 +                                            const float *coef1,
 +                                            int len);
  
  void ff_ac3_bit_alloc_calc_bap_armv6(int16_t *mask, int16_t *psd,
                                       int start, int end,
@@@ -64,7 -58,6 +66,8 @@@ av_cold void ff_ac3dsp_init_arm(AC3DSPC
          c->ac3_rshift_int32      = ff_ac3_rshift_int32_neon;
          c->float_to_fixed24      = ff_float_to_fixed24_neon;
          c->extract_exponents     = ff_ac3_extract_exponents_neon;
+         c->apply_window_int16    = ff_apply_window_int16_neon;
 +        c->sum_square_butterfly_int32 = ff_ac3_sum_square_butterfly_int32_neon;
 +        c->sum_square_butterfly_float = ff_ac3_sum_square_butterfly_float_neon;
      }
  }

diff --cc libavcodec/arm/ac3dsp_neon.S
index 381f158,f97b190..89d0ae8
--- 1/libavcodec/arm/ac3dsp_neon.S
--- 2/libavcodec/arm/ac3dsp_neon.S
+++ b/libavcodec/arm/ac3dsp_neon.S
@@@ -109,46 -109,25 +109,69 @@@ function ff_ac3_extract_exponents_neon
          bx              lr
  endfunc
  
+ function ff_apply_window_int16_neon, export=1
+         push            {r4,lr}
+         add             r4,  r1,  r3,  lsl #1
+         add             lr,  r0,  r3,  lsl #1
+         sub             r4,  r4,  #16
+         sub             lr,  lr,  #16
+         mov             r12, #-16
+ 1:
+         vld1.16         {q0},     [r1,:128]!
+         vld1.16         {q2},     [r2,:128]!
+         vld1.16         {q1},     [r4,:128], r12
+         vrev64.16       q3,  q2
+         vqrdmulh.s16    q0,  q0,  q2
+         vqrdmulh.s16    d2,  d2,  d7
+         vqrdmulh.s16    d3,  d3,  d6
+         vst1.16         {q0},     [r0,:128]!
+         vst1.16         {q1},     [lr,:128], r12
+         subs            r3,  r3,  #16
+         bgt             1b
+ 
+         pop             {r4,pc}
+ endfunc
++
 +function ff_ac3_sum_square_butterfly_int32_neon, export=1
 +        vmov.i64        q0,  #0
 +        vmov.i64        q1,  #0
 +        vmov.i64        q2,  #0
 +        vmov.i64        q3,  #0
 +1:
 +        vld1.32         {d16},    [r1]!
 +        vld1.32         {d17},    [r2]!
 +        vadd.s32        d18, d16, d17
 +        vsub.s32        d19, d16, d17
 +        vmlal.s32       q0,  d16, d16
 +        vmlal.s32       q1,  d17, d17
 +        vmlal.s32       q2,  d18, d18
 +        vmlal.s32       q3,  d19, d19
 +        subs            r3,  r3,  #2
 +        bgt             1b
 +        vadd.s64        d0,  d0,  d1
 +        vadd.s64        d1,  d2,  d3
 +        vadd.s64        d2,  d4,  d5
 +        vadd.s64        d3,  d6,  d7
 +        vst1.64         {q0-q1},  [r0]
 +        bx              lr
 +endfunc
 +
 +function ff_ac3_sum_square_butterfly_float_neon, export=1
 +        vmov.f32        q0,  #0.0
 +        vmov.f32        q1,  #0.0
 +1:
 +        vld1.32         {d16},    [r1]!
 +        vld1.32         {d17},    [r2]!
 +        vadd.f32        d18, d16, d17
 +        vsub.f32        d19, d16, d17
 +        vmla.f32        d0,  d16, d16
 +        vmla.f32        d1,  d17, d17
 +        vmla.f32        d2,  d18, d18
 +        vmla.f32        d3,  d19, d19
 +        subs            r3,  r3,  #2
 +        bgt             1b
 +        vpadd.f32       d0,  d0,  d1
 +        vpadd.f32       d1,  d2,  d3
 +        vst1.32         {q0},     [r0]
 +        bx              lr
 +endfunc

diff --cc libavcodec/arm/dsputil_init_neon.c
Simple merge

diff --cc libavcodec/arm/dsputil_neon.S
Simple merge

diff --cc libavcodec/dsputil.c
Simple merge

diff --cc libavcodec/dsputil.h
Simple merge

diff --cc libavcodec/x86/ac3dsp_init.c
index 8c94db0,9fbed3c..5819d00
--- 1/libavcodec/x86/ac3dsp_init.c
--- 2/libavcodec/x86/ac3dsp_init.c
+++ b/libavcodec/x86/ac3dsp_init.c
@@@ -51,11 -51,19 +51,24 @@@ void ff_ac3_extract_exponents_3dnow(uin
  void ff_ac3_extract_exponents_sse2 (uint8_t *exp, int32_t *coef, int nb_coefs);
  void ff_ac3_extract_exponents_ssse3(uint8_t *exp, int32_t *coef, int nb_coefs);
  
+ void ff_apply_window_int16_round_mmxext(int16_t *output, const int16_t *input,
+                                         const int16_t *window, unsigned int len);
+ void ff_apply_window_int16_round_sse2(int16_t *output, const int16_t *input,
+                                       const int16_t *window, unsigned int len);
+ void ff_apply_window_int16_mmxext(int16_t *output, const int16_t *input,
+                                   const int16_t *window, unsigned int len);
+ void ff_apply_window_int16_sse2(int16_t *output, const int16_t *input,
+                                 const int16_t *window, unsigned int len);
+ void ff_apply_window_int16_ssse3(int16_t *output, const int16_t *input,
+                                  const int16_t *window, unsigned int len);
+ void ff_apply_window_int16_ssse3_atom(int16_t *output, const int16_t *input,
+                                       const int16_t *window, unsigned int len);
+ 
 +#if ARCH_X86_32 && defined(__INTEL_COMPILER)
 +#       undef HAVE_7REGS
 +#       define HAVE_7REGS 0
 +#endif
 +
  #if HAVE_SSE_INLINE && HAVE_7REGS
  
  #define IF1(x) x

diff --cc libavcodec/x86/dsputil_init.c
Simple merge