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

[soc]: r5511 - in aac-sbr: aacsbr.c aacsbr.h
by alexc 08 Dec '09

08 Dec '09

Author: alexc Date: Tue Dec 8 07:14:47 2009 New Revision: 5511 Log: Fix f_indexnoise. By "index_Noise is the last f_IndexNoise of the previous SBR frame" the spec means for l = L_E - 1, i = RATE*t_E[L_E] - 1, and m = M -1. All the other terms compensate for the initial value of i and count inner loop iterations. f_index noise can also clearly take on values from 0 to 511 and thus can't be a uint8_t. Modified: aac-sbr/aacsbr.c aac-sbr/aacsbr.h Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Tue Dec 8 07:14:45 2009 (r5510) +++ aac-sbr/aacsbr.c Tue Dec 8 07:14:47 2009 (r5511) @@ -501,6 +501,9 @@ static int sbr_make_f_derived(AACContext sbr->n_lim = 1; } + sbr->f_indexnoise[0] = 0; + sbr->f_indexnoise[1] = 0; + return 0; } @@ -1584,14 +1587,12 @@ static void sbr_hf_assemble(float y[2][6 } } - // FIXME - reset f_indexnoise[][][1] as appropriate 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++) { for (m = 0; m < sbr->m; m++) { - sbr->f_indexnoise[i][m][0] = (sbr->f_indexnoise[i][m][1] + - (i - (sbr->t_env[ch][0] << 1)) * sbr->m + m + 1) & 0x1ff; - w_temp[i][m][0] += q_filt[i][m] * sbr_noise_table[sbr->f_indexnoise[i][m][0]][0]; - w_temp[i][m][1] += q_filt[i][m] * sbr_noise_table[sbr->f_indexnoise[i][m][0]][1]; + sbr->f_indexnoise[ch] = (sbr->f_indexnoise[ch] + 1) & 0x1ff; + w_temp[i][m][0] += q_filt[i][m] * sbr_noise_table[sbr->f_indexnoise[ch]][0]; + w_temp[i][m][1] += q_filt[i][m] * sbr_noise_table[sbr->f_indexnoise[ch]][1]; } } } Modified: aac-sbr/aacsbr.h ============================================================================== --- aac-sbr/aacsbr.h Tue Dec 8 07:14:45 2009 (r5510) +++ aac-sbr/aacsbr.h Tue Dec 8 07:14:47 2009 (r5511) @@ -168,7 +168,7 @@ typedef struct { float q_m_lim[7][48]; float q_m_limboost[7][48]; float s_m_boost[7][48]; - uint8_t f_indexnoise[42][48][2]; + uint16_t f_indexnoise[2]; uint8_t f_indexsine[42][2]; } SpectralBandReplication;

1 0

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

08 Dec '09

