December 2009 - FFmpeg-soc - lists.ffmpeg.org

[soc]: r5487 - aac-sbr/aacsbr.c
by alexc 02 Dec '09

02 Dec '09

Author: alexc Date: Wed Dec 2 23:25:13 2009 New Revision: 5487 Log: Add myself to the aacsbr.c copyrights. Modified: aac-sbr/aacsbr.c Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Wed Dec 2 23:25:11 2009 (r5486) +++ aac-sbr/aacsbr.c Wed Dec 2 23:25:13 2009 (r5487) @@ -1,6 +1,7 @@ /* * AAC Spectral Band Replication decoding functions * Copyright (c) 2008-2009 Robert Swain ( rob opendot cl ) + * Copyright (c) 2009 Alex Converse <alex.converse(a)gmail.com> * * This file is part of FFmpeg. *

1 0

[soc]: r5486 - aac-sbr/ffmpeg.diff
by alexc 02 Dec '09

02 Dec '09

Author: alexc Date: Wed Dec 2 23:25:11 2009 New Revision: 5486 Log: Rediff ffmpeg.diff against r20710 in preparation for feature changes. Modified: aac-sbr/ffmpeg.diff Modified: aac-sbr/ffmpeg.diff ============================================================================== --- aac-sbr/ffmpeg.diff Wed Dec 2 23:04:09 2009 (r5485) +++ aac-sbr/ffmpeg.diff Wed Dec 2 23:25:11 2009 (r5486) @@ -1,6 +1,6 @@ Index: libavcodec/aac.c =================================================================== ---- libavcodec/aac.c (revision 20564) +--- libavcodec/aac.c (revision 20710) +++ libavcodec/aac.c (working copy) @@ -62,7 +62,7 @@ * N MIDI @@ -81,7 +81,7 @@ Index: libavcodec/aac.c break; case EXT_DYNAMIC_RANGE: res = decode_dynamic_range(&ac->che_drc, gb, cnt); -@@ -1709,8 +1699,8 @@ +@@ -1711,8 +1701,8 @@ AACContext *ac = avccontext->priv_data; ChannelElement *che = NULL; GetBitContext gb; @@ -92,7 +92,7 @@ Index: libavcodec/aac.c init_get_bits(&gb, buf, buf_size * 8); -@@ -1774,7 +1764,7 @@ +@@ -1776,7 +1766,7 @@ if (elem_id == 15) elem_id += get_bits(&gb, 8) - 1; while (elem_id > 0) @@ -101,7 +101,7 @@ Index: libavcodec/aac.c err = 0; /* FIXME */ break; -@@ -1783,6 +1773,9 @@ +@@ -1785,6 +1775,9 @@ break; } @@ -113,7 +113,7 @@ Index: libavcodec/aac.c } Index: libavcodec/aac.h =================================================================== ---- libavcodec/aac.h (revision 20564) +--- libavcodec/aac.h (revision 20710) +++ libavcodec/aac.h (working copy) @@ -33,6 +33,7 @@ #include "avcodec.h" @@ -123,7 +123,7 @@ Index: libavcodec/aac.h #include <stdint.h> -@@ -231,6 +232,7 @@ +@@ -232,6 +233,7 @@ SingleChannelElement ch[2]; // CCE specific ChannelCoupling coup; @@ -133,7 +133,7 @@ Index: libavcodec/aac.h /** Index: libavcodec/Makefile =================================================================== ---- libavcodec/Makefile (revision 20564) +--- libavcodec/Makefile (revision 20710) +++ libavcodec/Makefile (working copy) @@ -38,7 +38,7 @@ OBJS-$(CONFIG_VDPAU) += vdpau.o

1 0

[soc]: r5485 - aac-sbr/checkout.sh
by alexc 02 Dec '09

02 Dec '09

