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

[soc]: r2947 - in aacenc: aacenc.c aacpsy.c aacpsy.h
by kostya 31 Jul '08

31 Jul '08

Author: kostya Date: Thu Jul 31 07:07:28 2008 New Revision: 2947 Log: Final (or at least release candidate) API for psychoacoustic model Modified: aacenc/aacenc.c aacenc/aacpsy.c aacenc/aacpsy.h Modified: aacenc/aacenc.c ============================================================================== --- aacenc/aacenc.c (original) +++ aacenc/aacenc.c Thu Jul 31 07:07:28 2008 @@ -38,19 +38,6 @@ DECLARE_ALIGNED_16(static float, sine_lo DECLARE_ALIGNED_16(static float, sine_short_128[128]); #include "aactab.h" -/** - * IDs for raw_data_block - */ -enum { - ID_SCE = 0x0, - ID_CPE, - ID_CCE, - ID_LFE, - ID_DSE, - ID_PCE, - ID_FIL, - ID_END -}; static const uint8_t swb_size_1024_96[] = { 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 8, 8, 8, 8, 8, @@ -243,7 +230,7 @@ static av_cold int aac_encode_init(AVCod s->cpe = av_mallocz(sizeof(ChannelElement) * ((avctx->channels + 1) >> 1)); //TODO: psy model selection with some option - ff_aac_psy_init(&s->psy, avctx, AAC_PSY_3GPP, 0, s->swb_sizes1024, s->swb_num1024, s->swb_sizes128, s->swb_num128); + ff_aac_psy_init(&s->psy, avctx, AAC_PSY_3GPP, (avctx->channels + 1) >> 1, 0, s->swb_sizes1024, s->swb_num1024, s->swb_sizes128, s->swb_num128); avctx->extradata = av_malloc(2); avctx->extradata_size = 2; put_audio_specific_config(avctx); @@ -698,7 +685,7 @@ static int aac_encode_frame(AVCodecConte AACEncContext *s = avctx->priv_data; int16_t *samples = s->samples, *samples2; ChannelElement *cpe; - int i, j, chans; + int i, j, chans, tag; if(!samples){ s->samples = av_malloc(1024 * avctx->channels * sizeof(s->samples[0])); @@ -718,14 +705,15 @@ static int aac_encode_frame(AVCodecConte }*/ for(i = 0; i < avctx->channels; i += 2){ chans = FFMIN(avctx->channels - i, 2); - cpe = &s->cpe[i/2]; + tag = chans > 1 ? ID_CPE : ID_SCE; + cpe = &s->cpe[(i + 1)/2]; samples2 = samples + i; - ff_aac_psy_suggest_window(&s->psy, samples2, data, i, cpe); + ff_aac_psy_suggest_window(&s->psy, samples2, data, (i + 1) >> 1, tag, cpe); for(j = 0; j < chans; j++){ analyze(avctx, s, cpe, samples2, j); } - ff_aac_psy_analyze(&s->psy, i, cpe); - put_bits(&s->pb, 3, chans > 1 ? ID_CPE : ID_SCE); + ff_aac_psy_analyze(&s->psy, (i + 1) >> 1, tag, cpe); + put_bits(&s->pb, 3, tag); put_bits(&s->pb, 4, i >> 1); if(chans == 2){ put_bits(&s->pb, 1, cpe->common_window); Modified: aacenc/aacpsy.c ============================================================================== --- aacenc/aacpsy.c (original) +++ aacenc/aacpsy.c Thu Jul 31 07:07:28 2008 @@ -76,12 +76,11 @@ static inline float calc_distortion(floa /** * Produce integer coefficients from scalefactors provided by model. */ -static void psy_create_output(AACPsyContext *apc, ChannelElement *cpe, int channel, int search_pulses) +static void psy_create_output(AACPsyContext *apc, ChannelElement *cpe, int chans, int search_pulses) { int i, w, w2, g, ch; int start, sum, maxsfb, cmaxsfb; int pulses, poff[4], pamp[4]; - int chans = FFMIN(apc->avctx->channels - channel, 2); for(ch = 0; ch < chans; ch++){ start = 0; @@ -155,7 +154,7 @@ static void psy_create_output(AACPsyCont } } - if(apc->avctx->channels - channel > 1 && cpe->common_window){ + if(chans > 1 && cpe->common_window){ int msc = 0; cpe->ch[0].ics.max_sfb = FFMAX(cpe->ch[0].ics.max_sfb, cpe->ch[1].ics.max_sfb); cpe->ch[1].ics.max_sfb = cpe->ch[0].ics.max_sfb; @@ -167,10 +166,10 @@ static void psy_create_output(AACPsyCont } } -static void psy_null_window(AACPsyContext *apc, int16_t *audio, int16_t *la, int channel, ChannelElement *cpe) +static void psy_null_window(AACPsyContext *apc, int16_t *audio, int16_t *la, int tag, int type, ChannelElement *cpe) { int ch; - int chans = FFMIN(apc->avctx->channels - channel, 2); + int chans = type == ID_CPE ? 2 : 1; for(ch = 0; ch < chans; ch++){ cpe->ch[ch].ics.window_sequence = ONLY_LONG_SEQUENCE; @@ -183,12 +182,12 @@ static void psy_null_window(AACPsyContex cpe->common_window = cpe->ch[0].ics.use_kb_window[0] == cpe->ch[1].ics.use_kb_window[0]; } -static void psy_null_process(AACPsyContext *apc, int channel, ChannelElement *cpe) +static void psy_null_process(AACPsyContext *apc, int tag, int type, ChannelElement *cpe) { int start; int ch, g, i; int minscale; - int chans = FFMIN(apc->avctx->channels - channel, 2); + int chans = type == ID_CPE ? 2 : 1; for(ch = 0; ch < chans; ch++){ start = 0; @@ -222,13 +221,13 @@ static void psy_null_process(AACPsyConte if(!cpe->ch[ch].zeroes[0][g]) cpe->ch[ch].sf_idx[0][g] = FFMIN(minscale + SCALE_MAX_DIFF, cpe->ch[ch].sf_idx[0][g]); } - psy_create_output(apc, cpe, channel, 1); + psy_create_output(apc, cpe, chans, 1); } -static void psy_null8_window(AACPsyContext *apc, int16_t *audio, int16_t *la, int channel, ChannelElement *cpe) +static void psy_null8_window(AACPsyContext *apc, int16_t *audio, int16_t *la, int tag, int type, ChannelElement *cpe) { int ch, i; - int chans = FFMIN(apc->avctx->channels - channel, 2); + int chans = type == ID_CPE ? 2 : 1; for(ch = 0; ch < chans; ch++){ int prev_seq = cpe->ch[ch].ics.window_sequence_prev; @@ -259,11 +258,11 @@ static void psy_null8_window(AACPsyConte cpe->common_window = cpe->ch[0].ics.use_kb_window[0] == cpe->ch[1].ics.use_kb_window[0]; } -static void psy_null8_process(AACPsyContext *apc, int channel, ChannelElement *cpe) +static void psy_null8_process(AACPsyContext *apc, int tag, int type, ChannelElement *cpe) { int start; int w, ch, g, i; - int chans = FFMIN(apc->avctx->channels - channel, 2); + int chans = type == ID_CPE ? 2 : 1; //detect M/S if(chans > 1 && cpe->common_window){ @@ -287,7 +286,7 @@ static void psy_null8_process(AACPsyCont } } } - psy_create_output(apc, cpe, channel, 0); + psy_create_output(apc, cpe, chans, 0); } /** @@ -379,7 +378,7 @@ static inline float ath(float f, float a + (0.6 + 0.04 * add) * 0.001 * f * f * f * f; } -static av_cold int psy_3gpp_init(AACPsyContext *apc) +static av_cold int psy_3gpp_init(AACPsyContext *apc, int elements) { Psy3gppContext *pctx; int i, g, start; @@ -458,10 +457,10 @@ static const uint8_t window_grouping[9] * Tell encoder which window types to use. * @see 3GPP TS26.403 5.4.1 */ -static void psy_3gpp_window(AACPsyContext *apc, int16_t *audio, int16_t *la, int channel, ChannelElement *cpe) +static void psy_3gpp_window(AACPsyContext *apc, int16_t *audio, int16_t *la, int tag, int type, ChannelElement *cpe) { int ch; - int chans = FFMIN(apc->avctx->channels - channel, 2); + int chans = type == ID_CPE ? 2 : 1; int i, j; int br = apc->avctx->bit_rate / apc->avctx->channels; int attack_ratio = (br <= 16000 + 8000*chans) ? 18 : 10; @@ -577,7 +576,7 @@ static void calc_pe(Psy3gppBand *band, i * Determine scalefactors and prepare coefficients for encoding. * @see 3GPP TS26.403 5.4 */ -static void psy_3gpp_process(AACPsyContext *apc, int channel, ChannelElement *cpe) +static void psy_3gpp_process(AACPsyContext *apc, int tag, int type, ChannelElement *cpe) { int start; int ch, w, w2, g, g2, i; @@ -585,7 +584,7 @@ static void psy_3gpp_process(AACPsyConte Psy3gppContext *pctx = (Psy3gppContext*) apc->model_priv_data; float stereo_att, pe_target; int bits_avail; - const int chans = FFMIN(apc->avctx->channels - channel, 2); + int chans = type == ID_CPE ? 2 : 1; Psy3gppChannel *pch = &pctx->ch; //calculate and apply stereo attenuation factor - 5.2 @@ -786,7 +785,7 @@ static void psy_3gpp_process(AACPsyConte } memcpy(pch->prev_band, pch->band, sizeof(pch->band)); - psy_create_output(apc, cpe, channel, 0); + psy_create_output(apc, cpe, chans, 0); } static av_cold void psy_3gpp_end(AACPsyContext *apc) @@ -819,7 +818,8 @@ static const AACPsyModel psy_models[AAC_ }, }; -int av_cold ff_aac_psy_init(AACPsyContext *ctx, AVCodecContext *avctx, int model, int flags, +int av_cold ff_aac_psy_init(AACPsyContext *ctx, AVCodecContext *avctx, + int model, int elements, int flags, const uint8_t *bands1024, int num_bands1024, const uint8_t *bands128, int num_bands128) { @@ -842,18 +842,18 @@ int av_cold ff_aac_psy_init(AACPsyContex ctx->model = &psy_models[model]; if(ctx->model->init) - return ctx->model->init(ctx); + return ctx->model->init(ctx, elements); return 0; } -void ff_aac_psy_suggest_window(AACPsyContext *ctx, int16_t *audio, int16_t *la, int channel, ChannelElement *cpe) +void ff_aac_psy_suggest_window(AACPsyContext *ctx, int16_t *audio, int16_t *la, int tag, int type, ChannelElement *cpe) { - ctx->model->window(ctx, audio, la, channel, cpe); + ctx->model->window(ctx, audio, la, tag, type, cpe); } -void ff_aac_psy_analyze(AACPsyContext *ctx, int channel, ChannelElement *cpe) +void ff_aac_psy_analyze(AACPsyContext *ctx, int tag, int type, ChannelElement *cpe) { - ctx->model->process(ctx, channel, cpe); + ctx->model->process(ctx, tag, type, cpe); } void av_cold ff_aac_psy_end(AACPsyContext *ctx) Modified: aacenc/aacpsy.h ============================================================================== --- aacenc/aacpsy.h (original) +++ aacenc/aacpsy.h Thu Jul 31 07:07:28 2008 @@ -45,6 +45,20 @@ enum WindowSequence { }; /** + * IDs for raw_data_block + */ +enum { + ID_SCE = 0x0, + ID_CPE, + ID_CCE, + ID_LFE, + ID_DSE, + ID_PCE, + ID_FIL, + ID_END +}; + +/** * special codebooks */ enum Codebook { @@ -184,17 +198,18 @@ typedef struct AACPsyContext { typedef struct AACPsyModel { const char *name; - int (*init) (AACPsyContext *apc); - void (*window) (AACPsyContext *apc, int16_t *audio, int16_t *la, int channel, ChannelElement *cpe); - void (*process)(AACPsyContext *apc,int channel, ChannelElement *cpe); + int (*init) (AACPsyContext *apc, int elements); + void (*window) (AACPsyContext *apc, int16_t *audio, int16_t *la, int tag, int type, ChannelElement *cpe); + void (*process)(AACPsyContext *apc, int tag, int type, ChannelElement *cpe); void (*end) (AACPsyContext *apc); }AACPsyModel; -int ff_aac_psy_init(AACPsyContext *ctx, AVCodecContext *avctx, int model, int flags, +int ff_aac_psy_init(AACPsyContext *ctx, AVCodecContext *avctx, + int model, int elements, int flags, const uint8_t *bands1024, int num_bands1024, const uint8_t *bands128, int num_bands128); -void ff_aac_psy_suggest_window(AACPsyContext *ctx, int16_t *audio, int16_t *la, int channel, ChannelElement *cpe); -void ff_aac_psy_analyze(AACPsyContext *ctx, int channel, ChannelElement *cpe); +void ff_aac_psy_suggest_window(AACPsyContext *ctx, int16_t *audio, int16_t *la, int tag, int type, ChannelElement *cpe); +void ff_aac_psy_analyze(AACPsyContext *ctx, int tag, int type, ChannelElement *cpe); void ff_aac_psy_end(AACPsyContext *ctx); #endif /* FFMPEG_AACPSY_H */

1 0

[soc]: r2945 - nellyenc/nellymoserenc.c
by bwolowiec 31 Jul '08

31 Jul '08

Author: bwolowiec Date: Wed Jul 30 23:06:37 2008 New Revision: 2945 Log: precalculate most used pow() values Modified: nellyenc/nellymoserenc.c Modified: nellyenc/nellymoserenc.c ============================================================================== --- nellyenc/nellymoserenc.c (original) +++ nellyenc/nellymoserenc.c Wed Jul 30 23:06:37 2008 @@ -24,6 +24,7 @@ #include "avcodec.h" #include "dsputil.h" +#define MAX_POW_CACHED (1<<15) /* * FIXME: Bitstream from vorbis_enc.c (move to seperate file?) @@ -81,6 +82,7 @@ typedef struct NellyMoserEncodeContext { DSPContext dsp; MDCTContext mdct_ctx; float pows[NELLY_FILL_LEN]; + float pow_table[MAX_POW_CACHED]; DECLARE_ALIGNED_16(float,mdct_tmp[NELLY_BUF_LEN*2]); DECLARE_ALIGNED_16(float,mdct_out[NELLY_BUF_LEN*2]); } NellyMoserEncodeContext; @@ -123,6 +125,8 @@ static av_cold int encode_init(AVCodecCo sine_window[255-i] = sine_window[i]; } } + for(i=0; i<MAX_POW_CACHED; i++) + s->pow_table[i] = -pow(2, -i/2048.0 - 3.0); s->bufsize = 0; return 0; @@ -203,7 +207,11 @@ static void encode_block(NellyMoserEncod val = ff_nelly_init_table[bk]; } - pval = -pow(2, -val/2048.0 - 3.0); + if(val >= 0 && val < MAX_POW_CACHED){ + pval = s->pow_table[val]; + }else{ + pval = -pow(2, -val/2048.0 - 3.0); + } for (k = 0; k < ff_nelly_band_sizes_table[i]; k++) { s->mdct_out[j+k] *= pval; s->mdct_out[j+k+NELLY_BUF_LEN] *= pval;

2 1

[soc]: r2946 - aac/aac.c
by superdump 31 Jul '08

31 Jul '08

Author: superdump Date: Thu Jul 31 01:38:53 2008 New Revision: 2946 Log: Prevent out of bounds array access in TemporalNoiseShaping.coef[][][] by checking the TNS filter order Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Thu Jul 31 01:38:53 2008 @@ -1176,9 +1176,10 @@ static void decode_pulses(AACContext * a /** * Decode Temporal Noise Shaping data; reference: table 4.48. */ -static void decode_tns(AACContext * ac, GetBitContext * gb, const IndividualChannelStream * ics, TemporalNoiseShaping * tns) { +static int decode_tns(AACContext * ac, GetBitContext * gb, const IndividualChannelStream * ics, TemporalNoiseShaping * tns) { int w, filt, i, coef_len, coef_res = 0, coef_compress; const int is8 = ics->window_sequence[0] == EIGHT_SHORT_SEQUENCE; + const int tns_max_order = is8 ? 7 : ac->m4ac.object_type == AOT_AAC_MAIN ? 20 : 12; for (w = 0; w < ics->num_windows; w++) { tns->n_filt[w] = get_bits(gb, 2 - is8); @@ -1188,7 +1189,7 @@ static void decode_tns(AACContext * ac, for (filt = 0; filt < tns->n_filt[w]; filt++) { tns->length[w][filt] = get_bits(gb, 6 - 2*is8); - if ((tns->order[w][filt] = get_bits(gb, 5 - 2*is8))) { + if ((tns->order[w][filt] = get_bits(gb, 5 - 2*is8)) <= tns_max_order) { tns->direction[w][filt] = get_bits1(gb); coef_compress = get_bits1(gb); coef_len = coef_res - coef_compress; @@ -1196,9 +1197,15 @@ static void decode_tns(AACContext * ac, for (i = 0; i < tns->order[w][filt]; i++) tns->coef[w][filt][i] = get_bits(gb, coef_len); + } else { + av_log(ac->avccontext, "TNS filter order %d is greater than maximum %d.", + tns->order[w][filt], tns_max_order); + tns->order[w][filt] = 0; + return -1; } } } + return 0; } #ifdef AAC_SSR @@ -1404,8 +1411,8 @@ static int decode_ics(AACContext * ac, G } decode_pulses(ac, gb, &pulse); } - if ((tns->present = get_bits1(gb))) - decode_tns(ac, gb, ics, tns); + if ((tns->present = get_bits1(gb)) && decode_tns(ac, gb, ics, tns)) + return -1; if (get_bits1(gb)) { #ifdef AAC_SSR int ret;

1 0

[soc]: r2918 - aac/aac.c
by superdump 31 Jul '08

31 Jul '08

Author: superdump Date: Wed Jul 30 14:29:52 2008 New Revision: 2918 Log: Refactor program_config_element*() to remove memset(pcs, 0, ...) and output_configure() Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Wed Jul 30 14:29:52 2008 @@ -619,12 +619,9 @@ static void program_config_element_parse /** * Parse program configuration element; reference: table 4.2. */ -static int program_config_element(AACContext * ac, GetBitContext * gb) { - ProgramConfig pcs; +static int program_config_element(AACContext * ac, GetBitContext * gb, ProgramConfig *newpcs) { int num_front, num_side, num_back, num_lfe, num_assoc_data, num_cc; - memset(&pcs, 0, sizeof(pcs)); - skip_bits(gb, 2); // object_type ac->m4ac.sampling_index = get_bits(gb, 4); @@ -640,43 +637,39 @@ static int program_config_element(AACCon num_assoc_data = get_bits(gb, 3); num_cc = get_bits(gb, 4); - pcs.mono_mixdown_tag = get_bits1(gb) ? get_bits(gb, 4) : -1; - pcs.stereo_mixdown_tag = get_bits1(gb) ? get_bits(gb, 4) : -1; + newpcs->mono_mixdown_tag = get_bits1(gb) ? get_bits(gb, 4) : -1; + newpcs->stereo_mixdown_tag = get_bits1(gb) ? get_bits(gb, 4) : -1; if (get_bits1(gb)) { - pcs.mixdown_coeff_index = get_bits(gb, 2); - pcs.pseudo_surround = get_bits1(gb); + newpcs->mixdown_coeff_index = get_bits(gb, 2); + newpcs->pseudo_surround = get_bits1(gb); } - program_config_element_parse_tags(gb, pcs.che_type[ID_CPE], pcs.che_type[ID_SCE], num_front, AAC_CHANNEL_FRONT); - program_config_element_parse_tags(gb, pcs.che_type[ID_CPE], pcs.che_type[ID_SCE], num_side, AAC_CHANNEL_SIDE ); - program_config_element_parse_tags(gb, pcs.che_type[ID_CPE], pcs.che_type[ID_SCE], num_back, AAC_CHANNEL_BACK ); - program_config_element_parse_tags(gb, NULL, pcs.che_type[ID_LFE], num_lfe, AAC_CHANNEL_LFE ); + program_config_element_parse_tags(gb, newpcs->che_type[ID_CPE], newpcs->che_type[ID_SCE], num_front, AAC_CHANNEL_FRONT); + program_config_element_parse_tags(gb, newpcs->che_type[ID_CPE], newpcs->che_type[ID_SCE], num_side, AAC_CHANNEL_SIDE ); + program_config_element_parse_tags(gb, newpcs->che_type[ID_CPE], newpcs->che_type[ID_SCE], num_back, AAC_CHANNEL_BACK ); + program_config_element_parse_tags(gb, NULL, newpcs->che_type[ID_LFE], num_lfe, AAC_CHANNEL_LFE ); skip_bits_long(gb, 4 * num_assoc_data); - program_config_element_parse_tags(gb, pcs.che_type[ID_CCE], pcs.che_type[ID_CCE], num_cc, AAC_CHANNEL_CC ); + program_config_element_parse_tags(gb, newpcs->che_type[ID_CCE], newpcs->che_type[ID_CCE], num_cc, AAC_CHANNEL_CC ); align_get_bits(gb); /* comment field, first byte is length */ skip_bits_long(gb, 8 * get_bits(gb, 8)); - return output_configure(ac, &pcs); + return 0; } /** * Set up ProgramConfig, but based on a default channel configuration * as specified in table 1.17. */ -static int program_config_element_default(AACContext *ac, int channels) +static int program_config_element_default(AACContext *ac, int channels, ProgramConfig *newpcs) { - ProgramConfig pcs; - - memset(&pcs, 0, sizeof(ProgramConfig)); - /* Pre-mixed down-mix outputs are not available. */ - pcs.mono_mixdown_tag = -1; - pcs.stereo_mixdown_tag = -1; + newpcs->mono_mixdown_tag = -1; + newpcs->stereo_mixdown_tag = -1; if(channels < 1 || channels > 7) { av_log(ac->avccontext, AV_LOG_ERROR, "invalid default channel configuration (%d channels)\n", @@ -696,20 +689,20 @@ static int program_config_element_defaul */ if(channels != 2) - pcs.che_type[ID_SCE][0] = AAC_CHANNEL_FRONT; // front center (or mono) + newpcs->che_type[ID_SCE][0] = AAC_CHANNEL_FRONT; // front center (or mono) if(channels > 1) - pcs.che_type[ID_CPE][0] = AAC_CHANNEL_FRONT; // L + R (or stereo) + newpcs->che_type[ID_CPE][0] = AAC_CHANNEL_FRONT; // L + R (or stereo) if(channels == 4) - pcs.che_type[ID_SCE][1] = AAC_CHANNEL_BACK; // back center + newpcs->che_type[ID_SCE][1] = AAC_CHANNEL_BACK; // back center if(channels > 4) - pcs.che_type[ID_CPE][(channels == 7) + 1] + newpcs->che_type[ID_CPE][(channels == 7) + 1] = AAC_CHANNEL_BACK; // back stereo if(channels > 5) - pcs.che_type[ID_LFE][0] = AAC_CHANNEL_LFE; // LFE + newpcs->che_type[ID_LFE][0] = AAC_CHANNEL_LFE; // LFE if(channels == 7) - pcs.che_type[ID_CPE][1] = AAC_CHANNEL_FRONT; // outer front left + outer front right + newpcs->che_type[ID_CPE][1] = AAC_CHANNEL_FRONT; // outer front left + outer front right - return output_configure(ac, &pcs); + return 0; } @@ -717,6 +710,7 @@ static int program_config_element_defaul * Parse GA "General Audio" specific configuration; reference: table 4.1. */ static int ga_specific_config(AACContext * ac, GetBitContext * gb, int channels) { + ProgramConfig newpcs; int extension_flag, ret; if(get_bits1(gb)) { // frameLengthFlag @@ -732,14 +726,17 @@ static int ga_specific_config(AACContext ac->m4ac.object_type == AOT_ER_AAC_SCALABLE) skip_bits(gb, 3); // layerNr + memset(&newpcs, 0, sizeof(ProgramConfig)); if (channels == 0) { skip_bits(gb, 4); // element_instance_tag - if((ret = program_config_element(ac, gb))) + if((ret = program_config_element(ac, gb, &newpcs))) return ret; } else { - if((ret = program_config_element_default(ac, channels))) + if((ret = program_config_element_default(ac, channels, &newpcs))) return ret; } + if((ret = output_configure(ac, &newpcs))) + return ret; if (extension_flag) { switch (ac->m4ac.object_type) { @@ -2281,8 +2278,14 @@ static int aac_decode_frame(AVCodecConte break; case ID_PCE: - err = program_config_element(ac, &gb); + { + ProgramConfig newpcs; + memset(&newpcs, 0, sizeof(ProgramConfig)); + if((err = program_config_element(ac, &gb, &newpcs))) + break; + err = output_configure(ac, &newpcs); break; + } case ID_DSE: data_stream_element(ac, &gb);

3 2

[soc]: r2944 - nellyenc/nellymoserenc.c
by bwolowiec 30 Jul '08

30 Jul '08

Author: bwolowiec Date: Wed Jul 30 22:58:37 2008 New Revision: 2944 Log: change type of val from float to int Modified: nellyenc/nellymoserenc.c Modified: nellyenc/nellymoserenc.c ============================================================================== --- nellyenc/nellymoserenc.c (original) +++ nellyenc/nellymoserenc.c Wed Jul 30 22:58:37 2008 @@ -163,7 +163,7 @@ static void encode_block(NellyMoserEncod int bits[NELLY_BUF_LEN]; int i, j, k, l, b; int bs, bk; - float val=0; + int val=0; float pval; float tmp, stmp; @@ -203,7 +203,7 @@ static void encode_block(NellyMoserEncod val = ff_nelly_init_table[bk]; } - pval = -pow(2, -val/2048 - 3.0); + pval = -pow(2, -val/2048.0 - 3.0); for (k = 0; k < ff_nelly_band_sizes_table[i]; k++) { s->mdct_out[j+k] *= pval; s->mdct_out[j+k+NELLY_BUF_LEN] *= pval;

1 0

[soc]: r2943 - aac/aac.c
by superdump 30 Jul '08

30 Jul '08

Author: superdump Date: Wed Jul 30 22:47:25 2008 New Revision: 2943 Log: Prevent security issues for invalid values being written to the context and later used for max_sfb and num_swb Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Wed Jul 30 22:47:25 2008 @@ -998,6 +998,8 @@ static int decode_ics_info(AACContext * av_log(ac->avccontext, AV_LOG_ERROR, "Number of scalefactor bands in group (%d) exceeds limit (%d).\n", ics->max_sfb, ics->num_swb); + ics->max_sfb = 0; + ics->num_swb = 0; return -1; }

1 0

[soc]: r2942 - aac/aac.c
by superdump 30 Jul '08

30 Jul '08

Author: superdump Date: Wed Jul 30 22:34:56 2008 New Revision: 2942 Log: Merge initial for() loop into while() loop in decode_drc_channel_exclusions() Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Wed Jul 30 22:34:56 2008 @@ -279,7 +279,7 @@ typedef struct { int dyn_rng_sgn[17]; ///< DRC sign information; 0 - positive, 1 - negative int dyn_rng_ctl[17]; ///< DRC magnitude information int exclude_mask[MAX_CHANNELS]; ///< Channels to be excluded from DRC processing. - int additional_excluded_chns[MAX_CHANNELS]; /**< The exclude_mask bits are + int additional_excluded_chns[MAX_CHANNELS / 7]; /**< The exclude_mask bits are coded in groups of 7 with 1 bit preceeding each group (except the first) indicating that 7 more mask bits are coded. */ int band_incr; ///< Number of DRC bands greater than 1 having DRC info. @@ -1616,19 +1616,16 @@ static int decode_sbr_extension(AACConte */ static int decode_drc_channel_exclusions(AACContext * ac, GetBitContext * gb) { int i; - int n = 1; - int num_excl_chan = 7; - - for (i = 0; i < 7; i++) - ac->che_drc.exclude_mask[i] = get_bits1(gb); + int n = 0; + int num_excl_chan = 0; - while (n <= MAX_CHANNELS && num_excl_chan < MAX_CHANNELS - 7 && get_bits1(gb)) { - ac->che_drc.additional_excluded_chns[n-1]=1; - for (i = num_excl_chan; i < num_excl_chan+7; i++) - ac->che_drc.exclude_mask[i] = get_bits1(gb); + do { + for (i = 0; i < 7; i++) + ac->che_drc.exclude_mask[num_excl_chan + i] = get_bits1(gb); n++; num_excl_chan += 7; - } + } while (num_excl_chan < MAX_CHANNELS - 7 && (ac->che_drc.additional_excluded_chns[n-1] = get_bits1(gb))); + return n; }

1 0

[soc]: r2941 - nellyenc/nellymoserenc.c
by bwolowiec 30 Jul '08

30 Jul '08

Author: bwolowiec Date: Wed Jul 30 22:23:38 2008 New Revision: 2941 Log: decrease of the number of pow() calls Modified: nellyenc/nellymoserenc.c Modified: nellyenc/nellymoserenc.c ============================================================================== --- nellyenc/nellymoserenc.c (original) +++ nellyenc/nellymoserenc.c Wed Jul 30 22:23:38 2008 @@ -203,7 +203,10 @@ static void encode_block(NellyMoserEncod val = ff_nelly_init_table[bk]; } + pval = -pow(2, -val/2048 - 3.0); for (k = 0; k < ff_nelly_band_sizes_table[i]; k++) { + s->mdct_out[j+k] *= pval; + s->mdct_out[j+k+NELLY_BUF_LEN] *= pval; s->pows[j+k] = val; } } @@ -216,8 +219,7 @@ static void encode_block(NellyMoserEncod for (j = 0; j < NELLY_FILL_LEN; j++) { bs+=bits[j]; if (bits[j] > 0) { - pval = -pow(2, -s->pows[j]/2048 - 3.0); - tmp = s->mdct_out[i*NELLY_BUF_LEN + j] * pval; + tmp = s->mdct_out[i*NELLY_BUF_LEN + j]; find_best_value(tmp, (ff_nelly_dequantization_table + (1<<bits[j])-1),

1 0

[soc]: r2940 - nellyenc/nellymoserenc.c
by bwolowiec 30 Jul '08

30 Jul '08

Author: bwolowiec Date: Wed Jul 30 22:15:46 2008 New Revision: 2940 Log: eliminate /8.0 from code generating sine_window Modified: nellyenc/nellymoserenc.c Modified: nellyenc/nellymoserenc.c ============================================================================== --- nellyenc/nellymoserenc.c (original) +++ nellyenc/nellymoserenc.c Wed Jul 30 22:15:46 2008 @@ -120,7 +120,6 @@ static av_cold int encode_init(AVCodecCo if (!sine_window[0]){ ff_sine_window_init(sine_window, 128); for (i=0; i<128; i++) { - sine_window[i] /= 8.0; sine_window[255-i] = sine_window[i]; } } @@ -189,7 +188,7 @@ static void encode_block(NellyMoserEncod stmp += tmp*tmp; } } - tmp = log(FFMAX(1.0, stmp/(ff_nelly_band_sizes_table[i]<<1))) * + tmp = ( log(FFMAX(64.0, stmp/(ff_nelly_band_sizes_table[i]<<1))) - log(64.0)) * M_LOG2E * 1024.0; if(i){ @@ -217,8 +216,8 @@ static void encode_block(NellyMoserEncod for (j = 0; j < NELLY_FILL_LEN; j++) { bs+=bits[j]; if (bits[j] > 0) { - pval = -pow(2, s->pows[j]/2048); - tmp = s->mdct_out[i*NELLY_BUF_LEN + j] / pval; + pval = -pow(2, -s->pows[j]/2048 - 3.0); + tmp = s->mdct_out[i*NELLY_BUF_LEN + j] * pval; find_best_value(tmp, (ff_nelly_dequantization_table + (1<<bits[j])-1),

1 0

[soc]: r2939 - nellyenc/nellymoserenc.c
by bwolowiec 30 Jul '08

30 Jul '08

Author: bwolowiec Date: Wed Jul 30 22:11:16 2008 New Revision: 2939 Log: move pows to NellyMoserEncodeContext Modified: nellyenc/nellymoserenc.c Modified: nellyenc/nellymoserenc.c ============================================================================== --- nellyenc/nellymoserenc.c (original) +++ nellyenc/nellymoserenc.c Wed Jul 30 22:11:16 2008 @@ -80,6 +80,7 @@ typedef struct NellyMoserEncodeContext { DSPContext dsp; MDCTContext mdct_ctx; + float pows[NELLY_FILL_LEN]; DECLARE_ALIGNED_16(float,mdct_tmp[NELLY_BUF_LEN*2]); DECLARE_ALIGNED_16(float,mdct_out[NELLY_BUF_LEN*2]); } NellyMoserEncodeContext; @@ -163,7 +164,6 @@ static void encode_block(NellyMoserEncod int bits[NELLY_BUF_LEN]; int i, j, k, l, b; int bs, bk; - float pows[NELLY_FILL_LEN]; float val=0; float pval; float tmp, stmp; @@ -205,11 +205,11 @@ static void encode_block(NellyMoserEncod } for (k = 0; k < ff_nelly_band_sizes_table[i]; k++) { - pows[j+k] = val; + s->pows[j+k] = val; } } - ff_nelly_get_sample_bits(pows, bits); + ff_nelly_get_sample_bits(s->pows, bits); bs=0; for (i = 0; i < 2; i++) { //2 @@ -217,7 +217,7 @@ static void encode_block(NellyMoserEncod for (j = 0; j < NELLY_FILL_LEN; j++) { bs+=bits[j]; if (bits[j] > 0) { - pval = -pow(2, pows[j]/2048); + pval = -pow(2, s->pows[j]/2048); tmp = s->mdct_out[i*NELLY_BUF_LEN + j] / pval; find_best_value(tmp,

1 0