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

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

09 Dec '09

Author: alexc Date: Wed Dec 9 18:45:25 2009 New Revision: 5521 Log: Fix the delta condition on gain_boost_temp. Modified: aac-sbr/aacsbr.c Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Wed Dec 9 18:45:22 2009 (r5520) +++ aac-sbr/aacsbr.c Wed Dec 9 18:45:25 2009 (r5521) @@ -1489,7 +1489,7 @@ static void sbr_gain_calc(AACContext * a sum[0] += sbr->e_origmapped[l][i]; sum[1] += sbr->e_curr[l][i] * sbr->gain_lim[l][i] * sbr->gain_lim[l][i] + sbr->s_m[l][i] * sbr->s_m[l][i] - + (delta || !sbr->s_m[l][i]) * sbr->q_m_lim[l][i] * sbr->q_m_lim[l][i]; + + (delta && !sbr->s_m[l][i]) * sbr->q_m_lim[l][i] * sbr->q_m_lim[l][i]; } gain_boost_temp[l][k] = FFMIN(1.584893192, sqrtf((EPS0 + sum[0]) / (EPS0 + sum[1]))); }

1 0

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

09 Dec '09

Author: alexc Date: Wed Dec 9 18:45:22 2009 New Revision: 5520 Log: Fix gain_max_temp. The multiplication by limgain takes place inside of the min(). Modified: aac-sbr/aacsbr.c Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Wed Dec 9 02:17:44 2009 (r5519) +++ aac-sbr/aacsbr.c Wed Dec 9 18:45:22 2009 (r5520) @@ -1464,8 +1464,8 @@ static void sbr_gain_calc(AACContext * a sum[0] += sbr->e_origmapped[l][i]; sum[1] += sbr->e_curr[l][i]; } - gain_max_temp[l][k] = limgain[sbr->bs_limiter_gains] * - FFMIN(100000, sqrtf((EPS0 + sum[0]) / (EPS0 + sum[1]))); + gain_max_temp[l][k] = FFMIN(100000, + limgain[sbr->bs_limiter_gains] * sqrtf((EPS0 + sum[0]) / (EPS0 + sum[1]))); } }

1 0

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

09 Dec '09