Author: alexc Date: Wed Dec 2 23:04:09 2009 New Revision: 5485 Log: Sync changes from trunk Modified: aac-sbr/checkout.sh Modified: aac-sbr/checkout.sh ============================================================================== --- aac-sbr/checkout.sh Wed Dec 2 22:49:24 2009 (r5484) +++ aac-sbr/checkout.sh Wed Dec 2 23:04:09 2009 (r5485) @@ -1,8 +1,8 @@ #!/bin/sh echo "Checking out FFmpeg..." -svn co svn://svn.ffmpeg.org/ffmpeg/trunk ffmpeg -r 20564 --ignore-externals -(cd ffmpeg && svn co svn://svn.ffmpeg.org/mplayer/trunk/libswscale libswscale -r 29932) +svn co svn://svn.ffmpeg.org/ffmpeg/trunk ffmpeg -r 20710 --ignore-externals +(cd ffmpeg && svn co svn://svn.ffmpeg.org/mplayer/trunk/libswscale libswscale -r 29968) echo "Copying SBR files into FFmpeg tree..." cp aacsbr*.[ch] ffmpeg/libavcodec echo "Applying SBR and build system patch"

1 0

[soc]: r5484 - in aac-sbr: aacsbr.c aacsbr_internal.h
by alexc 02 Dec '09

02 Dec '09

