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

[soc]: r1987 - aac/aac.c
by andoma 06 Mar '08

06 Mar '08

Author: andoma Date: Thu Mar 6 12:52:46 2008 New Revision: 1987 Log: Oops, accidentally committed a debug line, remove it. Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Thu Mar 6 12:52:46 2008 @@ -862,7 +862,6 @@ static int AudioSpecificConfig(AACContex } } } - av_log(NULL, AV_LOG_ERROR, "sbr=%d, samplerate=%d, ext_samplerate=%d\n", ac->sbr_present, ac->sample_rate, ac->ext_sample_rate); return 0; }

1 0

[soc]: r1986 - aac/aac.c
by andoma 06 Mar '08

06 Mar '08

Author: andoma Date: Thu Mar 6 12:47:06 2008 New Revision: 1986 Log: Remove the scalefactor window band caches. It does not make any speed difference whatsoever. Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Thu Mar 6 12:47:06 2008 @@ -319,14 +319,6 @@ typedef struct { DECLARE_ALIGNED_16(float, revers[1024]); int is_saved; - //caches - const uint16_t *swb_offset_1024; - const uint16_t *swb_offset_128; - int num_swb_1024; - int num_swb_128; - int tns_max_bands_1024; - int tns_max_bands_128; - /** * @defgroup tables Computed / setup during init * @{ @@ -870,6 +862,7 @@ static int AudioSpecificConfig(AACContex } } } + av_log(NULL, AV_LOG_ERROR, "sbr=%d, samplerate=%d, ext_samplerate=%d\n", ac->sbr_present, ac->sample_rate, ac->ext_sample_rate); return 0; } @@ -961,15 +954,6 @@ static int aac_decode_init(AVCodecContex for (i = 0; i < 256; i++) ac->pow2sf_tab[i] = pow(2, (i - 100)/4.) /1024./ac->scale_bias; - - // general init - ac->swb_offset_1024 = swb_offset_1024 [ac->sampling_index]; - ac->num_swb_1024 = num_swb_1024 [ac->sampling_index]; - ac->tns_max_bands_1024 = tns_max_bands_1024 [ac->sampling_index]; - ac->swb_offset_128 = swb_offset_128 [ac->sampling_index]; - ac->num_swb_128 = num_swb_128 [ac->sampling_index]; - ac->tns_max_bands_128 = tns_max_bands_128 [ac->sampling_index]; - if(init_vlc(&ac->mainvlc, 7, sizeof(code)/sizeof(code[0]), bits, sizeof(bits[0]), sizeof(bits[0]), code, sizeof(code[0]), sizeof(code[0]), @@ -1066,16 +1050,16 @@ static int ics_info(AACContext * ac, Get ics->group_len[ics->num_window_groups-1] = 1; } } - ics->swb_offset = ac->swb_offset_128; - ics->num_swb = ac->num_swb_128; + ics->swb_offset = swb_offset_128[ac->sampling_index]; + ics->num_swb = num_swb_128[ac->sampling_index]; ics->num_windows = 8; - ics->tns_max_bands = ac->tns_max_bands_128; + ics->tns_max_bands = tns_max_bands_128[ac->sampling_index]; } else { ics->max_sfb = get_bits(gb, 6); - ics->swb_offset = ac->swb_offset_1024; - ics->num_swb = ac->num_swb_1024; + ics->swb_offset = swb_offset_1024[ac->sampling_index]; + ics->num_swb = num_swb_1024[ac->sampling_index]; ics->num_windows = 1; - ics->tns_max_bands = ac->tns_max_bands_1024; + ics->tns_max_bands = tns_max_bands_1024[ac->sampling_index]; if (get_bits1(gb)) { #ifdef AAC_LTP if (ac->audioObjectType == AOT_AAC_MAIN) {

1 0

[soc]: r1985 - aac/aac.c
by andoma 06 Mar '08

06 Mar '08

Author: andoma Date: Thu Mar 6 12:38:05 2008 New Revision: 1985 Log: More doxygenification Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Thu Mar 6 12:38:05 2008 @@ -297,8 +297,6 @@ typedef struct { typedef struct { // objects AVCodecContext * avccontext; - VLC mainvlc; - VLC books[11]; // main config int audioObjectType; @@ -318,6 +316,7 @@ typedef struct { drc_struct * che_drc; DECLARE_ALIGNED_16(float, buf_mdct[2048]); + DECLARE_ALIGNED_16(float, revers[1024]); int is_saved; //caches @@ -328,7 +327,12 @@ typedef struct { int tns_max_bands_1024; int tns_max_bands_128; - // tables + /** + * @defgroup tables Computed / setup during init + * @{ + */ + VLC mainvlc; + VLC books[11]; DECLARE_ALIGNED_16(float, kbd_long_1024[1024]); DECLARE_ALIGNED_16(float, kbd_short_128[128]); DECLARE_ALIGNED_16(float, sine_long_1024[1024]); @@ -336,13 +340,6 @@ typedef struct { DECLARE_ALIGNED_16(float, pow2sf_tab[256]); DECLARE_ALIGNED_16(float, intensity_tab[256]); DECLARE_ALIGNED_16(float, ivquant_tab[256]); - DECLARE_ALIGNED_16(float, revers[1024]); - float* interleaved_output; ///< Interim buffer for interleaving PCM samples - float *output_data[MAX_CHANNELS]; ///< Points to each channels 'ret' buffer (PCM output) - sce_struct *mm_center; ///< Center SCE to use for matrix mixdown - cpe_struct *mm_front; ///< Front CPE to use for matrix mixdown - cpe_struct *mm_back; ///< Back CPE to use for matrix mixdown - MDCTContext mdct; MDCTContext mdct_small; MDCTContext *mdct_ltp; @@ -350,10 +347,21 @@ typedef struct { int * vq[11]; ssr_context ssrctx; AVRandomState random_state; + /** @} */ + + /** + * @defgroup output Members used for output interleaving and downmixing + * @{ + */ + float* interleaved_output; ///< Interim buffer for interleaving PCM samples + float *output_data[MAX_CHANNELS]; ///< Points to each elements 'ret' buffer (PCM output) + sce_struct *mm_center; ///< Center SCE to use for matrix mixdown + cpe_struct *mm_front; ///< Front CPE to use for matrix mixdown + cpe_struct *mm_back; ///< Back CPE to use for matrix mixdown + float add_bias; ///< Offset for dsp.float_to_int16 + float scale_bias; ///< Bias for dsp.float_to_int16 + /** @} */ - //bias values - float add_bias; - float scale_bias; } AACContext;

1 0

[soc]: r1984 - aac/aac.c
by andoma 06 Mar '08

06 Mar '08

Author: andoma Date: Thu Mar 6 11:06:43 2008 New Revision: 1984 Log: Remove unused frame counter. Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Thu Mar 6 11:06:43 2008 @@ -354,9 +354,6 @@ typedef struct { //bias values float add_bias; float scale_bias; - - // statistics - int num_frame; } AACContext; @@ -958,8 +955,6 @@ static int aac_decode_init(AVCodecContex // general init - ac->num_frame = -1; - ac->swb_offset_1024 = swb_offset_1024 [ac->sampling_index]; ac->num_swb_1024 = num_swb_1024 [ac->sampling_index]; ac->tns_max_bands_1024 = tns_max_bands_1024 [ac->sampling_index]; @@ -2209,8 +2204,6 @@ static int aac_decode_frame(AVCodecConte GetBitContext gb; int id, err, tag; - ac->num_frame++; - init_get_bits(&gb, buf, buf_size*8); // parse

1 0

[soc]: r1983 - aac/aac.c
by andoma 06 Mar '08

06 Mar '08

Author: andoma Date: Thu Mar 6 10:51:56 2008 New Revision: 1983 Log: Remove (more or less) unused member in the ics struct. Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Thu Mar 6 10:51:56 2008 @@ -170,7 +170,6 @@ typedef struct { int window_sequence; int window_shape; ///< If set, use Kaiser-Bessel window, otherwise use a sinus window int window_shape_prev; - int predictor; ///< XXX: Remove this int num_window_groups; uint8_t grouping; uint8_t group_len[8]; @@ -1074,8 +1073,7 @@ static int ics_info(AACContext * ac, Get ics->num_swb = ac->num_swb_1024; ics->num_windows = 1; ics->tns_max_bands = ac->tns_max_bands_1024; - ics->predictor = get_bits1(gb); - if (ics->predictor) { + if (get_bits1(gb)) { #ifdef AAC_LTP if (ac->audioObjectType == AOT_AAC_MAIN) { assert(0);

1 0

[soc]: r1982 - aac/aac.c
by andoma 06 Mar '08

06 Mar '08

Author: andoma Date: Thu Mar 6 10:51:08 2008 New Revision: 1982 Log: Add doxygen compatible comments. Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Thu Mar 6 10:51:08 2008 @@ -145,10 +145,10 @@ typedef struct { int lfe_type[MAX_TAGID]; int cc_type[MAX_TAGID]; - int mono_mixdown; //< The SCE tag to use if user requests mono output, -1 if not available - int stereo_mixdown; //< The CPE tag to use if user requests stereo output, -1 if not available - int mixdown_coeff_index; //< 0-3 - int pseudo_surround; //< Mix surround channels out of phase + int mono_mixdown; ///< The SCE tag to use if user requests mono output, -1 if not available + int stereo_mixdown; ///< The CPE tag to use if user requests stereo output, -1 if not available + int mixdown_coeff_index; ///< 0-3 + int pseudo_surround; ///< Mix surround channels out of phase } program_config_struct; @@ -159,15 +159,18 @@ typedef struct { int used[MAX_LTP_LONG_SFB]; } ltp_struct; +/** + * Individual Channel Stream + */ typedef struct { int intensity_present; int noise_present; int max_sfb; int window_sequence; - int window_shape; + int window_shape; ///< If set, use Kaiser-Bessel window, otherwise use a sinus window int window_shape_prev; - int predictor; + int predictor; ///< XXX: Remove this int num_window_groups; uint8_t grouping; uint8_t group_len[8]; @@ -239,41 +242,54 @@ typedef struct { float buf[4][24]; } ssr_struct; +/** + * Coupling parameters + */ typedef struct { - int ind_sw; - int domain; + int ind_sw; ///< Set if independant coupling (i.e. after IMDCT) + int domain; ///< Controls if coupling is performed before (0) or after (1) the TNS decoding of the target channels - int num_coupled; - int is_cpe[9]; - int tag_select[9]; - int l[9]; - int r[9]; + + int num_coupled; ///< Number of target elements + int is_cpe[9]; ///< Set if target is an CPE (otherwise it's an SCE) + int tag_select[9]; ///< Element tag index + int l[9]; ///< Apply gain to left channel of an CPE + int r[9]; ///< Apply gain to right channel of an CPE float gain[18][8][64]; } coupling_struct; -// individual channel element + +/** + * Single Channel Element + * Used for both SCE and LFE elements + */ typedef struct { int global_gain; float mixing_gain; ics_struct ics; tns_struct tns; - int cb[8][64]; // codebooks - float sf[8][64]; - DECLARE_ALIGNED_16(float, coeffs[1024]); - DECLARE_ALIGNED_16(float, saved[1024]); - DECLARE_ALIGNED_16(float, ret[1024]); + int cb[8][64]; ///< Codebooks + float sf[8][64]; ///< Scalefactors + DECLARE_ALIGNED_16(float, coeffs[1024]); ///< Coefficients for IMDCT + DECLARE_ALIGNED_16(float, saved[1024]); ///< Overlap + DECLARE_ALIGNED_16(float, ret[1024]); ///< PCM output int16_t *ltp_state; ssr_struct *ssr; } sce_struct; -// channel element +/** + * Channel Pair Element + */ typedef struct { - int common_window; + int common_window; ///< Set if channels share a common 'ics_struct' in bitstream ms_struct ms; sce_struct ch[2]; } cpe_struct; +/** + * Channel Coupling + */ typedef struct { coupling_struct coup; sce_struct ch; @@ -322,11 +338,11 @@ typedef struct { DECLARE_ALIGNED_16(float, intensity_tab[256]); DECLARE_ALIGNED_16(float, ivquant_tab[256]); DECLARE_ALIGNED_16(float, revers[1024]); - float* interleaved_output; - float *output_data[MAX_CHANNELS]; - sce_struct *mm_center; //< Center SCE to use for matrix mixdown - cpe_struct *mm_front; //< Front CPE to use for matrix mixdown - cpe_struct *mm_back; //< Back CPE to use for matrix mixdown + float* interleaved_output; ///< Interim buffer for interleaving PCM samples + float *output_data[MAX_CHANNELS]; ///< Points to each channels 'ret' buffer (PCM output) + sce_struct *mm_center; ///< Center SCE to use for matrix mixdown + cpe_struct *mm_front; ///< Front CPE to use for matrix mixdown + cpe_struct *mm_back; ///< Back CPE to use for matrix mixdown MDCTContext mdct; MDCTContext mdct_small;

1 0

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

05 Mar '08

Author: andoma Date: Wed Mar 5 17:05:05 2008 New Revision: 1981 Log: Vertical alignment Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Wed Mar 5 17:05:05 2008 @@ -945,12 +945,12 @@ static int aac_decode_init(AVCodecContex // general init ac->num_frame = -1; - ac->swb_offset_1024 = swb_offset_1024[ac->sampling_index]; - ac->num_swb_1024 = num_swb_1024[ac->sampling_index]; - ac->tns_max_bands_1024 = tns_max_bands_1024[ac->sampling_index]; - ac->swb_offset_128 = swb_offset_128[ac->sampling_index]; - ac->num_swb_128 = num_swb_128[ac->sampling_index]; - ac->tns_max_bands_128 = tns_max_bands_128[ac->sampling_index]; + ac->swb_offset_1024 = swb_offset_1024 [ac->sampling_index]; + ac->num_swb_1024 = num_swb_1024 [ac->sampling_index]; + ac->tns_max_bands_1024 = tns_max_bands_1024 [ac->sampling_index]; + ac->swb_offset_128 = swb_offset_128 [ac->sampling_index]; + ac->num_swb_128 = num_swb_128 [ac->sampling_index]; + ac->tns_max_bands_128 = tns_max_bands_128 [ac->sampling_index]; if(init_vlc(&ac->mainvlc, 7, sizeof(code)/sizeof(code[0]), bits, sizeof(bits[0]), sizeof(bits[0]), @@ -1762,8 +1762,8 @@ static void tns_trans(AACContext * ac, s #ifdef AAC_LTP static void window_ltp_tool(AACContext * ac, sce_struct * sce, float * in, float * out) { ics_struct * ics = &sce->ics; - const float * lwindow = ics->window_shape ? ac->kbd_long_1024 : ac->sine_long_1024; - const float * swindow = ics->window_shape ? ac->kbd_short_128 : ac->sine_short_128; + const float * lwindow = ics->window_shape ? ac->kbd_long_1024 : ac->sine_long_1024; + const float * swindow = ics->window_shape ? ac->kbd_short_128 : ac->sine_short_128; const float * lwindow_prev = ics->window_shape_prev ? ac->kbd_long_1024 : ac->sine_long_1024; const float * swindow_prev = ics->window_shape_prev ? ac->kbd_short_128 : ac->sine_short_128; float * buf = ac->buf_mdct; @@ -1853,8 +1853,8 @@ static void window_trans(AACContext * ac float * in = sce->coeffs; float * out = sce->ret; float * saved = sce->saved; - const float * lwindow = ics->window_shape ? ac->kbd_long_1024 : ac->sine_long_1024; - const float * swindow = ics->window_shape ? ac->kbd_short_128 : ac->sine_short_128; + const float * lwindow = ics->window_shape ? ac->kbd_long_1024 : ac->sine_long_1024; + const float * swindow = ics->window_shape ? ac->kbd_short_128 : ac->sine_short_128; const float * lwindow_prev = ics->window_shape_prev ? ac->kbd_long_1024 : ac->sine_long_1024; const float * swindow_prev = ics->window_shape_prev ? ac->kbd_short_128 : ac->sine_short_128; float * buf = ac->buf_mdct; @@ -1905,8 +1905,8 @@ static void window_trans(AACContext * ac #ifdef AAC_SSR static void window_ssr_tool(AACContext * ac, sce_struct * sce, float * in, float * out) { ics_struct * ics = &sce->ics; - const float * lwindow = ics->window_shape ? ac->kbd_long_1024 : ac->sine_long_1024; - const float * swindow = ics->window_shape ? ac->kbd_short_128 : ac->sine_short_128; + const float * lwindow = ics->window_shape ? ac->kbd_long_1024 : ac->sine_long_1024; + const float * swindow = ics->window_shape ? ac->kbd_short_128 : ac->sine_short_128; const float * lwindow_prev = ics->window_shape_prev ? ac->kbd_long_1024 : ac->sine_long_1024; const float * swindow_prev = ics->window_shape_prev ? ac->kbd_short_128 : ac->sine_short_128; float * buf = ac->buf_mdct;

1 0

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

05 Mar '08

Author: andoma Date: Wed Mar 5 17:02:28 2008 New Revision: 1980 Log: Remove superfluous parentheses. Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Wed Mar 5 17:02:28 2008 @@ -839,7 +839,7 @@ static int AudioSpecificConfig(AACContex ac->sbr_present ? "SBR+" : "", ac->audioObjectType); return -1; } - if ((ac->ext_audioObjectType != 5) && (8 * data_size - get_bits_count(&gb) >= 16)) { + if (ac->ext_audioObjectType != 5 && 8 * data_size - get_bits_count(&gb) >= 16) { if (get_bits(&gb, 11) == 0x2b7) { // syncExtensionType ac->ext_audioObjectType = GetAudioObjectType(&gb); if (ac->ext_audioObjectType == AOT_SBR) { @@ -1186,12 +1186,12 @@ static void pulse_data(AACContext * ac, static void tns_data(AACContext * ac, GetBitContext * gb, const ics_struct * ics, tns_struct * tns) { int w, filt, i, coef_len, coef_res = 0, coef_compress; for (w = 0; w < ics->num_windows; w++) { - tns->n_filt[w] = get_bits(gb, (ics->window_sequence == EIGHT_SHORT_SEQUENCE) ? 1 : 2); + tns->n_filt[w] = get_bits(gb, ics->window_sequence == EIGHT_SHORT_SEQUENCE ? 1 : 2); if (tns->n_filt[w]) coef_res = get_bits1(gb) + 3; for (filt = 0; filt < tns->n_filt[w]; filt++) { - tns->length[w][filt] = get_bits(gb, (ics->window_sequence == EIGHT_SHORT_SEQUENCE) ? 4 : 6); - if ((tns->order[w][filt] = get_bits(gb, (ics->window_sequence == EIGHT_SHORT_SEQUENCE) ? 3 : 5))) { + tns->length[w][filt] = get_bits(gb, ics->window_sequence == EIGHT_SHORT_SEQUENCE ? 4 : 6); + if ((tns->order[w][filt] = get_bits(gb, ics->window_sequence == EIGHT_SHORT_SEQUENCE ? 3 : 5))) { tns->direction[w][filt] = get_bits1(gb); coef_compress = get_bits1(gb); coef_len = coef_res - coef_compress; @@ -1263,9 +1263,9 @@ static int spectral_data(AACContext * ac for (g = 0; g < ics->num_window_groups; g++) { for (i = 0; i < ics->max_sfb; i++) { const int cur_cb = cb[g][i]; - const int dim = (cur_cb >= FIRST_PAIR_HCB) ? 2 : 4; + const int dim = cur_cb >= FIRST_PAIR_HCB ? 2 : 4; int group; - if ((cur_cb == INTENSITY_HCB2) || (cur_cb == INTENSITY_HCB)) { + if (cur_cb == INTENSITY_HCB2 || cur_cb == INTENSITY_HCB) { continue; } if (cur_cb == NOISE_HCB) { @@ -1459,7 +1459,7 @@ static void intensity_tool(AACContext * for (g = 0; g < ics->num_window_groups; g++) { for (gp = 0; gp < ics->group_len[g]; gp++) { for (i = 0; i < ics->max_sfb; i++) { - if ((sce1->cb[g][i] == INTENSITY_HCB) || (sce1->cb[g][i] == INTENSITY_HCB2)) { + if (sce1->cb[g][i] == INTENSITY_HCB || sce1->cb[g][i] == INTENSITY_HCB2) { c = (-1 + 2 * (sce1->cb[g][i] - 14)); if (cpe->ms.present) c *= (1 - 2 * cpe->ms.mask[g][i]); @@ -1762,10 +1762,10 @@ static void tns_trans(AACContext * ac, s #ifdef AAC_LTP static void window_ltp_tool(AACContext * ac, sce_struct * sce, float * in, float * out) { ics_struct * ics = &sce->ics; - const float * lwindow = (ics->window_shape) ? ac->kbd_long_1024 : ac->sine_long_1024; - const float * swindow = (ics->window_shape) ? ac->kbd_short_128 : ac->sine_short_128; - const float * lwindow_prev = (ics->window_shape_prev) ? ac->kbd_long_1024 : ac->sine_long_1024; - const float * swindow_prev = (ics->window_shape_prev) ? ac->kbd_short_128 : ac->sine_short_128; + const float * lwindow = ics->window_shape ? ac->kbd_long_1024 : ac->sine_long_1024; + const float * swindow = ics->window_shape ? ac->kbd_short_128 : ac->sine_short_128; + const float * lwindow_prev = ics->window_shape_prev ? ac->kbd_long_1024 : ac->sine_long_1024; + const float * swindow_prev = ics->window_shape_prev ? ac->kbd_short_128 : ac->sine_short_128; float * buf = ac->buf_mdct; int i; assert(ics->window_sequence != EIGHT_SHORT_SEQUENCE); @@ -1800,7 +1800,7 @@ static void ltp_trans(AACContext * ac, s return; 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)) { + if (sce->ics.window_sequence != EIGHT_SHORT_SEQUENCE && ac->is_saved) { float x_est[2 * 1024], X_est[2 * 1024]; for (i = 0; i < 2 * 1024; i++) x_est[i] = (float)sce->ltp_state[i + 2 * 1024 - ltp->lag] * ltp->coef; @@ -1853,10 +1853,10 @@ static void window_trans(AACContext * ac float * in = sce->coeffs; float * out = sce->ret; float * saved = sce->saved; - const float * lwindow = (ics->window_shape) ? ac->kbd_long_1024 : ac->sine_long_1024; - const float * swindow = (ics->window_shape) ? ac->kbd_short_128 : ac->sine_short_128; - const float * lwindow_prev = (ics->window_shape_prev) ? ac->kbd_long_1024 : ac->sine_long_1024; - const float * swindow_prev = (ics->window_shape_prev) ? ac->kbd_short_128 : ac->sine_short_128; + const float * lwindow = ics->window_shape ? ac->kbd_long_1024 : ac->sine_long_1024; + const float * swindow = ics->window_shape ? ac->kbd_short_128 : ac->sine_short_128; + const float * lwindow_prev = ics->window_shape_prev ? ac->kbd_long_1024 : ac->sine_long_1024; + const float * swindow_prev = ics->window_shape_prev ? ac->kbd_short_128 : ac->sine_short_128; float * buf = ac->buf_mdct; int i; @@ -1905,10 +1905,10 @@ static void window_trans(AACContext * ac #ifdef AAC_SSR static void window_ssr_tool(AACContext * ac, sce_struct * sce, float * in, float * out) { ics_struct * ics = &sce->ics; - const float * lwindow = (ics->window_shape) ? ac->kbd_long_1024 : ac->sine_long_1024; - const float * swindow = (ics->window_shape) ? ac->kbd_short_128 : ac->sine_short_128; - const float * lwindow_prev = (ics->window_shape_prev) ? ac->kbd_long_1024 : ac->sine_long_1024; - const float * swindow_prev = (ics->window_shape_prev) ? ac->kbd_short_128 : ac->sine_short_128; + const float * lwindow = ics->window_shape ? ac->kbd_long_1024 : ac->sine_long_1024; + const float * swindow = ics->window_shape ? ac->kbd_short_128 : ac->sine_short_128; + const float * lwindow_prev = ics->window_shape_prev ? ac->kbd_long_1024 : ac->sine_long_1024; + const float * swindow_prev = ics->window_shape_prev ? ac->kbd_short_128 : ac->sine_short_128; float * buf = ac->buf_mdct; if (ics->window_sequence != EIGHT_SHORT_SEQUENCE) { int i;

1 0

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

05 Mar '08

Author: andoma Date: Wed Mar 5 16:37:56 2008 New Revision: 1979 Log: Spelling fixes. Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Wed Mar 5 16:37:56 2008 @@ -35,8 +35,8 @@ /** * 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. + * not compiled in. SSR files play without crashing but produce audible + * artifacts that seem to be related to EIGHT_SHORT_SEQUENCE windows. */ //#define AAC_SSR

1 0

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

05 Mar '08

Author: andoma Date: Wed Mar 5 16:30:49 2008 New Revision: 1978 Log: 'global_gain' and 'intensity' drives a table lookup and should therefore be unsigned. Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Wed Mar 5 16:30:49 2008 @@ -1129,9 +1129,9 @@ static int section_data(AACContext * ac, * Decode scale_factor_data * reference: Table 4.47 */ -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]) { +static int scale_factor_data(AACContext * ac, GetBitContext * gb, float mix_gain, unsigned 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 + unsigned int intensity = 100; // normalization for intensity_tab lookup table int noise = global_gain - 90; int noise_flag = 1; ics->intensity_present = 0; @@ -1143,7 +1143,7 @@ static int 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; - if(intensity & ~255) { + if(intensity > 255) { av_log(ac->avccontext, AV_LOG_ERROR, "Intensity (%d) out of range", intensity); return -1; @@ -1160,7 +1160,7 @@ static int 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; - if(global_gain & ~255) { + if(global_gain > 255) { av_log(ac->avccontext, AV_LOG_ERROR, "Global gain (%d) out of range", global_gain); return -1;

1 0