summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/Makefile3
-rw-r--r--libavcodec/aacsbr.c183
-rw-r--r--libavcodec/aacsbrdata.h2
-rw-r--r--libavcodec/sbr.h2
-rw-r--r--libavcodec/sbrdsp.c237
-rw-r--r--libavcodec/sbrdsp.h47
6 files changed, 337 insertions, 137 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index ef2aa9626f..27f8546644 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -52,7 +52,8 @@ OBJS-$(CONFIG_VDPAU) += vdpau.o
OBJS-$(CONFIG_A64MULTI_ENCODER) += a64multienc.o elbg.o
OBJS-$(CONFIG_A64MULTI5_ENCODER) += a64multienc.o elbg.o
OBJS-$(CONFIG_AAC_DECODER) += aacdec.o aactab.o aacsbr.o aacps.o \
- aacadtsdec.o mpeg4audio.o kbdwin.o
+ aacadtsdec.o mpeg4audio.o kbdwin.o \
+ sbrdsp.o
OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o \
aacpsy.o aactab.o \
psymodel.o iirfilter.o \
diff --git a/libavcodec/aacsbr.c b/libavcodec/aacsbr.c
index 0bfcabb06b..01601b035c 100644
--- a/libavcodec/aacsbr.c
+++ b/libavcodec/aacsbr.c
@@ -32,6 +32,7 @@
#include "aacsbrdata.h"
#include "fft.h"
#include "aacps.h"
+#include "sbrdsp.h"
#include "libavutil/libm.h"
#include <stdint.h>
@@ -140,6 +141,7 @@ av_cold void ff_aac_sbr_ctx_init(AACContext *ac, SpectralBandReplication *sbr)
ff_mdct_init(&sbr->mdct, 7, 1, 1.0 / (64 * mdct_scale));
ff_mdct_init(&sbr->mdct_ana, 7, 1, -2.0 * mdct_scale);
ff_ps_ctx_init(&sbr->ps);
+ ff_sbrdsp_init(&sbr->dsp);
}
av_cold void ff_aac_sbr_ctx_close(SpectralBandReplication *sbr)
@@ -1139,33 +1141,21 @@ static void sbr_dequant(SpectralBandReplication *sbr, int id_aac)
* @param x pointer to the beginning of the first sample window
* @param W array of complex-valued samples split into subbands
*/
-static void sbr_qmf_analysis(DSPContext *dsp, FFTContext *mdct, const float *in, float *x,
+static void sbr_qmf_analysis(DSPContext *dsp, FFTContext *mdct,
+ SBRDSPContext *sbrdsp, const float *in, float *x,
float z[320], float W[2][32][32][2])
{
- int i, k;
+ int i;
memcpy(W[0], W[1], sizeof(W[0]));
memcpy(x , x+1024, (320-32)*sizeof(x[0]));
memcpy(x+288, in, 1024*sizeof(x[0]));
for (i = 0; i < 32; i++) { // numTimeSlots*RATE = 16*2 as 960 sample frames
// are not supported
dsp->vector_fmul_reverse(z, sbr_qmf_window_ds, x, 320);
- for (k = 0; k < 64; k++) {
- float f = z[k] + z[k + 64] + z[k + 128] + z[k + 192] + z[k + 256];
- z[k] = f;
- }
- //Shuffle to IMDCT
- z[64] = z[0];
- for (k = 1; k < 32; k++) {
- z[64+2*k-1] = z[ k];
- z[64+2*k ] = -z[64-k];
- }
- z[64+63] = z[32];
-
+ sbrdsp->sum64x5(z);
+ sbrdsp->qmf_pre_shuffle(z);
mdct->imdct_half(mdct, z, z+64);
- for (k = 0; k < 32; k++) {
- W[1][i][k][0] = -z[63-k];
- W[1][i][k][1] = z[k];
- }
+ sbrdsp->qmf_post_shuffle(W[1][i], z);
x += 32;
}
}
@@ -1175,6 +1165,7 @@ static void sbr_qmf_analysis(DSPContext *dsp, FFTContext *mdct, const float *in,
* (14496-3 sp04 p206)
*/
static void sbr_qmf_synthesis(DSPContext *dsp, FFTContext *mdct,
+ SBRDSPContext *sbrdsp,
float *out, float X[2][38][64],
float mdct_buf[2][64],
float *v0, int *v_off, const unsigned int div)
@@ -1198,20 +1189,12 @@ static void sbr_qmf_synthesis(DSPContext *dsp, FFTContext *mdct,
X[0][i][32+n] = X[1][i][31-n];
}
mdct->imdct_half(mdct, mdct_buf[0], X[0][i]);
- for (n = 0; n < 32; n++) {
- v[ n] = mdct_buf[0][63 - 2*n];
- v[63 - n] = -mdct_buf[0][62 - 2*n];
- }
+ sbrdsp->qmf_deint_neg(v, mdct_buf[0]);
} else {
- for (n = 1; n < 64; n+=2) {
- X[1][i][n] = -X[1][i][n];
- }
+ sbrdsp->neg_odd_64(X[1][i]);
mdct->imdct_half(mdct, mdct_buf[0], X[0][i]);
mdct->imdct_half(mdct, mdct_buf[1], X[1][i]);
- for (n = 0; n < 64; n++) {
- v[ n] = -mdct_buf[0][63 - n] + mdct_buf[1][ n ];
- v[127 - n] = mdct_buf[0][63 - n] + mdct_buf[1][ n ];
- }
+ sbrdsp->qmf_deint_bfly(v, mdct_buf[1], mdct_buf[0]);
}
dsp->vector_fmul_add(out, v , sbr_qmf_window , zero64, 64 >> div);
dsp->vector_fmul_add(out, v + ( 192 >> div), sbr_qmf_window + ( 64 >> div), out , 64 >> div);
@@ -1227,45 +1210,19 @@ static void sbr_qmf_synthesis(DSPContext *dsp, FFTContext *mdct,
}
}
-static void autocorrelate(const float x[40][2], float phi[3][2][2], int lag)
-{
- int i;
- float real_sum = 0.0f;
- float imag_sum = 0.0f;
- if (lag) {
- for (i = 1; i < 38; i++) {
- real_sum += x[i][0] * x[i+lag][0] + x[i][1] * x[i+lag][1];
- imag_sum += x[i][0] * x[i+lag][1] - x[i][1] * x[i+lag][0];
- }
- phi[2-lag][1][0] = real_sum + x[ 0][0] * x[lag][0] + x[ 0][1] * x[lag][1];
- phi[2-lag][1][1] = imag_sum + x[ 0][0] * x[lag][1] - x[ 0][1] * x[lag][0];
- if (lag == 1) {
- phi[0][0][0] = real_sum + x[38][0] * x[39][0] + x[38][1] * x[39][1];
- phi[0][0][1] = imag_sum + x[38][0] * x[39][1] - x[38][1] * x[39][0];
- }
- } else {
- for (i = 1; i < 38; i++) {
- real_sum += x[i][0] * x[i][0] + x[i][1] * x[i][1];
- }
- phi[2][1][0] = real_sum + x[ 0][0] * x[ 0][0] + x[ 0][1] * x[ 0][1];
- phi[1][0][0] = real_sum + x[38][0] * x[38][0] + x[38][1] * x[38][1];
- }
-}
-
/** High Frequency Generation (14496-3 sp04 p214+) and Inverse Filtering
* (14496-3 sp04 p214)
* Warning: This routine does not seem numerically stable.
*/
-static void sbr_hf_inverse_filter(float (*alpha0)[2], float (*alpha1)[2],
+static void sbr_hf_inverse_filter(SBRDSPContext *dsp,
+ float (*alpha0)[2], float (*alpha1)[2],
const float X_low[32][40][2], int k0)
{
int k;
for (k = 0; k < k0; k++) {
float phi[3][2][2], dk;
- autocorrelate(X_low[k], phi, 0);
- autocorrelate(X_low[k], phi, 1);
- autocorrelate(X_low[k], phi, 2);
+ dsp->autocorrelate(X_low[k], phi);
dk = phi[2][1][0] * phi[1][0][0] -
(phi[1][1][0] * phi[1][1][0] + phi[1][1][1] * phi[1][1][1]) / 1.000001f;
@@ -1361,12 +1318,11 @@ static int sbr_hf_gen(AACContext *ac, SpectralBandReplication *sbr,
const float bw_array[5], const uint8_t *t_env,
int bs_num_env)
{
- int i, j, x;
+ int j, x;
int g = 0;
int k = sbr->kx[1];
for (j = 0; j < sbr->num_patches; j++) {
for (x = 0; x < sbr->patch_num_subbands[j]; x++, k++) {
- float alpha[4];
const int p = sbr->patch_start_subband[j] + x;
while (g <= sbr->n_q && k >= sbr->f_tablenoise[g])
g++;
@@ -1378,26 +1334,10 @@ static int sbr_hf_gen(AACContext *ac, SpectralBandReplication *sbr,
return -1;
}
- alpha[0] = alpha1[p][0] * bw_array[g] * bw_array[g];
- alpha[1] = alpha1[p][1] * bw_array[g] * bw_array[g];
- alpha[2] = alpha0[p][0] * bw_array[g];
- alpha[3] = alpha0[p][1] * bw_array[g];
-
- for (i = 2 * t_env[0]; i < 2 * t_env[bs_num_env]; i++) {
- const int idx = i + ENVELOPE_ADJUSTMENT_OFFSET;
- X_high[k][idx][0] =
- X_low[p][idx - 2][0] * alpha[0] -
- X_low[p][idx - 2][1] * alpha[1] +
- X_low[p][idx - 1][0] * alpha[2] -
- X_low[p][idx - 1][1] * alpha[3] +
- X_low[p][idx][0];
- X_high[k][idx][1] =
- X_low[p][idx - 2][1] * alpha[0] +
- X_low[p][idx - 2][0] * alpha[1] +
- X_low[p][idx - 1][1] * alpha[2] +
- X_low[p][idx - 1][0] * alpha[3] +
- X_low[p][idx][1];
- }
+ sbr->dsp.hf_gen(X_high[k] + ENVELOPE_ADJUSTMENT_OFFSET,
+ X_low[p] + ENVELOPE_ADJUSTMENT_OFFSET,
+ alpha0[p], alpha1[p], bw_array[g],
+ 2 * t_env[0], 2 * t_env[bs_num_env]);
}
}
if (k < sbr->m[1] + sbr->kx[1])
@@ -1497,7 +1437,8 @@ static void sbr_mapping(AACContext *ac, SpectralBandReplication *sbr,
static void sbr_env_estimate(float (*e_curr)[48], float X_high[64][40][2],
SpectralBandReplication *sbr, SBRData *ch_data)
{
- int e, i, m;
+ int e, m;
+ int kx1 = sbr->kx[1];
if (sbr->bs_interpol_freq) {
for (e = 0; e < ch_data->bs_num_env; e++) {
@@ -1506,12 +1447,7 @@ static void sbr_env_estimate(float (*e_curr)[48], float X_high[64][40][2],
int iub = ch_data->t_env[e + 1] * 2 + ENVELOPE_ADJUSTMENT_OFFSET;
for (m = 0; m < sbr->m[1]; m++) {
- float sum = 0.0f;
-
- for (i = ilb; i < iub; i++) {
- sum += X_high[m + sbr->kx[1]][i][0] * X_high[m + sbr->kx[1]][i][0] +
- X_high[m + sbr->kx[1]][i][1] * X_high[m + sbr->kx[1]][i][1];
- }
+ float sum = sbr->dsp.sum_square(X_high[m+kx1] + ilb, iub - ilb);
e_curr[e][m] = sum * recip_env_size;
}
}
@@ -1529,14 +1465,11 @@ static void sbr_env_estimate(float (*e_curr)[48], float X_high[64][40][2],
const int den = env_size * (table[p + 1] - table[p]);
for (k = table[p]; k < table[p + 1]; k++) {
- for (i = ilb; i < iub; i++) {
- sum += X_high[k][i][0] * X_high[k][i][0] +
- X_high[k][i][1] * X_high[k][i][1];
- }
+ sum += sbr->dsp.sum_square(X_high[k] + ilb, iub - ilb);
}
sum /= den;
for (k = table[p]; k < table[p + 1]; k++) {
- e_curr[e][k - sbr->kx[1]] = sum;
+ e_curr[e][k - kx1] = sum;
}
}
}
@@ -1647,55 +1580,34 @@ static void sbr_hf_assemble(float Y[2][38][64][2], const float X_high[64][40][2]
for (e = 0; e < ch_data->bs_num_env; e++) {
for (i = 2 * ch_data->t_env[e]; i < 2 * ch_data->t_env[e + 1]; i++) {
int phi_sign = (1 - 2*(kx & 1));
+ float g_filt_tab[48], *g_filt;
+ float q_filt_tab[48], *q_filt;
if (h_SL && e != e_a[0] && e != e_a[1]) {
+ g_filt = g_filt_tab;
+ q_filt = q_filt_tab;
for (m = 0; m < m_max; m++) {
const int idx1 = i + h_SL;
- float g_filt = 0.0f;
- for (j = 0; j <= h_SL; j++)
- g_filt += g_temp[idx1 - j][m] * h_smooth[j];
- Y[1][i][m + kx][0] =
- X_high[m + kx][i + ENVELOPE_ADJUSTMENT_OFFSET][0] * g_filt;
- Y[1][i][m + kx][1] =
- X_high[m + kx][i + ENVELOPE_ADJUSTMENT_OFFSET][1] * g_filt;
+ g_filt[m] = 0.0f;
+ q_filt[m] = 0.0f;
+ for (j = 0; j <= h_SL; j++) {
+ g_filt[m] += g_temp[idx1 - j][m] * h_smooth[j];
+ q_filt[m] += q_temp[idx1 - j][m] * h_smooth[j];
+ }
}
} else {
- for (m = 0; m < m_max; m++) {
- const float g_filt = g_temp[i + h_SL][m];
- Y[1][i][m + kx][0] =
- X_high[m + kx][i + ENVELOPE_ADJUSTMENT_OFFSET][0] * g_filt;
- Y[1][i][m + kx][1] =
- X_high[m + kx][i + ENVELOPE_ADJUSTMENT_OFFSET][1] * g_filt;
- }
+ g_filt = g_temp[i + h_SL];
+ q_filt = q_temp[i];
}
+ sbr->dsp.hf_g_filt(Y[1][i] + kx, X_high + kx, g_filt, m_max,
+ i + ENVELOPE_ADJUSTMENT_OFFSET);
+
if (e != e_a[0] && e != e_a[1]) {
- for (m = 0; m < m_max; m++) {
- indexnoise = (indexnoise + 1) & 0x1ff;
- if (sbr->s_m[e][m]) {
- Y[1][i][m + kx][0] +=
- sbr->s_m[e][m] * phi[0][indexsine];
- Y[1][i][m + kx][1] +=
- sbr->s_m[e][m] * (phi[1][indexsine] * phi_sign);
- } else {
- float q_filt;
- if (h_SL) {
- const int idx1 = i + h_SL;
- q_filt = 0.0f;
- for (j = 0; j <= h_SL; j++)
- q_filt += q_temp[idx1 - j][m] * h_smooth[j];
- } else {
- q_filt = q_temp[i][m];
- }
- Y[1][i][m + kx][0] +=
- q_filt * sbr_noise_table[indexnoise][0];
- Y[1][i][m + kx][1] +=
- q_filt * sbr_noise_table[indexnoise][1];
- }
- phi_sign = -phi_sign;
- }
+ sbr->dsp.hf_apply_noise[indexsine](Y[1][i] + kx, sbr->s_m[e],
+ q_filt, indexnoise,
+ kx, m_max);
} else {
- indexnoise = (indexnoise + m_max) & 0x1ff;
for (m = 0; m < m_max; m++) {
Y[1][i][m + kx][0] +=
sbr->s_m[e][m] * phi[0][indexsine];
@@ -1704,6 +1616,7 @@ static void sbr_hf_assemble(float Y[2][38][64][2], const float X_high[64][40][2]
phi_sign = -phi_sign;
}
}
+ indexnoise = (indexnoise + m_max) & 0x1ff;
indexsine = (indexsine + 1) & 3;
}
}
@@ -1723,12 +1636,12 @@ void ff_sbr_apply(AACContext *ac, SpectralBandReplication *sbr, int id_aac,
}
for (ch = 0; ch < nch; ch++) {
/* decode channel */
- sbr_qmf_analysis(&ac->dsp, &sbr->mdct_ana, ch ? R : L, sbr->data[ch].analysis_filterbank_samples,
+ sbr_qmf_analysis(&ac->dsp, &sbr->mdct_ana, &sbr->dsp, ch ? R : L, sbr->data[ch].analysis_filterbank_samples,
(float*)sbr->qmf_filter_scratch,
sbr->data[ch].W);
sbr_lf_gen(ac, sbr, sbr->X_low, sbr->data[ch].W);
if (sbr->start) {
- sbr_hf_inverse_filter(sbr->alpha0, sbr->alpha1, sbr->X_low, sbr->k[0]);
+ sbr_hf_inverse_filter(&sbr->dsp, sbr->alpha0, sbr->alpha1, sbr->X_low, sbr->k[0]);
sbr_chirp(sbr, &sbr->data[ch]);
sbr_hf_gen(ac, sbr, sbr->X_high, sbr->X_low, sbr->alpha0, sbr->alpha1,
sbr->data[ch].bw_array, sbr->data[ch].t_env,
@@ -1755,12 +1668,12 @@ void ff_sbr_apply(AACContext *ac, SpectralBandReplication *sbr, int id_aac,
nch = 2;
}
- sbr_qmf_synthesis(&ac->dsp, &sbr->mdct, L, sbr->X[0], sbr->qmf_filter_scratch,
+ sbr_qmf_synthesis(&ac->dsp, &sbr->mdct, &sbr->dsp, L, sbr->X[0], sbr->qmf_filter_scratch,
sbr->data[0].synthesis_filterbank_samples,
&sbr->data[0].synthesis_filterbank_samples_offset,
downsampled);
if (nch == 2)
- sbr_qmf_synthesis(&ac->dsp, &sbr->mdct, R, sbr->X[1], sbr->qmf_filter_scratch,
+ sbr_qmf_synthesis(&ac->dsp, &sbr->mdct, &sbr->dsp, R, sbr->X[1], sbr->qmf_filter_scratch,
sbr->data[1].synthesis_filterbank_samples,
&sbr->data[1].synthesis_filterbank_samples_offset,
downsampled);
diff --git a/libavcodec/aacsbrdata.h b/libavcodec/aacsbrdata.h
index 44d578f7fc..02491c3356 100644
--- a/libavcodec/aacsbrdata.h
+++ b/libavcodec/aacsbrdata.h
@@ -352,7 +352,7 @@ static DECLARE_ALIGNED(16, float, sbr_qmf_window_us)[640] = {
0.8537385600,
};
-static const float sbr_noise_table[512][2] = {
+const float ff_sbr_noise_table[512][2] = {
{-0.99948153278296, -0.59483417516607}, { 0.97113454393991, -0.67528515225647},
{ 0.14130051758487, -0.95090983575689}, {-0.47005496701697, -0.37340549728647},
{ 0.80705063769351, 0.29653668284408}, {-0.38981478896926, 0.89572605717087},
diff --git a/libavcodec/sbr.h b/libavcodec/sbr.h
index 5b0f334219..58f4b61341 100644
--- a/libavcodec/sbr.h
+++ b/libavcodec/sbr.h
@@ -32,6 +32,7 @@
#include <stdint.h>
#include "fft.h"
#include "aacps.h"
+#include "sbrdsp.h"
/**
* Spectral Band Replication header - spectrum parameters that invoke a reset if they differ from the previous header.
@@ -180,6 +181,7 @@ typedef struct {
DECLARE_ALIGNED(16, float, qmf_filter_scratch)[5][64];
FFTContext mdct_ana;
FFTContext mdct;
+ SBRDSPContext dsp;
} SpectralBandReplication;
#endif /* AVCODEC_SBR_H */
diff --git a/libavcodec/sbrdsp.c b/libavcodec/sbrdsp.c
new file mode 100644
index 0000000000..7be962ed77
--- /dev/null
+++ b/libavcodec/sbrdsp.c
@@ -0,0 +1,237 @@
+/*
+ * AAC Spectral Band Replication decoding functions
+ * Copyright (c) 2008-2009 Robert Swain ( rob opendot cl )
+ * Copyright (c) 2009-2010 Alex Converse <alex.converse@gmail.com>
+ *
+ * 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 "libavutil/attributes.h"
+#include "sbrdsp.h"
+
+static void sbr_sum64x5_c(float *z)
+{
+ int k;
+ for (k = 0; k < 64; k++) {
+ float f = z[k] + z[k + 64] + z[k + 128] + z[k + 192] + z[k + 256];
+ z[k] = f;
+ }
+}
+
+static float sbr_sum_square_c(float (*x)[2], int n)
+{
+ float sum = 0.0f;
+ int i;
+
+ for (i = 0; i < n; i++)
+ sum += x[i][0] * x[i][0] + x[i][1] * x[i][1];
+
+ return sum;
+}
+
+static void sbr_neg_odd_64_c(float *x)
+{
+ int i;
+ for (i = 1; i < 64; i += 2)
+ x[i] = -x[i];
+}
+
+static void sbr_qmf_pre_shuffle_c(float *z)
+{
+ int k;
+ z[64] = z[0];
+ z[65] = z[1];
+ for (k = 1; k < 32; k++) {
+ z[64+2*k ] = -z[64 - k];
+ z[64+2*k+1] = z[ k + 1];
+ }
+}
+
+static void sbr_qmf_post_shuffle_c(float W[32][2], const float *z)
+{
+ int k;
+ for (k = 0; k < 32; k++) {
+ W[k][0] = -z[63-k];
+ W[k][1] = z[k];
+ }
+}
+
+static void sbr_qmf_deint_neg_c(float *v, const float *src)
+{
+ int i;
+ for (i = 0; i < 32; i++) {
+ v[ i] = src[63 - 2*i ];
+ v[63 - i] = -src[63 - 2*i - 1];
+ }
+}
+
+static void sbr_qmf_deint_bfly_c(float *v, const float *src0, const float *src1)
+{
+ int i;
+ for (i = 0; i < 64; i++) {
+ v[ i] = src0[i] - src1[63 - i];
+ v[127 - i] = src0[i] + src1[63 - i];
+ }
+}
+
+static av_always_inline void autocorrelate(const float x[40][2],
+ float phi[3][2][2], int lag)
+{
+ int i;
+ float real_sum = 0.0f;
+ float imag_sum = 0.0f;
+ if (lag) {
+ for (i = 1; i < 38; i++) {
+ real_sum += x[i][0] * x[i+lag][0] + x[i][1] * x[i+lag][1];
+ imag_sum += x[i][0] * x[i+lag][1] - x[i][1] * x[i+lag][0];
+ }
+ phi[2-lag][1][0] = real_sum + x[ 0][0] * x[lag][0] + x[ 0][1] * x[lag][1];
+ phi[2-lag][1][1] = imag_sum + x[ 0][0] * x[lag][1] - x[ 0][1] * x[lag][0];
+ if (lag == 1) {
+ phi[0][0][0] = real_sum + x[38][0] * x[39][0] + x[38][1] * x[39][1];
+ phi[0][0][1] = imag_sum + x[38][0] * x[39][1] - x[38][1] * x[39][0];
+ }
+ } else {
+ for (i = 1; i < 38; i++) {
+ real_sum += x[i][0] * x[i][0] + x[i][1] * x[i][1];
+ }
+ phi[2][1][0] = real_sum + x[ 0][0] * x[ 0][0] + x[ 0][1] * x[ 0][1];
+ phi[1][0][0] = real_sum + x[38][0] * x[38][0] + x[38][1] * x[38][1];
+ }
+}
+
+static void sbr_autocorrelate_c(const float x[40][2], float phi[3][2][2])
+{
+ autocorrelate(x, phi, 0);
+ autocorrelate(x, phi, 1);
+ autocorrelate(x, phi, 2);
+}
+
+static void sbr_hf_gen_c(float (*X_high)[2], const float (*X_low)[2],
+ const float alpha0[2], const float alpha1[2],
+ float bw, int start, int end)
+{
+ float alpha[4];
+ int i;
+
+ alpha[0] = alpha1[0] * bw * bw;
+ alpha[1] = alpha1[1] * bw * bw;
+ alpha[2] = alpha0[0] * bw;
+ alpha[3] = alpha0[1] * bw;
+
+ for (i = start; i < end; i++) {
+ X_high[i][0] =
+ X_low[i - 2][0] * alpha[0] -
+ X_low[i - 2][1] * alpha[1] +
+ X_low[i - 1][0] * alpha[2] -
+ X_low[i - 1][1] * alpha[3] +
+ X_low[i][0];
+ X_high[i][1] =
+ X_low[i - 2][1] * alpha[0] +
+ X_low[i - 2][0] * alpha[1] +
+ X_low[i - 1][1] * alpha[2] +
+ X_low[i - 1][0] * alpha[3] +
+ X_low[i][1];
+ }
+}
+
+static void sbr_hf_g_filt_c(float (*Y)[2], const float (*X_high)[40][2],
+ const float *g_filt, int m_max, int ixh)
+{
+ int m;
+
+ for (m = 0; m < m_max; m++) {
+ Y[m][0] = X_high[m][ixh][0] * g_filt[m];
+ Y[m][1] = X_high[m][ixh][1] * g_filt[m];
+ }
+}
+
+static av_always_inline void sbr_hf_apply_noise(float (*Y)[2],
+ const float *s_m,
+ const float *q_filt,
+ int noise,
+ float phi_sign0,
+ float phi_sign1,
+ int m_max)
+{
+ int m;
+
+ for (m = 0; m < m_max; m++) {
+ float y0 = Y[m][0];
+ float y1 = Y[m][1];
+ noise = (noise + 1) & 0x1ff;
+ if (s_m[m]) {
+ y0 += s_m[m] * phi_sign0;
+ y1 += s_m[m] * phi_sign1;
+ } else {
+ y0 += q_filt[m] * ff_sbr_noise_table[noise][0];
+ y1 += q_filt[m] * ff_sbr_noise_table[noise][1];
+ }
+ Y[m][0] = y0;
+ Y[m][1] = y1;
+ phi_sign1 = -phi_sign1;
+ }
+}
+
+static void sbr_hf_apply_noise_0(float (*Y)[2], const float *s_m,
+ const float *q_filt, int noise,
+ int kx, int m_max)
+{
+ sbr_hf_apply_noise(Y, s_m, q_filt, noise, 1.0, 0.0, m_max);
+}
+
+static void sbr_hf_apply_noise_1(float (*Y)[2], const float *s_m,
+ const float *q_filt, int noise,
+ int kx, int m_max)
+{
+ float phi_sign = 1 - 2 * (kx & 1);
+ sbr_hf_apply_noise(Y, s_m, q_filt, noise, 0.0, phi_sign, m_max);
+}
+
+static void sbr_hf_apply_noise_2(float (*Y)[2], const float *s_m,
+ const float *q_filt, int noise,
+ int kx, int m_max)
+{
+ sbr_hf_apply_noise(Y, s_m, q_filt, noise, -1.0, 0.0, m_max);
+}
+
+static void sbr_hf_apply_noise_3(float (*Y)[2], const float *s_m,
+ const float *q_filt, int noise,
+ int kx, int m_max)
+{
+ float phi_sign = 1 - 2 * (kx & 1);
+ sbr_hf_apply_noise(Y, s_m, q_filt, noise, 0.0, -phi_sign, m_max);
+}
+
+av_cold void ff_sbrdsp_init(SBRDSPContext *s)
+{
+ s->sum64x5 = sbr_sum64x5_c;
+ s->sum_square = sbr_sum_square_c;
+ s->neg_odd_64 = sbr_neg_odd_64_c;
+ s->qmf_pre_shuffle = sbr_qmf_pre_shuffle_c;
+ s->qmf_post_shuffle = sbr_qmf_post_shuffle_c;
+ s->qmf_deint_neg = sbr_qmf_deint_neg_c;
+ s->qmf_deint_bfly = sbr_qmf_deint_bfly_c;
+ s->autocorrelate = sbr_autocorrelate_c;
+ s->hf_gen = sbr_hf_gen_c;
+ s->hf_g_filt = sbr_hf_g_filt_c;
+
+ s->hf_apply_noise[0] = sbr_hf_apply_noise_0;
+ s->hf_apply_noise[1] = sbr_hf_apply_noise_1;
+ s->hf_apply_noise[2] = sbr_hf_apply_noise_2;
+ s->hf_apply_noise[3] = sbr_hf_apply_noise_3;
+}
diff --git a/libavcodec/sbrdsp.h b/libavcodec/sbrdsp.h
new file mode 100644
index 0000000000..2f6cf1e4c5
--- /dev/null
+++ b/libavcodec/sbrdsp.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2012 Mans Rullgard
+ *
+ * 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
+ */
+
+#ifndef LIBAVCODEC_SBRDSP_H
+#define LIBAVCODEC_SBRDSP_H
+
+typedef struct SBRDSPContext {
+ void (*sum64x5)(float *z);
+ float (*sum_square)(float (*x)[2], int n);
+ void (*neg_odd_64)(float *x);
+ void (*qmf_pre_shuffle)(float *z);
+ void (*qmf_post_shuffle)(float W[32][2], const float *z);
+ void (*qmf_deint_neg)(float *v, const float *src);
+ void (*qmf_deint_bfly)(float *v, const float *src0, const float *src1);
+ void (*autocorrelate)(const float x[40][2], float phi[3][2][2]);
+ void (*hf_gen)(float (*X_high)[2], const float (*X_low)[2],
+ const float alpha0[2], const float alpha1[2],
+ float bw, int start, int end);
+ void (*hf_g_filt)(float (*Y)[2], const float (*X_high)[40][2],
+ const float *g_filt, int m_max, int ixh);
+ void (*hf_apply_noise[4])(float (*Y)[2], const float *s_m,
+ const float *q_filt, int noise,
+ int kx, int m_max);
+} SBRDSPContext;
+
+extern const float ff_sbr_noise_table[][2];
+
+void ff_sbrdsp_init(SBRDSPContext *s);
+
+#endif