Merge commit '87ec849fe9acba075c843e67bcd01f256f481a18'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Feb 2014 17:14:12 +0000 (18:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Feb 2014 17:14:12 +0000 (18:14 +0100)
* commit '87ec849fe9acba075c843e67bcd01f256f481a18':
  dcadec: remove scaling in lfe_interpolation_fir

Conflicts:
libavcodec/dcadec.c
libavcodec/dcadsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/arm/dcadsp_init_arm.c
libavcodec/arm/dcadsp_neon.S
libavcodec/arm/dcadsp_vfp.S
libavcodec/dcadata.h
libavcodec/dcadec.c
libavcodec/dcadsp.c
libavcodec/dcadsp.h

Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1426,8 -1265,7 +1426,7 @@@ static int dca_filter_channels(DCAConte
      if (s->lfe) {
          lfe_interpolation_fir(s, s->lfe, 2 * s->lfe,
                                s->lfe_data + 2 * s->lfe * (block_index + 4),
-                               s->samples_chanptr[s->lfe_index],
-                               1.0 / (256.0 * 32768.0));
 -                              s->samples_chanptr[dca_lfe_index[s->amode]]);
++                              s->samples_chanptr[s->lfe_index]);
          /* Outputs 20bits pcm samples */
      }
  
@@@ -34,24 -34,24 +34,24 @@@ static void int8x8_fmul_int32_c(float *
  
  static inline void
  dca_lfe_fir(float *out, const float *in, const float *coefs,
-             int decifactor, float scale)
+             int decifactor)
  {
 -    float *out2 = out + decifactor;
 +    float *out2 = out + 2*decifactor-1;
      const float *cf0 = coefs;
 -    const float *cf1 = coefs + 256;
 +    int num_coeffs = 256 / decifactor;
      int j, k;
  
      /* One decimated sample generates 2*decifactor interpolated ones */
      for (k = 0; k < decifactor; k++) {
          float v0 = 0.0;
          float v1 = 0.0;
 -        for (j = 0; j < 256 / decifactor; j++) {
 -            float s = in[-j];
 -            v0 += s * *cf0++;
 -            v1 += s * *--cf1;
 +        for (j = 0; j < num_coeffs; j++, cf0++) {
 +            v0 += in[-j] * *cf0;
 +            v1 += in[1+j-num_coeffs] * *cf0;
 +
          }
-         *out++  = v0 * scale;
-         *out2-- = v1 * scale;
+         *out++  = v0;
 -        *out2++ = v1;
++        *out2-- = v1;
      }
  }
  
Simple merge