March 2008 - FFmpeg-soc - lists.ffmpeg.org

[soc]: r1959 - aac/aac.c
by andoma 05 Mar '08

05 Mar '08

Author: andoma Date: Wed Mar 5 12:20:32 2008 New Revision: 1959 Log: Add a comment about the current status of SSR support. Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Wed Mar 5 12:20:32 2008 @@ -32,6 +32,15 @@ * after each other. And then try to do the interleaving inplace. */ + +/** + * AAC SSR (Scalable Sample Rate) is currently not working, and therefore + * not compiled in. SSR files play without crashing but produces audible + * artifacts that seems to be related to EIGHT_SHORT_SEQUENCE windows. + */ +//#define AAC_SSR + + #include "avcodec.h" #include "bitstream.h" #include "dsputil.h"

2 1

[soc]: r1977 - aac/aac.c
by andoma 05 Mar '08

05 Mar '08

Author: andoma Date: Wed Mar 5 16:27:17 2008 New Revision: 1977 Log: Do not assert() if 'intensity' or 'global_gain' goes out of range. Instead, do the usual av_log() + return -1; Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Wed Mar 5 16:27:17 2008 @@ -1129,7 +1129,7 @@ static int section_data(AACContext * ac, * Decode scale_factor_data * reference: Table 4.47 */ -static void scale_factor_data(AACContext * ac, GetBitContext * gb, float mix_gain, int global_gain, ics_struct * ics, const int cb[][64], float sf[][64]) { +static int scale_factor_data(AACContext * ac, GetBitContext * gb, float mix_gain, int global_gain, ics_struct * ics, const int cb[][64], float sf[][64]) { int g, i; int intensity = 100; // normalization for intensity_tab lookup table int noise = global_gain - 90; @@ -1143,7 +1143,11 @@ static void scale_factor_data(AACContext } else if ((cb[g][i] == INTENSITY_HCB) || (cb[g][i] == INTENSITY_HCB2)) { ics->intensity_present = 1; intensity += get_vlc2(gb, ac->mainvlc.table, 7, 3) - 60; - assert(!(intensity & (~255))); + if(intensity & ~255) { + av_log(ac->avccontext, AV_LOG_ERROR, + "Intensity (%d) out of range", intensity); + return -1; + } sf[g][i] = ac->intensity_tab[intensity]; } else if (cb[g][i] == NOISE_HCB) { ics->noise_present = 1; @@ -1156,12 +1160,17 @@ static void scale_factor_data(AACContext sf[g][i] = pow(2.0, 0.25 * noise)/1024./ac->scale_bias; } else { global_gain += get_vlc2(gb, ac->mainvlc.table, 7, 3) - 60; - assert(!(global_gain & (~255))); + if(global_gain & ~255) { + av_log(ac->avccontext, AV_LOG_ERROR, + "Global gain (%d) out of range", global_gain); + return -1; + } sf[g][i] = ac->pow2sf_tab[global_gain]; } sf[g][i] *= mix_gain; } } + return 0; } static void pulse_data(AACContext * ac, GetBitContext * gb, pulse_struct * pulse) { @@ -1385,7 +1394,8 @@ static int individual_channel_stream(AAC if (section_data(ac, gb, ics, sce->cb) < 0) return -1; - scale_factor_data(ac, gb, sce->mixing_gain, sce->global_gain, ics, sce->cb, sce->sf); + if (scale_factor_data(ac, gb, sce->mixing_gain, sce->global_gain, ics, sce->cb, sce->sf) < 0) + return -1; if (!scale_flag) { if ((pulse.present = get_bits1(gb)))

1 0

[soc]: r1976 - aac/aac.c
by andoma 05 Mar '08

05 Mar '08

Author: andoma Date: Wed Mar 5 16:22:01 2008 New Revision: 1976 Log: Rename LTP_ROUND() to ltp_round() Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Wed Mar 5 16:22:01 2008 @@ -1809,7 +1809,7 @@ static void ltp_trans(AACContext * ac, s /** * @todo: Replace this with float_to_int16() */ -static inline int16_t LTP_ROUND(float x) { +static inline int16_t ltp_round(float x) { if (x >= 0) { if (x >= 1.0f) @@ -1830,8 +1830,8 @@ static void ltp_update_trans(AACContext if (ac->is_saved) { for (i = 0; i < 1024; i++) { sce->ltp_state[i] = sce->ltp_state[i + 1024]; - sce->ltp_state[i + 1024] = LTP_ROUND(sce->ret[i] - ac->add_bias); - sce->ltp_state[i + 2 * 1024] = LTP_ROUND(sce->saved[i]); + sce->ltp_state[i + 1024] = ltp_round(sce->ret[i] - ac->add_bias); + sce->ltp_state[i + 2 * 1024] = ltp_round(sce->saved[i]); //sce->ltp_state[i + 3 * 1024] = 0; } }

1 0

[soc]: r1965 - aac/aac.c
by andoma 05 Mar '08

05 Mar '08

Author: andoma Date: Wed Mar 5 13:42:28 2008 New Revision: 1965 Log: Move LTP_ROUND() close to where it's used. Part of LTP conditional compilation. Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Wed Mar 5 13:42:28 2008 @@ -351,20 +351,6 @@ static void vector_fmul_add_add_add(AACC dst[i] += src3[i]; } -static inline int16_t LTP_ROUND(float x) { - if (x >= 0) - { - if (x >= 1.0f) - return 32767; - } else { - if (x <= -1.0f) - return -32768; - } - - return lrintf(32768 * x); -} - - // aux /** * Generate a sine Window. @@ -1798,6 +1784,24 @@ static void ltp_trans(AACContext * ac, s } } + +/** + * @todo: Replace this with float_to_int16() + */ +static inline int16_t LTP_ROUND(float x) { + if (x >= 0) + { + if (x >= 1.0f) + return 32767; + } else { + if (x <= -1.0f) + return -32768; + } + + return lrintf(32768 * x); +} + + static void ltp_update_trans(AACContext * ac, sce_struct * sce) { int i; if (sce->ltp_state == NULL)

4 3

[soc]: r1975 - aac/aac.c
by andoma 05 Mar '08

05 Mar '08

Author: andoma Date: Wed Mar 5 15:36:47 2008 New Revision: 1975 Log: Vertical alignment Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Wed Mar 5 15:36:47 2008 @@ -1201,7 +1201,7 @@ static int gain_control_data(AACContext {1, 0, 5}, //ONLY_LONG_SEQUENCE = 0, {2, 1, 2}, //LONG_START_SEQUENCE, {8, 0, 2}, //EIGHT_SHORT_SEQUENCE, - {2, 1, 5} //LONG_STOP_SEQUENCE + {2, 1, 5}, //LONG_STOP_SEQUENCE }; const int mode = sce->ics.window_sequence; int bd, wd, ad;

1 0

[soc]: r1974 - aac/aac.c
by andoma 05 Mar '08

05 Mar '08

Author: andoma Date: Wed Mar 5 15:35:41 2008 New Revision: 1974 Log: Remove explicit compare against NULL. Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Wed Mar 5 15:35:41 2008 @@ -401,7 +401,7 @@ static void ssr_context_init(ssr_context * Free a Single Channel Element */ static void sce_freep(sce_struct **s) { - if(*s == NULL) + if(!*s) return; av_free((*s)->ssr); av_free((*s)->ltp_state); @@ -412,7 +412,7 @@ static void sce_freep(sce_struct **s) { * Free a Channel Pair Element */ static void cpe_freep(cpe_struct **s) { - if(*s == NULL) + if(!*s) return; av_free((*s)->ch[0].ssr); av_free((*s)->ch[1].ssr); @@ -425,7 +425,7 @@ static void cpe_freep(cpe_struct **s) { * Free a Coupling Channel */ static void cc_freep(cc_struct **s) { - if(*s == NULL) + if(!*s) return; av_free((*s)->ch.ssr); av_freep(s); @@ -503,10 +503,10 @@ static int output_configure(AACContext * ac->che_cpe[i]->ch[0].mixing_gain = 1.0f; ac->che_cpe[i]->ch[1].mixing_gain = 1.0f; - if(front == NULL && pcs->cpe_type[i] == AAC_CHANNEL_FRONT) + if(!front && pcs->cpe_type[i] == AAC_CHANNEL_FRONT) front = ac->che_cpe[i]; - if(back == NULL && pcs->cpe_type[i] == AAC_CHANNEL_BACK) + if(!back && pcs->cpe_type[i] == AAC_CHANNEL_BACK) back = ac->che_cpe[i]; } @@ -514,7 +514,7 @@ static int output_configure(AACContext * ac->output_data[ch++] = ac->che_sce[i]->ret; ac->che_sce[i]->mixing_gain = 1.0f; - if(center == NULL && pcs->sce_type[i] == AAC_CHANNEL_FRONT) + if(!center && pcs->sce_type[i] == AAC_CHANNEL_FRONT) center = ac->che_sce[i]; } if(ac->che_lfe[i]) { @@ -898,7 +898,7 @@ static int aac_decode_init(AVCodecContex 0) < 0) return -1; - if((ac->vq[i] = av_malloc(dim * values * sizeof(int))) == NULL) + if(!(ac->vq[i] = av_malloc(dim * values * sizeof(int)))) return -1; if (dim == 2) { @@ -1206,7 +1206,7 @@ static int gain_control_data(AACContext const int mode = sce->ics.window_sequence; int bd, wd, ad; ssr_struct * ssr = sce->ssr; - if (ssr == NULL) + if (!ssr) ssr = sce->ssr = av_mallocz(sizeof(ssr_struct)); ssr->max_band = get_bits(gb, 2); for (bd = 0; bd < ssr->max_band; bd++) { @@ -1471,7 +1471,7 @@ static void intensity_tool(AACContext * static int channel_pair_element(AACContext * ac, GetBitContext * gb, int id) { int i; cpe_struct * cpe; - if (ac->che_cpe[id] == NULL) { + if (!ac->che_cpe[id]) { return -1; } cpe = ac->che_cpe[id]; @@ -1510,7 +1510,7 @@ static int coupling_channel_element(AACC float scale; sce_struct * sce; coupling_struct * coup; - if (ac->che_cc[id] == NULL) { + if (!ac->che_cc[id]) { return -1; } sce = &ac->che_cc[id]->ch; @@ -1606,7 +1606,7 @@ static int dynamic_range_info(AACContext int drc_num_bands = 1; int i; - if (ac->che_drc == NULL) + if (!ac->che_drc) ac->che_drc = av_mallocz(sizeof(drc_struct)); /* pce_tag_present? */ @@ -1759,7 +1759,7 @@ static void window_ltp_tool(AACContext * float * buf = ac->buf_mdct; int i; assert(ics->window_sequence != EIGHT_SHORT_SEQUENCE); - if (ac->mdct_ltp == NULL) { + if (!ac->mdct_ltp) { ac->mdct_ltp = av_malloc(sizeof(MDCTContext)); ff_mdct_init(ac->mdct_ltp, 11, 0); } @@ -1788,7 +1788,7 @@ static void ltp_trans(AACContext * ac, s int i, sfb; if (!ltp->present) return; - if (sce->ltp_state == NULL) + if (!sce->ltp_state) sce->ltp_state = av_mallocz(4 * 1024 * sizeof(int16_t)); if ((sce->ics.window_sequence != EIGHT_SHORT_SEQUENCE) && (ac->is_saved)) { float x_est[2 * 1024], X_est[2 * 1024]; @@ -1825,7 +1825,7 @@ static inline int16_t LTP_ROUND(float x) static void ltp_update_trans(AACContext * ac, sce_struct * sce) { int i; - if (sce->ltp_state == NULL) + if (!sce->ltp_state) sce->ltp_state = av_mallocz(4 * 1024 * sizeof(int16_t)); if (ac->is_saved) { for (i = 0; i < 1024; i++) { @@ -2079,7 +2079,7 @@ static void coupling_tool(AACContext * a int i; for (i = 0; i < MAX_TAGID; i++) { cc_struct * cc = ac->che_cc[i]; - if (cc != NULL) { + if (cc) { if (cc->coup.ind_sw && independent) { transform_coupling_tool(ac, cc, coupling_independent_trans); } else if (!cc->coup.ind_sw && !independent && (cc->coup.domain == domain)) { @@ -2092,15 +2092,15 @@ static void coupling_tool(AACContext * a static void transform_sce_tool(AACContext * ac, void (*sce_trans)(AACContext * ac, sce_struct * sce)) { int i; for (i = 0; i < MAX_TAGID; i++) { - if (ac->che_sce[i] != NULL) + if (ac->che_sce[i]) sce_trans(ac, ac->che_sce[i]); - if (ac->che_cpe[i] != NULL) { + if (ac->che_cpe[i]) { sce_trans(ac, &ac->che_cpe[i]->ch[0]); sce_trans(ac, &ac->che_cpe[i]->ch[1]); } - if (ac->che_lfe[i] != NULL) + if (ac->che_lfe[i]) sce_trans(ac, ac->che_lfe[i]); - if (ac->che_cc[i] != NULL) + if (ac->che_cc[i]) sce_trans(ac, &ac->che_cc[i]->ch); } } @@ -2194,8 +2194,8 @@ static int aac_decode_frame(AVCodecConte tag = get_bits(&gb, 4); switch (id) { case ID_SCE: - if(ac->che_sce[tag] == NULL) { - if(tag == 1 && ac->che_lfe[0] != NULL) { + if(!ac->che_sce[tag]) { + if(tag == 1 && ac->che_lfe[0]) { /* Some streams incorrectly code 5.1 audio as SCE[0] CPE[0] CPE[1] SCE[1] instead of SCE[0] CPE[0] CPE[0] LFE[0]. If we seem to have encountered such a stream,

1 0

[soc]: r1973 - aac/aac.c
by andoma 05 Mar '08

05 Mar '08

Author: andoma Date: Wed Mar 5 15:20:41 2008 New Revision: 1973 Log: Log and return instead of assert() if coupling target elements are missing. Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Wed Mar 5 15:20:41 2008 @@ -2055,11 +2055,9 @@ static void transform_coupling_tool(AACC int index = 0; coupling_struct * coup = &cc->coup; for (c = 0; c <= coup->num_coupled; c++) { - if (!coup->is_cpe[c]) { - assert(ac->che_sce[coup->tag_select[c]] != NULL); + if ( !coup->is_cpe[c] && ac->che_sce[coup->tag_select[c]]) { cc_trans(ac, cc, ac->che_sce[coup->tag_select[c]], index++); - } else { - assert(ac->che_cpe[coup->tag_select[c]] != NULL); + } else if(coup->is_cpe[c] && ac->che_cpe[coup->tag_select[c]]) { if (!coup->l[c] && !coup->r[c]) { cc_trans(ac, cc, &ac->che_cpe[coup->tag_select[c]]->ch[0], index); cc_trans(ac, cc, &ac->che_cpe[coup->tag_select[c]]->ch[1], index++); @@ -2068,6 +2066,11 @@ static void transform_coupling_tool(AACC cc_trans(ac, cc, &ac->che_cpe[coup->tag_select[c]]->ch[0], index++); if (coup->r[c]) cc_trans(ac, cc, &ac->che_cpe[coup->tag_select[c]]->ch[1], index++); + } else { + av_log(ac->avccontext, AV_LOG_ERROR, + "Coupling target %sE[%d] not available\n", + coup->is_cpe[c] ? "CP" : "SC", coup->tag_select[c]); + break; } } }

1 0

[soc]: r1972 - aac/aac.c
by andoma 05 Mar '08

05 Mar '08

Author: andoma Date: Wed Mar 5 15:19:20 2008 New Revision: 1972 Log: Get rid of an assert() and replace it with av_log() + return; Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Wed Mar 5 15:19:20 2008 @@ -2020,7 +2020,11 @@ static void coupling_dependent_trans(AAC float * dest = sce->coeffs; float * src = cc->ch.coeffs; int g, i, group, k; - assert(ac->audioObjectType != AOT_AAC_LTP); + if(ac->audioObjectType == AOT_AAC_LTP) { + av_log(ac->avccontext, AV_LOG_ERROR, + "Dependent coupling is not supported together with LTP\n"); + return; + } for (g = 0; g < ics->num_window_groups; g++) { for (i = 0; i < ics->max_sfb; i++) { if (cc->ch.cb[g][i] != ZERO_HCB) {

1 0

[soc]: r1971 - aac/aac.c
by andoma 05 Mar '08

05 Mar '08

Author: andoma Date: Wed Mar 5 14:59:46 2008 New Revision: 1971 Log: Fix incorrect indent. Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Wed Mar 5 14:59:46 2008 @@ -2161,15 +2161,15 @@ static int output_samples(AVCodecContext } } else { - for(i = 0; i < 1024; i++) + for(i = 0; i < 1024; i++) for(ch = 0; ch < avccontext->channels; ch++) { ac->interleaved_output[i * avccontext->channels + ch] = ac->output_data[ch][i]; } - } + } *data_size = 1024 * avccontext->channels * sizeof(uint16_t); ac->dsp.float_to_int16(data, ac->interleaved_output, 1024 * avccontext->channels); - return 0; + return 0; }

1 0

[soc]: r1970 - aac/aac.c
by andoma 05 Mar '08

05 Mar '08

Author: andoma Date: Wed Mar 5 14:58:35 2008 New Revision: 1970 Log: Fix spelling errors. Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Wed Mar 5 14:58:35 2008 @@ -41,7 +41,7 @@ //#define AAC_SSR /** - * AAC LTP (Long Term Preditction) is currently not working, and therefore + * AAC LTP (Long Term Prediction) is currently not working, and therefore * not compiled in. Playing LTP files with LTP support compiled in results * in crashes due to SSE alignment issues. Also, there are major audible * artifacts. @@ -1396,7 +1396,7 @@ static int individual_channel_stream(AAC #ifdef AAC_SSR if (gain_control_data(ac, gb, sce)) return -1; #else - av_log(ac->avccontext, AV_LOG_ERROR, "SSR not supprted\n"); + av_log(ac->avccontext, AV_LOG_ERROR, "SSR not supported\n"); return -1; #endif }

1 0