virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

Merge commit 'd961a79eb07a8911540a0bd356d68ae0cf93c6a1'

Browse Source 
* commit 'd961a79eb07a8911540a0bd356d68ae0cf93c6a1':
  sbrdsp: move #if to disable all educational code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-03-18 19:58:18 +01:00
commit 61ad2b42a1
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/sbrdsp.c
View File

@ -110,6 +110,11 @@ static void sbr_qmf_deint_bfly_c(float *v, const float *src0, const float *src1)
} }
} }
#if 0
/* This code is slower because it multiplies memory accesses.
* It is left for educational purposes and because it may offer
* a better reference for writing arch-specific DSP functions. */
static av_always_inline void autocorrelate(const float x[40][2], static av_always_inline void autocorrelate(const float x[40][2],
float phi[3][2][2], int lag) float phi[3][2][2], int lag)
{ {
@ -138,14 +143,13 @@ static av_always_inline void autocorrelate(const float x[40][2],
static void sbr_autocorrelate_c(const float x[40][2], float phi[3][2][2]) static void sbr_autocorrelate_c(const float x[40][2], float phi[3][2][2])
{ {
#if 0
/* This code is slower because it multiplies memory accesses.
* It is left for educational purposes and because it may offer
* a better reference for writing arch-specific DSP functions. */
autocorrelate(x, phi, 0); autocorrelate(x, phi, 0);
autocorrelate(x, phi, 1); autocorrelate(x, phi, 1);
autocorrelate(x, phi, 2); autocorrelate(x, phi, 2);
}
#else #else
static void sbr_autocorrelate_c(const float x[40][2], float phi[3][2][2])
{
float real_sum2 = x[0][0] * x[2][0] + x[0][1] * x[2][1]; float real_sum2 = x[0][0] * x[2][0] + x[0][1] * x[2][1];
float imag_sum2 = x[0][0] * x[2][1] - x[0][1] * x[2][0]; float imag_sum2 = x[0][0] * x[2][1] - x[0][1] * x[2][0];
float real_sum1 = 0.0f, imag_sum1 = 0.0f, real_sum0 = 0.0f; float real_sum1 = 0.0f, imag_sum1 = 0.0f, real_sum0 = 0.0f;