Author: alexc Date: Wed Dec 2 22:49:24 2009 New Revision: 5484 Log: Add an initializer for the SBR context. Modified: aac-sbr/aacsbr.c aac-sbr/aacsbr_internal.h Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Wed Dec 2 22:49:22 2009 (r5483) +++ aac-sbr/aacsbr.c Wed Dec 2 22:49:24 2009 (r5484) @@ -74,6 +74,11 @@ av_cold void ff_aac_sbr_init(void) SBR_INIT_VLC_STATIC(9, 512); } +av_cold void ff_aac_sbr_ctx_init(SpectralBandReplication *sbr) +{ + sbr->k[4] = sbr->k[3] = 32; //Typo in spec, kx' inits to 32 +} + static unsigned int sbr_header(SpectralBandReplication *sbr, GetBitContext *gb) { unsigned int cnt = get_bits_count(gb); Modified: aac-sbr/aacsbr_internal.h ============================================================================== --- aac-sbr/aacsbr_internal.h Wed Dec 2 22:49:22 2009 (r5483) +++ aac-sbr/aacsbr_internal.h Wed Dec 2 22:49:24 2009 (r5484) @@ -33,6 +33,7 @@ #include "aacsbr.h" av_cold void ff_aac_sbr_init(void); +av_cold void ff_aac_sbr_ctx_init(SpectralBandReplication *sbr); int ff_decode_sbr_extension(AACContext *ac, SpectralBandReplication *sbr, GetBitContext *gb, int crc, int cnt, int id_aac); void ff_sbr_apply(AACContext *ac, SpectralBandReplication *sbr, int id_aac, int ch, float* in, float* out);

1 0

[soc]: r5483 - in aac-sbr: aacsbr.c aacsbr_internal.h
by alexc 02 Dec '09

02 Dec '09

Author: alexc Date: Wed Dec 2 22:49:22 2009 New Revision: 5483 Log: Implement ff_sbr_apply() and missing dependent functions. Modified: aac-sbr/aacsbr.c aac-sbr/aacsbr_internal.h Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Wed Dec 2 22:49:20 2009 (r5482) +++ aac-sbr/aacsbr.c Wed Dec 2 22:49:22 2009 (r5483) @@ -1199,6 +1199,28 @@ static inline int find_freq_subband(uint return -1; } +// Generate the subband filtered lowband +static int sbr_lf_gen(AACContext *ac, SpectralBandReplication *sbr, + float x_low[32][40][2], float W[2][32][32][2]) { + int k, l; + const int t_HFGen = 8; + const int l_f = 32; + memset(x_low, 0, sizeof(x_low)); + for (k = 0; k < sbr->k[3]; k++) { + for (l = t_HFGen; l < l_f + t_HFGen; l++) { + x_low[k][l][0] = W[0][k][l - t_HFGen][0]; + x_low[k][l][1] = W[0][k][l - t_HFGen][1]; + } + } + for (k = 0; k < sbr->k[4]; k++) { + for (l = 0; l < t_HFGen; l++) { + x_low[k][l][0] = W[1][k][l + l_f - t_HFGen][0]; + x_low[k][l][1] = W[1][k][l + l_f - t_HFGen][1]; + } + } + return 0; +} + // High Frequency Generator (14496-3 sp04 p215) static int sbr_hf_gen(AACContext *ac, SpectralBandReplication *sbr, float x_high[32][40][2], float x_low[32][40][2], float (*alpha0)[2], @@ -1241,6 +1263,42 @@ static int sbr_hf_gen(AACContext *ac, Sp return 0; } +// Generate the subband filtered lowband +static int sbr_x_gen(SpectralBandReplication *sbr, + float x[64][40][2], float x_low[32][40][2], float Y[2][64][40][2], int ch) { + int k, l; + const int t_HFAdj = ENVELOPE_ADJUSTMENT_OFFSET; + const int l_f = 32; + const int l_Temp = FFMAX(sbr->t_env_num_env_old[ch] - l_f, 0); //FIXME hack to make l_Temp initialize to zero + memset(x, 0, sizeof(x)); + for (k = 0; k < sbr->k[4]; k++) { + for (l = 0; l < l_Temp; l++) { + x[k][l][0] = x_low[k][l + t_HFAdj][0]; + x[k][l][1] = x_low[k][l + t_HFAdj][1]; + } + } + for (; k < sbr->k[4] + sbr->mold; k++) { + for (l = 0; l < l_Temp; l++) { + x[k][l][0] = Y[1][k][l + t_HFAdj + l_f][0]; + x[k][l][1] = Y[1][k][l + t_HFAdj + l_f][1]; + } + } + + for (k = 0; k < sbr->k[3]; k++) { + for (l = l_Temp; l < l_f; l++) { + x[k][l][0] = x_low[k][l + t_HFAdj][0]; + x[k][l][1] = x_low[k][l + t_HFAdj][1]; + } + } + for (; k < sbr->k[4] + sbr->m; k++) { + for (l = l_Temp; l < l_f; l++) { + x[k][l][0] = Y[0][k][l + t_HFAdj][0]; + x[k][l][1] = Y[0][k][l + t_HFAdj][1]; + } + } + return 0; +} + // High Frequency Adjustment (14496-3 sp04 p217) // Mapping (14496-3 sp04 p217) @@ -1541,21 +1599,34 @@ static void sbr_hf_assemble(float y[2][6 } } -static void apply_sbr(void) +void ff_sbr_apply(AACContext *ac, SpectralBandReplication *sbr, int id_aac, int ch, float* in, float* out) { -#if 0 + int l_a[2]; + + if (sbr->start) { + sbr_time_freq_grid(ac, sbr, &sbr->data[ch], ch); + sbr_env_noise_floors(sbr, &sbr->data[ch], ch); + sbr_dequant(sbr, id_aac, ch); + } + /* decode channel */ - sbr_qmf_analysis(); - sbr_hf_gen(); + sbr_qmf_analysis(in, sbr->data[ch].analysis_filterbank_samples, sbr->W); + sbr_lf_gen(ac, sbr, sbr->x_low, sbr->W); + if (sbr->start) { + sbr_hf_inverse_filter(sbr->alpha0, sbr->alpha1, sbr->x_low, sbr->k[0]); + sbr_chirp(sbr, &sbr->data[ch]); + sbr_hf_gen(ac, sbr, sbr->x_low, sbr->x_high, sbr->alpha0, sbr->alpha1, + sbr->bw_array, sbr->t_env[ch], sbr->data[ch].bs_num_env[1]); // hf_adj - sbr_mapping(); - sbr_env_estimate(); - sbr_hf_additional_levels(); - sbr_gain_calc(); - sbr_hf_assemble(); + sbr_mapping(ac, sbr, &sbr->data[ch], ch, l_a); + sbr_env_estimate(sbr->e_curr, sbr->x_high, sbr, &sbr->data[ch], ch); + sbr_hf_additional_levels(sbr, &sbr->data[ch]); + sbr_gain_calc(ac, sbr, &sbr->data[ch], l_a); + sbr_hf_assemble(sbr->y, sbr->x_high, sbr, &sbr->data[ch], ch, l_a); + } /* synthesis */ - sbr_qmf_synthesis(); -#endif + sbr_x_gen(sbr, sbr->X, sbr->x_low, sbr->y, ch); + sbr_qmf_synthesis(out, sbr->X, sbr->data[ch].synthesis_filterbank_samples, 1); } Modified: aac-sbr/aacsbr_internal.h ============================================================================== --- aac-sbr/aacsbr_internal.h Wed Dec 2 22:49:20 2009 (r5482) +++ aac-sbr/aacsbr_internal.h Wed Dec 2 22:49:22 2009 (r5483) @@ -35,5 +35,6 @@ av_cold void ff_aac_sbr_init(void); int ff_decode_sbr_extension(AACContext *ac, SpectralBandReplication *sbr, GetBitContext *gb, int crc, int cnt, int id_aac); +void ff_sbr_apply(AACContext *ac, SpectralBandReplication *sbr, int id_aac, int ch, float* in, float* out); #endif /* AVCODEC_AACSBR_INTERNAL_H */

1 0

[soc]: r5482 - aac-sbr/aacsbr.c
by alexc 02 Dec '09

02 Dec '09

Author: alexc Date: Wed Dec 2 22:49:20 2009 New Revision: 5482 Log: Add missing sine terms to sbr_qmf_synthesis. Modified: aac-sbr/aacsbr.c Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Wed Dec 2 22:49:18 2009 (r5481) +++ aac-sbr/aacsbr.c Wed Dec 2 22:49:20 2009 (r5482) @@ -1046,9 +1046,11 @@ static void sbr_qmf_synthesis(float *out for (l = 0; l < 32; l++) { memmove(&v[128 / div], v, (1280 - 128) / div * sizeof(float)); for (n = 0; n < 128 / div; n++) { - v[n] = X[0][l][0] * cosf((2.0f * n - 255.0f / div) * M_PI / (256.0f / div)); + v[n] = X[0][l][0] * cosf((2.0f * n - 255.0f / div) * M_PI / (256.0f / div)) - + X[0][l][1] * sinf((2.0f * n - 255.0f / div) * M_PI / (256.0f / div)); for (k = 1; k < 64 / div; k++) { - v[n] += X[k][l][0] * cosf((k + 0.5f) * (2.0f * n - 255.0f / div) * M_PI / (128.0f / div)); + v[n] += X[k][l][0] * cosf((k + 0.5f) * (2.0f * n - 255.0f / div) * M_PI / (128.0f / div)) - + X[k][l][1] * sinf((k + 0.5f) * (2.0f * n - 255.0f / div) * M_PI / (128.0f / div)); } v[n] /= 64.0f / div; }

1 0

[soc]: r5481 - aac-sbr/aacsbr.c
by alexc 02 Dec '09

02 Dec '09

Author: alexc Date: Wed Dec 2 22:49:18 2009 New Revision: 5481 Log: Save old values of select (needed) SBR state variables. Modified: aac-sbr/aacsbr.c Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Wed Dec 2 22:49:15 2009 (r5480) +++ aac-sbr/aacsbr.c Wed Dec 2 22:49:18 2009 (r5481) @@ -422,7 +422,9 @@ static int sbr_make_f_derived(AACContext memcpy(sbr->f_tablehigh, &sbr->f_master[sbr->spectrum_params[1].bs_xover_band], (sbr->n[1] + 1) * sizeof(sbr->f_master[0])); + sbr->mold = sbr->m; sbr->m = sbr->f_tablehigh[sbr->n[1]] - sbr->f_tablehigh[0]; + sbr->k[4] = sbr->k[3]; sbr->k[3] = sbr->f_tablehigh[0]; // Requirements (14496-3 sp04 p205) @@ -860,6 +862,7 @@ static int sbr_time_freq_grid(AACContext n_rel_trail = ch_data->bs_frame_class & 1 ? ch_data->bs_num_rel[1] : 0; + sbr->t_env_num_env_old[ch] = sbr->t_env[ch][ch_data->bs_num_env[0]]; //FIXME move me into a setup next frame area sbr->t_env[ch][0] = abs_bord_lead; sbr->t_env[ch][ch_data->bs_num_env[1]] = abs_bord_trail; @@ -1007,6 +1010,7 @@ static void sbr_dequant(SpectralBandRepl static void sbr_qmf_analysis(const float *in, float *x, float W[2][32][32][2]) { int i, k, l, n; + memcpy(W[1], W[0], sizeof(W[0])); memcpy(x , x+1024, (320-32)*sizeof(x[0])); memcpy(x+288, in , 1024*sizeof(x[0])); x += 319; @@ -1457,6 +1461,7 @@ static void sbr_hf_assemble(float y[2][6 { 0, 1, 0, -1}, // imaginary }; float g_temp[42][48], g_filt[42][48], q_temp[42][48], q_filt[42][48], w_temp[42][48][2]; + memcpy(y[1], y[0], sizeof(y[0])); for (l = 0; l < ch_data->bs_num_env[1]; l++) { for (i = sbr->t_env[ch][l] << 1; i < sbr->t_env[ch][l + 1] << 1; i++) {

1 0

[soc]: r5480 - aac-sbr/aacsbr.h
by alexc 02 Dec '09

02 Dec '09

Author: alexc Date: Wed Dec 2 22:49:15 2009 New Revision: 5480 Log: Add missing context variables. Modified: aac-sbr/aacsbr.h Modified: aac-sbr/aacsbr.h ============================================================================== --- aac-sbr/aacsbr.h Wed Dec 2 22:49:13 2009 (r5479) +++ aac-sbr/aacsbr.h Wed Dec 2 22:49:15 2009 (r5480) @@ -124,8 +124,9 @@ typedef struct { SBRData data[2]; // SBR tool variables uint8_t reset; - uint8_t k[4]; // k0, k1, k2 and kx respectively + uint8_t k[5]; // k0, k1, k2, kx, and kx' respectively uint8_t m; + uint8_t mold; uint8_t n_master; uint8_t n[2]; // n_low and n_high respectively uint8_t n_q; @@ -139,10 +140,17 @@ typedef struct { uint8_t patch_num_subbands[5]; uint8_t patch_start_subband[5]; uint8_t t_env[2][8]; + uint8_t t_env_num_env_old[2]; uint8_t t_q[2][3]; float env_facs[2][7][48]; float noise_facs[2][2][5]; - float W[32][32][2]; + float W[2][32][32][2]; + float x_low[32][40][2]; + float x_high[32][40][2]; + float y[2][64][40][2]; + float X[64][40][2]; + float alpha0[64][2]; + float alpha1[64][2]; float bw_array[2][5]; float e_origmapped[7][48]; float q_mapped[7][48];

1 0

[soc]: r5479 - aac-sbr/aacsbr.c
by alexc 02 Dec '09

02 Dec '09

Author: alexc Date: Wed Dec 2 22:49:13 2009 New Revision: 5479 Log: Properly size arrays in function declarations and use inside those functions. Modified: aac-sbr/aacsbr.c Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Tue Dec 1 21:42:24 2009 (r5478) +++ aac-sbr/aacsbr.c Wed Dec 2 22:49:13 2009 (r5479) @@ -1004,7 +1004,7 @@ static void sbr_dequant(SpectralBandRepl * @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(const float *in, float *x, float W[32][32][2]) +static void sbr_qmf_analysis(const float *in, float *x, float W[2][32][32][2]) { int i, k, l, n; memcpy(x , x+1024, (320-32)*sizeof(x[0])); @@ -1019,13 +1019,13 @@ static void sbr_qmf_analysis(const float for (k = 0; k < 32; k++) { float temp1 = u[0] * 2.0f; float temp2 = -(k + 0.5f) * M_PI / 128.0f; - W[k][l][0] = temp1 * cosf(temp2); - W[k][l][1] = temp1 * sinf(temp2); + W[0][k][l][0] = temp1 * cosf(temp2); + W[0][k][l][1] = temp1 * sinf(temp2); for (n = 1; n < 64; n++) { temp1 = u[n] * 2.0f; temp2 = (n - 0.25f) * (k + 0.5f) * M_PI / 32.0f; - W[k][l][0] += temp1 * cosf(temp2); - W[k][l][1] += temp1 * sinf(temp2); + W[0][k][l][0] += temp1 * cosf(temp2); + W[0][k][l][1] += temp1 * sinf(temp2); } } x += 32; @@ -1034,7 +1034,7 @@ static void sbr_qmf_analysis(const float // Synthesis QMF Bank (14496-3 sp04 p206) // Downsampled Synthesis QMF Bank (14496-3 sp04 p206) -static void sbr_qmf_synthesis(float *out, const float **X, +static void sbr_qmf_synthesis(float *out, float X[64][40][2], float *v, const unsigned int div) { int k, l, n; @@ -1042,9 +1042,9 @@ static void sbr_qmf_synthesis(float *out for (l = 0; l < 32; l++) { memmove(&v[128 / div], v, (1280 - 128) / div * sizeof(float)); for (n = 0; n < 128 / div; n++) { - v[n] = X[0][l] * cosf((2.0f * n - 255.0f / div) * M_PI / (256.0f / div)); + v[n] = X[0][l][0] * cosf((2.0f * n - 255.0f / div) * M_PI / (256.0f / div)); for (k = 1; k < 64 / div; k++) { - v[n] += X[k][l] * cosf((k + 0.5f) * (2.0f * n - 255.0f / div) * M_PI / (128.0f / div)); + v[n] += X[k][l][0] * cosf((k + 0.5f) * (2.0f * n - 255.0f / div) * M_PI / (128.0f / div)); } v[n] /= 64.0f / div; } @@ -1066,8 +1066,8 @@ static void sbr_qmf_synthesis(float *out // High Frequency Generation (14496-3 sp04 p214+) // Inverse Filtering (14496-3 sp04 p214) -static void sbr_hf_inverse_filter(float **alpha0, float **alpha1, - const float ***x_low, int k0) +static void sbr_hf_inverse_filter(float (*alpha0)[2], float (*alpha1)[2], + float x_low[32][40][2], int k0) { int i, j, k, n; for (k = 0; k < k0; k++) { @@ -1195,8 +1195,8 @@ static inline int find_freq_subband(uint // High Frequency Generator (14496-3 sp04 p215) static int sbr_hf_gen(AACContext *ac, SpectralBandReplication *sbr, - float **x_high[2], float **x_low[2], float *alpha0[2], - float *alpha1[2], float **bw_array, uint8_t *t_env, + float x_high[32][40][2], float x_low[32][40][2], float (*alpha0)[2], + float (*alpha1)[2], float bw_array[2][5], uint8_t *t_env, int bs_num_env) { int i, x, l; @@ -1294,7 +1294,7 @@ static void sbr_mapping(AACContext *ac, } // Estimation of current envelope (14496-3 sp04 p218) -static void sbr_env_estimate(float **e_curr, float ***x_high, +static void sbr_env_estimate(float (*e_curr)[48], float x_high[32][40][2], SpectralBandReplication *sbr, SBRData *ch_data, int ch) { @@ -1439,7 +1439,7 @@ static void sbr_gain_calc(AACContext * a } // Assembling HF Signals (14496-3 sp04 p220) -static void sbr_hf_assemble(float **y[2], float **x_high[2], +static void sbr_hf_assemble(float y[2][64][40][2], float x_high[32][40][2], SpectralBandReplication *sbr, SBRData *ch_data, int ch, int l_a[2]) { @@ -1525,9 +1525,9 @@ static void sbr_hf_assemble(float **y[2] for (i = sbr->t_env[ch][l] << 1; i < sbr->t_env[ch][l + 1] << 1; i++) { sbr->f_indexsine[i][0] = (((sbr->f_indexsine[i][1] + 1) & 3) + i - (sbr->t_env[ch][0] << 1)) & 3; for (m = 0; m < sbr->m; m++) { - y[i + ENVELOPE_ADJUSTMENT_OFFSET][m + sbr->k[3]][0] = + y[0][i + ENVELOPE_ADJUSTMENT_OFFSET][m + sbr->k[3]][0] = w_temp[i][m][0] + sbr->s_m_boost[i][m] * phi[0][sbr->f_indexsine[i][0]]; - y[i + ENVELOPE_ADJUSTMENT_OFFSET][m + sbr->k[3]][1] = + y[0][i + ENVELOPE_ADJUSTMENT_OFFSET][m + sbr->k[3]][1] = w_temp[i][m][1] + sbr->s_m_boost[i][m] * phi[1][sbr->f_indexsine[i][0]] * (1 - 2*((m + sbr->k[3]) & 1)); } }

1 0

[soc]: r5478 - aac-sbr/aacsbr.c
by alexc 01 Dec '09

01 Dec '09

Author: alexc Date: Tue Dec 1 21:42:24 2009 New Revision: 5478 Log: Fix SBR output scaling Modified: aac-sbr/aacsbr.c Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Tue Dec 1 21:42:22 2009 (r5477) +++ aac-sbr/aacsbr.c Tue Dec 1 21:42:24 2009 (r5478) @@ -1046,7 +1046,7 @@ static void sbr_qmf_synthesis(float *out for (k = 1; k < 64 / div; k++) { v[n] += X[k][l] * cosf((k + 0.5f) * (2.0f * n - 255.0f / div) * M_PI / (128.0f / div)); } - v[n] /= 64.0f * 64 / div; + v[n] /= 64.0f / div; } for (n = 0; n <= 4; n++) { int temp1 = 128 / div * n, temp2 = temp1 << 1;

1 0