Author: alexc Date: Tue Dec 8 07:14:45 2009 New Revision: 5510 Log: When s_m_boost is not zero q_filt is zero. Modified: aac-sbr/aacsbr.c Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Tue Dec 8 07:14:43 2009 (r5509) +++ aac-sbr/aacsbr.c Tue Dec 8 07:14:45 2009 (r5510) @@ -1567,7 +1567,9 @@ static void sbr_hf_assemble(float y[2][6 if (l != l_a[0] && l != l_a[1]) { for (i = sbr->t_env[ch][l] << 1; i < sbr->t_env[ch][l + 1] << 1; i++) { for (m = 0; m < sbr->m; m++) { - if (sbr->s_m_boost[l][m] && h_SL) { + if (sbr->s_m_boost[l][m]) + q_filt[i][m] = 0.0f; + else if (h_SL) { const int idx1 = i + h_SL; q_filt[i][m] = 0.0f; for (j = 0; j <= h_SL; j++)

1 0

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

08 Dec '09

Author: alexc Date: Tue Dec 8 07:14:43 2009 New Revision: 5509 Log: 10l: Consider smoothing the filter gain when h_SL != 0. Not when it is. Modified: aac-sbr/aacsbr.c Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Mon Dec 7 18:16:45 2009 (r5508) +++ aac-sbr/aacsbr.c Tue Dec 8 07:14:43 2009 (r5509) @@ -1539,7 +1539,7 @@ static void sbr_hf_assemble(float y[2][6 } for (l = 0; l < ch_data->bs_num_env[1]; l++) { - if (!h_SL && l != l_a[0] && l != l_a[1]) { + if (h_SL && l != l_a[0] && l != l_a[1]) { for (i = sbr->t_env[ch][l] << 1; i < sbr->t_env[ch][l + 1] << 1; i++) { for (m = 0; m < sbr->m; m++) { const int idx1 = i + h_SL;

1 0

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

07 Dec '09

Author: alexc Date: Mon Dec 7 18:16:45 2009 New Revision: 5508 Log: Set bw_array to zero if temp_bw < 1./64. Modified: aac-sbr/aacsbr.c Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Mon Dec 7 18:16:43 2009 (r5507) +++ aac-sbr/aacsbr.c Mon Dec 7 18:16:45 2009 (r5508) @@ -1160,6 +1160,7 @@ static void sbr_chirp(SpectralBandReplic { int i; float new_bw; + float temp_bw; for (i = 0; i < sbr->n_q; i++) { switch (ch_data->bs_invf_mode[0][i]) { @@ -1186,9 +1187,10 @@ static void sbr_chirp(SpectralBandReplic } if (new_bw < sbr->bw_array[1][i]) { - sbr->bw_array[0][i] = 0.75f * new_bw + 0.25f * sbr->bw_array[1][i]; + temp_bw = 0.75f * new_bw + 0.25f * sbr->bw_array[1][i]; } else - sbr->bw_array[0][i] = 0.90625f * new_bw + 0.09375f * sbr->bw_array[1][i]; + temp_bw = 0.90625f * new_bw + 0.09375f * sbr->bw_array[1][i]; + sbr->bw_array[0][i] = temp_bw < 0.015625f ? 0.0f : temp_bw; } // update previous bw_array values

1 0

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

07 Dec '09

Author: alexc Date: Mon Dec 7 18:16:43 2009 New Revision: 5507 Log: Reverse the indexing on x_high in sbr_hf_assemble(). This matches the way x_high is indexed everywhere else and matches the change in r5503. Modified: aac-sbr/aacsbr.c Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Mon Dec 7 18:16:41 2009 (r5506) +++ aac-sbr/aacsbr.c Mon Dec 7 18:16:43 2009 (r5507) @@ -1553,9 +1553,9 @@ static void sbr_hf_assemble(float y[2][6 } for (i = sbr->t_env[ch][0] << 1; i < sbr->t_env[ch][ch_data->bs_num_env[1]] << 1; i++) { - const int idx1 = i + ENVELOPE_ADJUSTMENT_OFFSET; + const int idx2 = i + ENVELOPE_ADJUSTMENT_OFFSET; for (m = 0; m < sbr->m; m++) { - const int idx2 = m + sbr->k[3]; + const int idx1 = m + sbr->k[3]; w_temp[i][m][0] = x_high[idx1][idx2][0] * g_filt[i][m]; w_temp[i][m][1] = x_high[idx1][idx2][1] * g_filt[i][m]; }

1 0

[soc]: r5506 - in aac-sbr: aacsbr.c aacsbr.h
by alexc 07 Dec '09

07 Dec '09

Author: alexc Date: Mon Dec 7 18:16:41 2009 New Revision: 5506 Log: Resize x_high to 64x40x2. Modified: aac-sbr/aacsbr.c aac-sbr/aacsbr.h Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Mon Dec 7 18:16:38 2009 (r5505) +++ aac-sbr/aacsbr.c Mon Dec 7 18:16:41 2009 (r5506) @@ -1229,7 +1229,7 @@ static int sbr_lf_gen(AACContext *ac, Sp // 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], + float x_high[64][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) { @@ -1364,7 +1364,7 @@ static void sbr_mapping(AACContext *ac, } // Estimation of current envelope (14496-3 sp04 p218) -static void sbr_env_estimate(float (*e_curr)[48], float x_high[32][40][2], +static void sbr_env_estimate(float (*e_curr)[48], float x_high[64][40][2], SpectralBandReplication *sbr, SBRData *ch_data, int ch) { @@ -1509,7 +1509,7 @@ static void sbr_gain_calc(AACContext * a } // Assembling HF Signals (14496-3 sp04 p220) -static void sbr_hf_assemble(float y[2][64][40][2], float x_high[32][40][2], +static void sbr_hf_assemble(float y[2][64][40][2], float x_high[64][40][2], SpectralBandReplication *sbr, SBRData *ch_data, int ch, int l_a[2]) { Modified: aac-sbr/aacsbr.h ============================================================================== --- aac-sbr/aacsbr.h Mon Dec 7 18:16:38 2009 (r5505) +++ aac-sbr/aacsbr.h Mon Dec 7 18:16:41 2009 (r5506) @@ -147,7 +147,7 @@ typedef struct { float noise_facs[2][2][5]; float W[2][32][32][2]; float x_low[32][40][2]; - float x_high[32][40][2]; + float x_high[64][40][2]; float y[2][64][40][2]; float X[64][40][2]; float alpha0[64][2];

1 0

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

07 Dec '09

Author: alexc Date: Mon Dec 7 18:16:38 2009 New Revision: 5505 Log: 10l: Unswap x_high and x_low in the sbr_hf_gen() call. Modified: aac-sbr/aacsbr.c Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Mon Dec 7 18:16:36 2009 (r5504) +++ aac-sbr/aacsbr.c Mon Dec 7 18:16:38 2009 (r5505) @@ -1621,7 +1621,7 @@ void ff_sbr_apply(AACContext *ac, Spectr 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_hf_gen(ac, sbr, sbr->x_high, sbr->x_low, sbr->alpha0, sbr->alpha1, sbr->bw_array, sbr->t_env[ch], sbr->data[ch].bs_num_env[1]); // hf_adj

1 0

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

07 Dec '09

Author: alexc Date: Mon Dec 7 18:16:36 2009 New Revision: 5504 Log: 10l: Fix memset undersizing. Several matrices were memset using sizeof(M) which is sizeof(void*). Modified: aac-sbr/aacsbr.c Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Mon Dec 7 02:27:31 2009 (r5503) +++ aac-sbr/aacsbr.c Mon Dec 7 18:16:36 2009 (r5504) @@ -1211,7 +1211,7 @@ static int sbr_lf_gen(AACContext *ac, Sp int k, l; const int t_HFGen = 8; const int l_f = 32; - memset(x_low, 0, sizeof(x_low)); + memset(x_low, 0, 32*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]; @@ -1276,7 +1276,7 @@ static int sbr_x_gen(SpectralBandReplica const int t_HFAdj = ENVELOPE_ADJUSTMENT_OFFSET; const int l_f = 32; const int l_Temp = FFMAX(2*sbr->t_env_num_env_old[ch] - l_f, 0); //FIXME hack to make l_Temp initialize to zero - memset(x, 0, sizeof(x)); + memset(x, 0, 64*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];

1 0

[soc] [propchange]: r5502 - svn:log
by alexc 07 Dec '09

07 Dec '09

Author: alexc Revision: 5502 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1,3 @@ -Remove an unnecessary autocorrelation matrix position. phi[i+1][j] = phi*[j+1][i] therefore phi[i][j] where i > j+1 is unused. \ No newline at end of file +Remove an unnecessary autocorrelation matrix position. + +phi[i+1][j] = phi*[j+1][i] therefore phi[i][j] where i > j+1 is unused.

1 0

[soc] [propchange]: r5501 - svn:log
by alexc 07 Dec '09

07 Dec '09

Author: alexc Revision: 5501 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1,5 @@ -Clean up the algebra in sbr_hf_inverse_filter using the principle that the main diagonal of \phi as seen in the spec (i = j+1 in out matrix phi) is all real. As a side effect many floating point overflows are avoided. \ No newline at end of file +Clean up the algebra in sbr_hf_inverse_filter(). + +This uses the principle that the main diagonal of \phi as seen in the +spec (i = j+1 in our matrix phi) is purely real. As a side effect many +floating point overflows are avoided.

1 0