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

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

07 Dec '09

Author: alexc Revision: 5500 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1,4 @@ -Fix an off by one error. The phi matrix lacks column zero of the spec's \phi and in the spec j is indexed from 1 <= j < 3. \ No newline at end of file +Fix an off by one error. + +The phi matrix lacks column zero of the spec's \phi and in the spec j is +indexed from 1 <= j < 3.

1 0

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

07 Dec '09

Author: alexc Revision: 5494 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1,5 @@ -In envelope decoding i(k) is the replacement for k of the previous envelope (it does not replace l). Ref 4.6.18.3.4 "SBR envelope and noise floor decoding". \ No newline at end of file +Fix addressing of env_facs in sbr_env_noise_floors(). + +In envelope decoding i(k) is the replacement for k of the previous +envelope (it does not replace l). Ref 4.6.18.3.4 "SBR envelope and noise +floor decoding".

1 0

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

07 Dec '09

Author: alexc Date: Mon Dec 7 02:27:31 2009 New Revision: 5503 Log: Index the SBR Y matrix consistently. Index Y[old/new][k][l][re/im] like all the other major SBR matrices. This can be revisited for optimization purposes once the decoder works properly. Modified: aac-sbr/aacsbr.c Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Sun Dec 6 23:48:44 2009 (r5502) +++ aac-sbr/aacsbr.c Mon Dec 7 02:27:31 2009 (r5503) @@ -1596,9 +1596,9 @@ static void sbr_hf_assemble(float y[2][6 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[0][i + ENVELOPE_ADJUSTMENT_OFFSET][m + sbr->k[3]][0] = + y[0][m + sbr->k[3]][i + ENVELOPE_ADJUSTMENT_OFFSET][0] = w_temp[i][m][0] + sbr->s_m_boost[l][m] * phi[0][sbr->f_indexsine[i][0]]; - y[0][i + ENVELOPE_ADJUSTMENT_OFFSET][m + sbr->k[3]][1] = + y[0][m + sbr->k[3]][i + ENVELOPE_ADJUSTMENT_OFFSET][1] = w_temp[i][m][1] + sbr->s_m_boost[l][m] * phi[1][sbr->f_indexsine[i][0]] * (1 - 2*((m + sbr->k[3]) & 1)); } }

1 0

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

06 Dec '09

