← Back to branch summary

~ubuntu-branches/ubuntu/vivid/ffmpeg/vivid

« back to all changes in this revision

Viewing changes to libavcodec/synth_filter.c

  • Committer: Package Import Robot
  • Author(s): Andreas Cadhalpun
  • Date: 2014-11-05 01:18:23 UTC
  • mfrom: (0.2.17 sid)
  • Revision ID: package-import@ubuntu.com-20141105011823-xsbeceffs43wtkn7
Tags: 7:2.4.3-1
* Import new upstream bugfix release 2.4.3.
   - Refresh Change-symbol-versioning.patch.
   - Add new symbols to the libavdevice symbols file.
* Enable libbs2b on arm64, since it is now available.
* Disable frei0r and libx264 on x32, libsoxr and openal on sparc64
  and libopencv on m68k, sh4, sparc64 and x32, because they are not
  (yet) avialable there.
* Disable assembler optimizations on x32, as they wouldn't work there.
* Include config.log in the build-log, when compiling fails.
* Add fix-hppa-tests.patch to work around a gcc bug on hppa.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/synth_filter.c
24
24
static void synth_filter_float(FFTContext *imdct,
25
25
                           float *synth_buf_ptr, int *synth_buf_offset,
26
26
                           float synth_buf2[32], const float window[512],
27
 
                           float out[32], const float in[32], float scale, float bias)
 
27
                           float out[32], const float in[32], float scale)
28
28
{
29
29
    float *synth_buf= synth_buf_ptr + *synth_buf_offset;
30
30
    int i, j;
31
31
 
32
 
    ff_imdct_half(imdct, synth_buf, in);
 
32
    imdct->imdct_half(imdct, synth_buf, in);
33
33
 
34
34
    for (i = 0; i < 16; i++){
35
35
        float a= synth_buf2[i     ];
48
48
            c += window[i + j + 32]*( synth_buf[16 + i + j - 512]);
49
49
            d += window[i + j + 48]*( synth_buf[31 - i + j - 512]);
50
50
        }
51
 
        out[i     ] = a*scale + bias;
52
 
        out[i + 16] = b*scale + bias;
 
51
        out[i     ] = a*scale;
 
52
        out[i + 16] = b*scale;
53
53
        synth_buf2[i     ] = c;
54
54
        synth_buf2[i + 16] = d;
55
55
    }
61
61
    c->synth_filter_float = synth_filter_float;
62
62
 
63
63
    if (ARCH_ARM) ff_synth_filter_init_arm(c);
 
64
    if (ARCH_X86) ff_synth_filter_init_x86(c);
64
65
}