Author: alexc Date: Wed Dec 9 02:17:44 2009 New Revision: 5519 Log: Index bs_num_res from 1. Use bs_num_res[0] to store the last value from the previous frame. Modified: aac-sbr/aacsbr.c Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Wed Dec 9 02:17:41 2009 (r5518) +++ aac-sbr/aacsbr.c Wed Dec 9 02:17:44 2009 (r5519) @@ -516,6 +516,7 @@ static int sbr_grid(AACContext *ac, Spec { int i; + ch_data->bs_freq_res[0] = ch_data->bs_freq_res[ch_data->bs_num_env[1]]; ch_data->bs_num_env[0] = ch_data->bs_num_env[1]; ch_data->bs_amp_res = sbr->bs_amp_res_header; @@ -525,9 +526,9 @@ static int sbr_grid(AACContext *ac, Spec if (ch_data->bs_num_env[1] == 1) ch_data->bs_amp_res = 0; - ch_data->bs_freq_res[0] = get_bits1(gb); + ch_data->bs_freq_res[1] = get_bits1(gb); for (i = 1; i < ch_data->bs_num_env[1]; i++) - ch_data->bs_freq_res[i] = ch_data->bs_freq_res[0]; + ch_data->bs_freq_res[i + 1] = ch_data->bs_freq_res[1]; break; case FIXVAR: ch_data->bs_var_bord[1] = get_bits(gb, 2); @@ -540,7 +541,7 @@ static int sbr_grid(AACContext *ac, Spec ch_data->bs_pointer = get_bits(gb, ceil_log2[ch_data->bs_num_env[1] + 1]); for (i = 0; i < ch_data->bs_num_env[1]; i++) - ch_data->bs_freq_res[ch_data->bs_num_env[1] - 1 - i] = get_bits1(gb); + ch_data->bs_freq_res[ch_data->bs_num_env[1] - i] = get_bits1(gb); break; case VARFIX: ch_data->bs_var_bord[0] = get_bits(gb, 2); @@ -553,7 +554,7 @@ static int sbr_grid(AACContext *ac, Spec ch_data->bs_pointer = get_bits(gb, ceil_log2[ch_data->bs_num_env[1] + 1]); for (i = 0; i < ch_data->bs_num_env[1]; i++) - ch_data->bs_freq_res[i] = get_bits1(gb); + ch_data->bs_freq_res[i + 1] = get_bits1(gb); break; case VARVAR: ch_data->bs_var_bord[0] = get_bits(gb, 2); @@ -570,7 +571,7 @@ static int sbr_grid(AACContext *ac, Spec ch_data->bs_pointer = get_bits(gb, ceil_log2[ch_data->bs_num_env[1] + 1]); for (i = 0; i < ch_data->bs_num_env[1]; i++) - ch_data->bs_freq_res[i] = get_bits1(gb); + ch_data->bs_freq_res[i + 1] = get_bits1(gb); break; default: break; @@ -656,10 +657,10 @@ static void sbr_envelope(SpectralBandRep for (i = 0; i < ch_data->bs_num_env[1]; i++) { if (!ch_data->bs_df_env[i]) { ch_data->bs_data_env[i][0] = get_bits(gb, bits); // bs_env_start_value_balance - for (j = 1; j < sbr->n[ch_data->bs_freq_res[i]]; j++) + for (j = 1; j < sbr->n[ch_data->bs_freq_res[i + 1]]; j++) ch_data->bs_data_env[i][j] = get_vlc2(gb, f_huff, 9, max_depth) - f_lav; } else { - for (j = 0; j < sbr->n[ch_data->bs_freq_res[i]]; j++) + for (j = 0; j < sbr->n[ch_data->bs_freq_res[i + 1]]; j++) ch_data->bs_data_env[i][j] = get_vlc2(gb, t_huff, 9, max_depth) - t_lav; } } @@ -990,7 +991,7 @@ static void sbr_dequant(SpectralBandRepl if (id_aac == TYPE_CPE && sbr->bs_coupling) { float pan_offset = sbr->data[ch].bs_amp_res ? 12.0f : 24.0f; for (l = 1; l <= sbr->data[ch].bs_num_env[1]; l++) { - for (k = 0; k < sbr->n[sbr->data[ch].bs_freq_res[l + 1]]; k++) { + for (k = 0; k < sbr->n[sbr->data[ch].bs_freq_res[l]]; k++) { float temp1 = powf(2.0f, sbr->env_facs[0][l][k] * alpha + 7.0f); float temp2 = (pan_offset - sbr->env_facs[1][l][k]) * alpha; sbr->env_facs[0][l][k] = temp1 / (1.0f + powf(2.0f, temp2)); @@ -1007,7 +1008,7 @@ static void sbr_dequant(SpectralBandRepl } } else { // SCE or one non-coupled CPE for (l = 1; l <= sbr->data[ch].bs_num_env[1]; l++) - for (k = 0; k < sbr->n[sbr->data[ch].bs_freq_res[l + 1]]; k++) + for (k = 0; k < sbr->n[sbr->data[ch].bs_freq_res[l]]; k++) sbr->env_facs[ch][l][k] = powf(2.0f, alpha * sbr->env_facs[ch][l][k] + 6.0f); for (l = 1; l <= sbr->data[ch].bs_num_noise; l++) for (k = 0; k < sbr->n_q; k++)

1 0

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

09 Dec '09

Author: alexc Date: Wed Dec 9 02:17:41 2009 New Revision: 5518 Log: Fix calculation of q_mapped. In q_mapped m is derived from f_tablenoise not f_tablehigh/low. Modified: aac-sbr/aacsbr.c Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Tue Dec 8 23:59:09 2009 (r5517) +++ aac-sbr/aacsbr.c Wed Dec 9 02:17:41 2009 (r5518) @@ -1338,7 +1338,7 @@ static void sbr_mapping(AACContext *ac, // ch_data->bs_num_noise > 1 => 2 noise floors k = (ch_data->bs_num_noise > 1) && (sbr->t_env[ch][l] >= sbr->t_q[ch][1]); for (i = 0; i < sbr->n_q; i++) - for (m = table[i]; m < table[i + 1]; m++) + for (m = sbr->f_tablenoise[i]; m < sbr->f_tablenoise[i + 1]; m++) sbr->q_mapped[l][m - sbr->k[3]] = sbr->noise_facs[ch][k+1][i]; for (i = 0; i < sbr->n[1]; i++) {

1 0

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

08 Dec '09

Author: alexc Date: Tue Dec 8 23:59:09 2009 New Revision: 5517 Log: Resize variables indexed by bs_num_env (L_E). The maximum value of bs_num_env is 5. env_facs needs one additional envelope from the previous frame. Modified: aac-sbr/aacsbr.h Modified: aac-sbr/aacsbr.h ============================================================================== --- aac-sbr/aacsbr.h Tue Dec 8 23:59:06 2009 (r5516) +++ aac-sbr/aacsbr.h Tue Dec 8 23:59:09 2009 (r5517) @@ -94,7 +94,7 @@ typedef struct { uint8_t bs_rel_bord[2][3]; uint8_t bs_pointer; uint8_t bs_num_noise; - uint8_t bs_df_env[7]; + uint8_t bs_df_env[5]; uint8_t bs_df_noise[2]; uint8_t bs_invf_mode[2][5]; uint32_t bs_data_env[7][32]; @@ -143,7 +143,7 @@ typedef struct { 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 env_facs[2][6][48]; float noise_facs[2][3][5]; float W[2][32][32][2]; float x_low[32][40][2];

1 0

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

08 Dec '09

Author: alexc Date: Tue Dec 8 23:59:06 2009 New Revision: 5516 Log: Simplify noise floor decoding when bs_df_noise = 0. The bs_df_noise[l] = 0 case of noise floor decoding is just a simple horizontal accumulation. This is analogous to r5495 for envelope decoding. Modified: aac-sbr/aacsbr.c Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Tue Dec 8 23:59:03 2009 (r5515) +++ aac-sbr/aacsbr.c Tue Dec 8 23:59:06 2009 (r5516) @@ -970,12 +970,9 @@ static void sbr_env_noise_floors(Spectra for (k = 0; k < sbr->n_q; k++) sbr->noise_facs[ch][l + 1][k] = sbr->noise_facs[ch][l][k] + delta * ch_data->bs_data_noise[l][k]; else { - for (k = 0; k < sbr->n_q; k++) { - sbr->noise_facs[ch][l + 1][k] = ch_data->bs_data_noise[l][0]; - for (i = 1; i <= k; i++) - sbr->noise_facs[ch][l + 1][k] += ch_data->bs_data_noise[l][i]; - sbr->noise_facs[ch][l + 1][k] *= delta; - } + sbr->noise_facs[ch][l + 1][0] = delta * ch_data->bs_data_noise[l][0]; + for (k = 1; k < sbr->n_q; k++) + sbr->noise_facs[ch][l + 1][k] = sbr->noise_facs[ch][l + 1][k - 1] + delta * ch_data->bs_data_noise[l][i]; } }

1 0

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

08 Dec '09

Author: alexc Date: Tue Dec 8 23:59:03 2009 New Revision: 5515 Log: Save the last envelope/noise floor of this frame for the next. Modified: aac-sbr/aacsbr.c Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Tue Dec 8 23:59:00 2009 (r5514) +++ aac-sbr/aacsbr.c Tue Dec 8 23:59:03 2009 (r5515) @@ -978,7 +978,10 @@ static void sbr_env_noise_floors(Spectra } } } - //FIXME : assign 0th elements of (env|noise)_facs from last elements + + //assign 0th elements of (env|noise)_facs from last elements + memcpy( sbr->env_facs[ch][0], sbr->env_facs[ch][ch_data->bs_num_env[1]], sizeof( sbr->env_facs[ch][0])); + memcpy(sbr->noise_facs[ch][0], sbr->noise_facs[ch][ch_data->bs_num_noise ], sizeof(sbr->noise_facs[ch][0])); } // Dequantisation and stereo decoding (14496-3 sp04 p203)

1 0

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

08 Dec '09

Author: alexc Date: Tue Dec 8 23:59:00 2009 New Revision: 5514 Log: Fix the indexing of (env|noise)_facs. Both are indexed from 1. 0 holds the last envelope/noise floor of the previous frame. Modified: aac-sbr/aacsbr.c Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Tue Dec 8 23:58:58 2009 (r5513) +++ aac-sbr/aacsbr.c Tue Dec 8 23:59:00 2009 (r5514) @@ -1333,13 +1333,13 @@ static void sbr_mapping(AACContext *ac, for (i = 0; i < ilim; i++) for (m = table[i]; m < table[i + 1]; m++) - sbr->e_origmapped[l][m - sbr->k[3]] = sbr->env_facs[ch][l][i]; + sbr->e_origmapped[l][m - sbr->k[3]] = sbr->env_facs[ch][l+1][i]; // ch_data->bs_num_noise > 1 => 2 noise floors k = (ch_data->bs_num_noise > 1) && (sbr->t_env[ch][l] >= sbr->t_q[ch][1]); for (i = 0; i < sbr->n_q; i++) for (m = table[i]; m < table[i + 1]; m++) - sbr->q_mapped[l][m - sbr->k[3]] = sbr->noise_facs[ch][k][i]; + sbr->q_mapped[l][m - sbr->k[3]] = sbr->noise_facs[ch][k+1][i]; for (i = 0; i < sbr->n[1]; i++) { memset(&sbr->s_indexmapped[l + 1][sbr->f_tablehigh[i] - sbr->k[3]], 0,

1 0

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

08 Dec '09

Author: alexc Date: Tue Dec 8 23:58:58 2009 New Revision: 5513 Log: Expand the noise_facs matrix. The noise_facs matrix needs room for 2 noise floors from this frame (the maximum value of bs_num_noise) plus the last noise floor from the previous frame. Modified: aac-sbr/aacsbr.h Modified: aac-sbr/aacsbr.h ============================================================================== --- aac-sbr/aacsbr.h Tue Dec 8 07:14:49 2009 (r5512) +++ aac-sbr/aacsbr.h Tue Dec 8 23:58:58 2009 (r5513) @@ -144,7 +144,7 @@ typedef struct { 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 noise_facs[2][3][5]; float W[2][32][32][2]; float x_low[32][40][2]; float x_high[64][40][2];

1 0

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

08 Dec '09

Author: alexc Date: Tue Dec 8 07:14:49 2009 New Revision: 5512 Log: Fix f_indexsine in an analogous manner. Modified: aac-sbr/aacsbr.c aac-sbr/aacsbr.h Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Tue Dec 8 07:14:47 2009 (r5511) +++ aac-sbr/aacsbr.c Tue Dec 8 07:14:49 2009 (r5512) @@ -1599,12 +1599,12 @@ static void sbr_hf_assemble(float y[2][6 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++) { - sbr->f_indexsine[i][0] = (((sbr->f_indexsine[i][1] + 1) & 3) + i - (sbr->t_env[ch][0] << 1)) & 3; + sbr->f_indexsine[ch] = (sbr->f_indexsine[ch] + 1) & 3; for (m = 0; m < sbr->m; m++) { 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]]; + w_temp[i][m][0] + sbr->s_m_boost[l][m] * phi[0][sbr->f_indexsine[ch]]; 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)); + w_temp[i][m][1] + sbr->s_m_boost[l][m] * phi[1][sbr->f_indexsine[ch]] * (1 - 2*((m + sbr->k[3]) & 1)); } } } Modified: aac-sbr/aacsbr.h ============================================================================== --- aac-sbr/aacsbr.h Tue Dec 8 07:14:47 2009 (r5511) +++ aac-sbr/aacsbr.h Tue Dec 8 07:14:49 2009 (r5512) @@ -169,7 +169,7 @@ typedef struct { float q_m_limboost[7][48]; float s_m_boost[7][48]; uint16_t f_indexnoise[2]; - uint8_t f_indexsine[42][2]; + uint8_t f_indexsine[2]; } SpectralBandReplication; #endif /* AVCODEC_AACSBR_H */

1 0