Author: alexc Date: Sun Dec 6 23:48:42 2009 New Revision: 5501 Log: 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. Modified: aac-sbr/aacsbr.c Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Sun Dec 6 23:48:41 2009 (r5500) +++ aac-sbr/aacsbr.c Sun Dec 6 23:48:42 2009 (r5501) @@ -1088,8 +1088,7 @@ static void sbr_hf_inverse_filter(float { int i, j, k, n; for (k = 0; k < k0; k++) { - float mod_var_sq; - float phi[3][2][2], dk[2]; + float phi[3][2][2], dk; for (i = 0; i < 3; i++) { for (j = 0; j < 2; j++) { @@ -1112,31 +1111,26 @@ static void sbr_hf_inverse_filter(float } } - dk[0] = phi[2][1][0] * phi[1][0][0] - phi[2][1][1] * phi[1][0][1] - + 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; - dk[1] = phi[2][1][0] * phi[1][0][1] + phi[2][1][1] * phi[1][0][0]; - mod_var_sq = dk[0] * dk[0] + dk[1] * dk[1]; - if (!mod_var_sq) { + if (!dk) { alpha1[k][0] = 0; alpha1[k][1] = 0; } else { float temp_real, temp_im; temp_real = phi[0][0][0] * phi[1][1][0] - phi[0][0][1] * phi[1][1][1] - - phi[0][1][0] * phi[1][0][0] + - phi[0][1][1] * phi[1][0][1]; + phi[0][1][0] * phi[1][0][0]; temp_im = phi[0][0][0] * phi[1][1][1] + phi[0][0][1] * phi[1][1][0] - - phi[0][1][0] * phi[1][0][1] - phi[0][1][1] * phi[1][0][0]; - alpha1[k][0] = (dk[0] * temp_real + dk[1] * temp_im ) / mod_var_sq; - alpha1[k][1] = (dk[0] * temp_im - dk[1] * temp_real) / mod_var_sq; + alpha1[k][0] = temp_real / dk; + alpha1[k][1] = temp_im / dk; } - mod_var_sq = phi[1][0][0] * phi[1][0][0] + phi[1][0][1] * phi[1][0][1]; - if (!mod_var_sq) { + if (!phi[1][0][0]) { alpha0[k][0] = 0; alpha0[k][1] = 0; } else { @@ -1146,8 +1140,8 @@ static void sbr_hf_inverse_filter(float temp_im = phi[0][0][1] + alpha1[k][1] * phi[1][1][0] - alpha1[k][0] * phi[1][1][1]; - alpha0[k][0] = -(phi[1][0][0] * temp_real + phi[1][0][1] * temp_im ) / mod_var_sq; - alpha0[k][0] = -(phi[1][0][0] * temp_im - phi[1][0][1] * temp_real) / mod_var_sq; + alpha0[k][0] = -temp_real / phi[1][0][0]; + alpha0[k][0] = -temp_im / phi[1][0][0]; } if (alpha1[k][0] * alpha1[k][0] + alpha1[k][1] * alpha1[k][1] >= 16.0f ||

2 1

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

06 Dec '09

Author: alexc Date: Sun Dec 6 23:48:44 2009 New Revision: 5502 Log: Remove an unnecessary autocorrelation matrix position. phi[i+1][j] = phi*[j+1][i] therefore phi[i][j] where i > j+1 is unused. Modified: aac-sbr/aacsbr.c Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Sun Dec 6 23:48:42 2009 (r5501) +++ aac-sbr/aacsbr.c Sun Dec 6 23:48:44 2009 (r5502) @@ -1098,6 +1098,7 @@ static void sbr_hf_inverse_filter(float phi[i][j][0] = 0.0f; phi[i][j][1] = 0.0f; + if (i <= j + 1) for (n = 0; n < 16 * 2 + 6; n++) { unsigned int idx1 = n + idxtmp1; unsigned int idx2 = n + idxtmp2;

1 0

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

06 Dec '09

Author: alexc Date: Sun Dec 6 23:48:41 2009 New Revision: 5500 Log: Fix an off by one error. The phi matrix lacks column zero of the spec's \phi and in the spec j is indexed from 1 <= j < 3. Modified: aac-sbr/aacsbr.c Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Sun Dec 6 23:48:39 2009 (r5499) +++ aac-sbr/aacsbr.c Sun Dec 6 23:48:41 2009 (r5500) @@ -1094,7 +1094,7 @@ static void sbr_hf_inverse_filter(float for (i = 0; i < 3; i++) { for (j = 0; j < 2; j++) { unsigned int idxtmp1 = ENVELOPE_ADJUSTMENT_OFFSET - i; - unsigned int idxtmp2 = ENVELOPE_ADJUSTMENT_OFFSET - j; + unsigned int idxtmp2 = ENVELOPE_ADJUSTMENT_OFFSET - (j + 1); phi[i][j][0] = 0.0f; phi[i][j][1] = 0.0f;

1 0

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

06 Dec '09

Author: alexc Date: Sun Dec 6 23:48:39 2009 New Revision: 5499 Log: 10l: l_Temp = RATE*t_E'(L_E') Modified: aac-sbr/aacsbr.c Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Sat Dec 5 22:21:28 2009 (r5498) +++ aac-sbr/aacsbr.c Sun Dec 6 23:48:39 2009 (r5499) @@ -1280,7 +1280,7 @@ static int sbr_x_gen(SpectralBandReplica 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 + 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)); for (k = 0; k < sbr->k[4]; k++) { for (l = 0; l < l_Temp; l++) {

1 0

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

05 Dec '09

Author: alexc Date: Sat Dec 5 16:42:06 2009 New Revision: 5497 Log: Use the derivation of f_tablelow to remove loops from sbr_env_noise_floors. Modified: aac-sbr/aacsbr.c Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Sat Dec 5 16:42:04 2009 (r5496) +++ aac-sbr/aacsbr.c Sat Dec 5 16:42:06 2009 (r5497) @@ -937,6 +937,7 @@ static void sbr_env_noise_floors(Spectra { int delta = (ch == 1 && sbr->bs_coupling == 1) ? 2 : 1; int i, k, l; + const int temp = sbr->n[1] & 1; for (l = 0; l < ch_data->bs_num_env[1]; l++) { if (ch_data->bs_df_env[l]) { // bs_freq_res[0] == bs_freq_res[bs_num_env[1]] from prev frame @@ -944,22 +945,13 @@ static void sbr_env_noise_floors(Spectra for (k = 0; k < sbr->n[ch_data->bs_freq_res[l + 1]]; k++) sbr->env_facs[ch][l + 1][k] = sbr->env_facs[ch][l][k] + delta * ch_data->bs_data_env[l][k]; } else if (ch_data->bs_freq_res[l + 1]) { - i = 0; // optimisation : f_* are ascending freq bands so start at last i for each search for (k = 0; k < sbr->n[ch_data->bs_freq_res[l + 1]]; k++) { - // find i such that f_tablelow[i] <= f_tablehigh[k] < f_tablelow[i + 1] - for (; i < sbr->n[0]; i++) - if (sbr->f_tablelow[i] <= sbr->f_tablehigh[k] && - sbr->f_tablelow[i + 1] > sbr->f_tablehigh[k]) - break; + i = (k + temp) >> 1; // find i such that f_tablelow[i] <= f_tablehigh[k] < f_tablelow[i + 1] sbr->env_facs[ch][l + 1][k] = sbr->env_facs[ch][l][i] + delta * ch_data->bs_data_env[l][k]; } } else { - i = 0; // optimisation : f_* are ascending freq bands so start at last i for each search for (k = 0; k < sbr->n[ch_data->bs_freq_res[l + 1]]; k++) { - // find i such that f_tablehigh[i] == f_tablelow[k] - for (; i < sbr->n[1]; i++) - if (sbr->f_tablehigh[i] == sbr->f_tablelow[k]) - break; + i = k ? 2*k - temp : 0; // find i such that f_tablehigh[i] == f_tablelow[k] sbr->env_facs[ch][l + 1][k] = sbr->env_facs[ch][l][i] + delta * ch_data->bs_data_env[l][k]; } }

2 1

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

05 Dec '09

Author: alexc Date: Sat Dec 5 22:21:28 2009 New Revision: 5498 Log: Fix an off by one error in sbr_hf_gen. Modified: aac-sbr/aacsbr.c Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Sat Dec 5 16:42:06 2009 (r5497) +++ aac-sbr/aacsbr.c Sat Dec 5 22:21:28 2009 (r5498) @@ -1242,7 +1242,7 @@ static int sbr_hf_gen(AACContext *ac, Sp int ktmp = sbr->k[3]; for (i = 0; i < sbr->num_patches; i++) { if (i >= 1) - ktmp += sbr->patch_num_subbands[i]; + ktmp += sbr->patch_num_subbands[i-1]; for (x = 0; x < sbr->patch_num_subbands[i]; x++) { const int k = ktmp + x; const int g = find_freq_subband(sbr->f_tablenoise, sbr->n_q + 1, k);

1 0

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

05 Dec '09

Author: alexc Date: Sat Dec 5 16:42:04 2009 New Revision: 5496 Log: Simplify algebra/logic in f_tablelow derivation. Modified: aac-sbr/aacsbr.c Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Sat Dec 5 15:58:01 2009 (r5495) +++ aac-sbr/aacsbr.c Sat Dec 5 16:42:04 2009 (r5496) @@ -446,7 +446,7 @@ static int sbr_make_f_derived(AACContext } sbr->f_tablelow[0] = sbr->f_tablehigh[0]; - temp = (1 - (sbr->n[1] & 1 ? -1 : 1)) >> 1; + temp = sbr->n[1] & 1; for (k = 1; k <= sbr->n[0]; k++) sbr->f_tablelow[k] = sbr->f_tablehigh[(k << 1) - temp];

2 1