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

[soc]: r2909 - aacenc/aacpsy.c
by kostya 30 Jul '08

30 Jul '08

Author: kostya Date: Wed Jul 30 13:36:37 2008 New Revision: 2909 Log: 49l Determine maximum nonzero band for all windows, not only the first one Modified: aacenc/aacpsy.c Modified: aacenc/aacpsy.c ============================================================================== --- aacenc/aacpsy.c (original) +++ aacenc/aacpsy.c Wed Jul 30 13:36:37 2008 @@ -132,7 +132,7 @@ static void psy_create_output(AACPsyCont } start += cpe->ch[ch].ics.swb_sizes[g]; } - for(cmaxsfb = cpe->ch[ch].ics.num_swb; cmaxsfb > 0 && cpe->ch[ch].zeroes[0][cmaxsfb-1]; cmaxsfb--); + for(cmaxsfb = cpe->ch[ch].ics.num_swb; cmaxsfb > 0 && cpe->ch[ch].zeroes[w][cmaxsfb-1]; cmaxsfb--); maxsfb = FFMAX(maxsfb, cmaxsfb); } cpe->ch[ch].ics.max_sfb = maxsfb;

1 0

[soc]: r2908 - aacenc/aacpsy.c
by kostya 30 Jul '08

30 Jul '08

Author: kostya Date: Wed Jul 30 13:16:56 2008 New Revision: 2908 Log: Zero output band, as it may be coded in window group Modified: aacenc/aacpsy.c Modified: aacenc/aacpsy.c ============================================================================== --- aacenc/aacpsy.c (original) +++ aacenc/aacpsy.c Wed Jul 30 13:16:56 2008 @@ -99,6 +99,8 @@ static void psy_create_output(AACPsyCont } if(!cpe->ch[ch].zeroes[w][g]) sum = convert_coeffs(cpe->ch[ch].coeffs + start, cpe->ch[ch].icoefs + start, cpe->ch[ch].ics.swb_sizes[g], cpe->ch[ch].sf_idx[w][g]); + else + memset(cpe->ch[ch].icoefs + start, 0, cpe->ch[ch].ics.swb_sizes[g] * sizeof(cpe->ch[0].icoefs[0])); cpe->ch[ch].zeroes[w][g] = !sum; //try finding pulses if(search_pulses && cpe->ch[ch].ics.num_windows == 1 && !cpe->ch[ch].pulse.present){

1 0

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

30 Jul '08

Author: bwolowiec Date: Mon Jul 7 16:41:50 2008 New Revision: 2719 Log: use ff_sine_window_init Modified: nellyenc/nellymoserenc.c Modified: nellyenc/nellymoserenc.c ============================================================================== --- nellyenc/nellymoserenc.c (original) +++ nellyenc/nellymoserenc.c Mon Jul 7 16:41:50 2008 @@ -116,10 +116,13 @@ static av_cold int encode_init(AVCodecCo dsputil_init(&s->dsp, avctx); /* Generate overlap window */ - if (!sine_window[0]) - for (i=0 ; i<256; i++) { - sine_window[i] = sin((i + 0.5) / 256.0 * M_PI) /8; + 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]; } + } s->bufsize = 0; return 0;

5 8

[soc]: r2907 - aac/aac.c
by superdump 29 Jul '08

29 Jul '08

Author: superdump Date: Tue Jul 29 23:38:14 2008 New Revision: 2907 Log: Clarify the reason for applying to coeffs/ret when applying channel coupling Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Tue Jul 29 23:38:14 2008 @@ -2036,7 +2036,7 @@ static void apply_ssr(AACContext * ac, S #endif /* AAC_SSR */ /** - * Apply dependent channel coupling. + * Apply dependent channel coupling (applied before IMDCT). * * @param index which gain to use for coupling */ @@ -2069,7 +2069,7 @@ static void dependent_coupling(AACContex } /** - * Apply independent channel coupling. + * Apply independent channel coupling (applied after IMDCT). * * @param index which gain to use for coupling */

1 0

[soc]: r2906 - aac/aac.c
by superdump 29 Jul '08

29 Jul '08

Author: superdump Date: Tue Jul 29 22:53:49 2008 New Revision: 2906 Log: Fix broken null extradata check. If there is no extradata -> return error. If there is extradata but audio_specific_config() returns an error -> return error. Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Tue Jul 29 22:53:49 2008 @@ -819,7 +819,7 @@ static av_cold int aac_decode_init(AVCod ac->avccontext = avccontext; - if (avccontext->extradata_size > 0 && + if (avccontext->extradata_size <= 0 || audio_specific_config(ac, avccontext->extradata, avccontext->extradata_size)) return -1;

1 0

[soc]: r2905 - aacenc/aacpsy.c
by kostya 29 Jul '08

29 Jul '08

Author: kostya Date: Tue Jul 29 19:41:29 2008 New Revision: 2905 Log: Prepare psy model for (distant future) multichannel coding too Modified: aacenc/aacpsy.c Modified: aacenc/aacpsy.c ============================================================================== --- aacenc/aacpsy.c (original) +++ aacenc/aacpsy.c Tue Jul 29 19:41:29 2008 @@ -321,6 +321,18 @@ typedef struct Psy3gppBand{ }Psy3gppBand; /** + * single/pair channel context for psychoacoustic model + */ +typedef struct Psy3gppChannel{ + float a[2]; + float b[2]; + float pe[2]; + float thr[2]; + Psy3gppBand band[2][128]; + Psy3gppBand prev_band[2][128]; +}Psy3gppChannel; + +/** * 3GPP TS26.403-inspired psychoacoustic model specific data */ typedef struct Psy3gppContext{ @@ -331,16 +343,11 @@ typedef struct Psy3gppContext{ float s_low_s[16]; float s_hi_l [64]; float s_hi_s [16]; - Psy3gppBand band[2][128]; - Psy3gppBand prev_band[2][128]; int reservoir; int avg_bits; - float a[2]; - float b[2]; - float pe[2]; - float thr[2]; float ath_l[64]; float ath_s[16]; + Psy3gppChannel ch; }Psy3gppContext; /** @@ -486,6 +493,7 @@ static void psy_3gpp_process(AACPsyConte float stereo_att, pe_target; int bits_avail; const int chans = FFMIN(apc->avctx->channels - channel, 2); + Psy3gppChannel *pch = &pctx->ch; //calculate and apply stereo attenuation factor - 5.2 if(apc->avctx->channels - channel > 1){ @@ -500,7 +508,7 @@ static void psy_3gpp_process(AACPsyConte } //calculate energies, initial thresholds and related values - 5.4.2 - memset(pctx->band, 0, sizeof(pctx->band)); + memset(pch->band, 0, sizeof(pch->band)); for(ch = 0; ch < chans; ch++){ start = 0; cpe->ch[ch].gain = 0; @@ -508,15 +516,15 @@ static void psy_3gpp_process(AACPsyConte for(g = 0; g < cpe->ch[ch].ics.num_swb; g++){ g2 = w*16 + g; for(i = 0; i < cpe->ch[ch].ics.swb_sizes[g]; i++) - pctx->band[ch][g2].energy += cpe->ch[ch].coeffs[start+i] * cpe->ch[ch].coeffs[start+i]; - pctx->band[ch][g2].thr = pctx->band[ch][g2].energy * 0.001258925f; + pch->band[ch][g2].energy += cpe->ch[ch].coeffs[start+i] * cpe->ch[ch].coeffs[start+i]; + pch->band[ch][g2].thr = pch->band[ch][g2].energy * 0.001258925f; start += cpe->ch[ch].ics.swb_sizes[g]; - if(pctx->band[ch][g2].energy != 0.0){ + if(pch->band[ch][g2].energy != 0.0){ float ffac = 0.0; for(i = 0; i < cpe->ch[ch].ics.swb_sizes[g]; i++) ffac += sqrt(FFABS(cpe->ch[ch].coeffs[start+i])); - pctx->band[ch][g2].ffac = ffac; + pch->band[ch][g2].ffac = ffac; } } } @@ -527,20 +535,20 @@ static void psy_3gpp_process(AACPsyConte for(w = 0; w < cpe->ch[ch].ics.num_windows; w++){ for(g = 1; g < cpe->ch[ch].ics.num_swb; g++){ g2 = w*16 + g; - pctx->band[ch][g2].thr = FFMAX(pctx->band[ch][g2].thr, pctx->band[ch][g2-1].thr * pctx->s_low_l[g-1]); + pch->band[ch][g2].thr = FFMAX(pch->band[ch][g2].thr, pch->band[ch][g2-1].thr * pctx->s_low_l[g-1]); } for(g = cpe->ch[ch].ics.num_swb - 2; g >= 0; g--){ g2 = w*16 + g; - pctx->band[ch][g2].thr = FFMAX(pctx->band[ch][g2].thr, pctx->band[ch][g2+1].thr * pctx->s_hi_l[g+1]); + pch->band[ch][g2].thr = FFMAX(pch->band[ch][g2].thr, pch->band[ch][g2+1].thr * pctx->s_hi_l[g+1]); } for(g = 0; g < cpe->ch[ch].ics.num_swb; g++){ g2 = w*16 + g; if(cpe->ch[ch].ics.num_swb == apc->num_bands1024) - pctx->band[ch][g2].thr_quiet = FFMAX(pctx->band[ch][g2].thr, pctx->ath_l[g]); + pch->band[ch][g2].thr_quiet = FFMAX(pch->band[ch][g2].thr, pctx->ath_l[g]); else - pctx->band[ch][g2].thr_quiet = FFMAX(pctx->band[ch][g2].thr, pctx->ath_s[g]); - pctx->band[ch][g2].thr_quiet = fmaxf(PSY_3GPP_RPEMIN*pctx->band[ch][g2].thr_quiet, fminf(pctx->band[ch][g2].thr_quiet, PSY_3GPP_RPELEV*pctx->prev_band[ch][g2].thr_quiet)); - pctx->band[ch][g2].thr = FFMAX(pctx->band[ch][g2].thr, pctx->band[ch][g2].thr_quiet * 0.25); + pch->band[ch][g2].thr_quiet = FFMAX(pch->band[ch][g2].thr, pctx->ath_s[g]); + pch->band[ch][g2].thr_quiet = fmaxf(PSY_3GPP_RPEMIN*pch->band[ch][g2].thr_quiet, fminf(pch->band[ch][g2].thr_quiet, PSY_3GPP_RPELEV*pch->prev_band[ch][g2].thr_quiet)); + pch->band[ch][g2].thr = FFMAX(pch->band[ch][g2].thr, pch->band[ch][g2].thr_quiet * 0.25); } } } @@ -555,7 +563,7 @@ static void psy_3gpp_process(AACPsyConte g2 = w*16 + g; cpe->ms.mask[w][g] = 0; - if(pctx->band[0][g2].energy == 0.0 || pctx->band[1][g2].energy == 0.0) + if(pch->band[0][g2].energy == 0.0 || pch->band[1][g2].energy == 0.0) continue; for(i = 0; i < cpe->ch[0].ics.swb_sizes[g]; i++){ m = (cpe->ch[0].coeffs[start+i] + cpe->ch[1].coeffs[start+i]) / 2.0; @@ -565,32 +573,32 @@ static void psy_3gpp_process(AACPsyConte ff_m += sqrt(FFABS(m)); ff_s += sqrt(FFABS(s)); } - l1 = FFMIN(pctx->band[0][g2].thr, pctx->band[1][g2].thr); - if(en_m == 0.0 || en_s == 0.0 || l1*l1 / (en_m * en_s) >= (pctx->band[0][g2].thr * pctx->band[1][g2].thr / (pctx->band[0][g2].energy * pctx->band[1][g2].energy))){ + l1 = FFMIN(pch->band[0][g2].thr, pch->band[1][g2].thr); + if(en_m == 0.0 || en_s == 0.0 || l1*l1 / (en_m * en_s) >= (pch->band[0][g2].thr * pch->band[1][g2].thr / (pch->band[0][g2].energy * pch->band[1][g2].energy))){ cpe->ms.mask[w][g] = 1; - pctx->band[0][g2].energy = en_m; - pctx->band[1][g2].energy = en_s; - pctx->band[0][g2].ffac = ff_m; - pctx->band[1][g2].ffac = ff_s; - pctx->band[0][g2].thr = en_m * 0.001258925f; - pctx->band[1][g2].thr = en_s * 0.001258925f; + pch->band[0][g2].energy = en_m; + pch->band[1][g2].energy = en_s; + pch->band[0][g2].ffac = ff_m; + pch->band[1][g2].ffac = ff_s; + pch->band[0][g2].thr = en_m * 0.001258925f; + pch->band[1][g2].thr = en_s * 0.001258925f; } } } } for(ch = 0; ch < chans; ch++){ - pctx->a[ch] = pctx->b[ch] = pctx->pe[ch] = pctx->thr[ch] = 0.0f; + pch->a[ch] = pch->b[ch] = pch->pe[ch] = pch->thr[ch] = 0.0f; for(w = 0; w < cpe->ch[ch].ics.num_windows; w++){ for(g = 0; g < cpe->ch[ch].ics.num_swb; g++){ g2 = w*16 + g; - if(pctx->band[ch][g2].energy != 0.0) - calc_pe(&pctx->band[ch][g2], cpe->ch[ch].ics.swb_sizes[g]); - if(pctx->band[ch][g2].thr < pctx->band[ch][g2].energy){ - pctx->a[ch] += pctx->band[ch][g2].a; - pctx->b[ch] += pctx->band[ch][g2].b; - pctx->pe[ch] += pctx->band[ch][g2].pe; - pctx->thr[ch] += pctx->band[ch][g2].thr; + if(pch->band[ch][g2].energy != 0.0) + calc_pe(&pch->band[ch][g2], cpe->ch[ch].ics.swb_sizes[g]); + if(pch->band[ch][g2].thr < pch->band[ch][g2].energy){ + pch->a[ch] += pch->band[ch][g2].a; + pch->b[ch] += pch->band[ch][g2].b; + pch->pe[ch] += pch->band[ch][g2].pe; + pch->thr[ch] += pch->band[ch][g2].thr; } } } @@ -605,27 +613,27 @@ static void psy_3gpp_process(AACPsyConte for(i = 0; i < 2; i++){ float t0, pe, r, a0 = 0.0f, pe0 = 0.0f, b0 = 0.0f; for(ch = 0; ch < chans; ch++){ - a0 += pctx->a[ch]; - b0 += pctx->b[ch]; - pe0 += pctx->pe[ch]; + a0 += pch->a[ch]; + b0 += pch->b[ch]; + pe0 += pch->pe[ch]; } t0 = pow(2.0, (a0 - pe0) / (4.0 * b0)); r = pow(2.0, (a0 - pe_target) / (4.0 * b0)) - t0; //add correction factor to thresholds and recalculate perceptual entropy for(ch = 0; ch < chans; ch++){ - pctx->a[ch] = pctx->b[ch] = pctx->pe[ch] = pctx->thr[ch] = 0.0; + pch->a[ch] = pch->b[ch] = pch->pe[ch] = pch->thr[ch] = 0.0; pe = 0.0f; for(w = 0; w < cpe->ch[ch].ics.num_windows; w++){ for(g = 0; g < cpe->ch[ch].ics.num_swb; g++){ g2 = w*16 + g; - pctx->band[ch][g2].thr = modify_thr(pctx->band[ch][g2].thr, r); - calc_pe(&pctx->band[ch][g2], cpe->ch[ch].ics.swb_sizes[g]); - if(pctx->band[ch][g2].thr < pctx->band[ch][g2].energy){ - pctx->a[ch] += pctx->band[ch][g2].a; - pctx->b[ch] += pctx->band[ch][g2].b; - pctx->pe[ch] += pctx->band[ch][g2].pe; - pctx->thr[ch] += pctx->band[ch][g2].thr; + pch->band[ch][g2].thr = modify_thr(pch->band[ch][g2].thr, r); + calc_pe(&pch->band[ch][g2], cpe->ch[ch].ics.swb_sizes[g]); + if(pch->band[ch][g2].thr < pch->band[ch][g2].energy){ + pch->a[ch] += pch->band[ch][g2].a; + pch->b[ch] += pch->band[ch][g2].b; + pch->pe[ch] += pch->band[ch][g2].pe; + pch->thr[ch] += pch->band[ch][g2].thr; } } } @@ -641,10 +649,10 @@ static void psy_3gpp_process(AACPsyConte for(w = 0; w < cpe->ch[ch].ics.num_windows; w++){ for(g = 0; g < cpe->ch[ch].ics.num_swb; g++){ g2 = w*16 + g; - cpe->ch[ch].zeroes[w][g] = pctx->band[ch][g2].thr >= pctx->band[ch][g2].energy; + cpe->ch[ch].zeroes[w][g] = pch->band[ch][g2].thr >= pch->band[ch][g2].energy; if(cpe->ch[ch].zeroes[w][g]) continue; //spec gives constant for lg() but we scaled it for log2() - cpe->ch[ch].sf_idx[w][g] = (int)(2.66667 * (log2(6.75*pctx->band[ch][g2].thr) - log2(pctx->band[ch][g2].ffac))); + cpe->ch[ch].sf_idx[w][g] = (int)(2.66667 * (log2(6.75*pch->band[ch][g2].thr) - log2(pch->band[ch][g2].ffac))); if(prev_scale != -1) cpe->ch[ch].sf_idx[w][g] = av_clip(cpe->ch[ch].sf_idx[w][g], prev_scale - SCALE_MAX_DIFF, prev_scale + SCALE_MAX_DIFF); prev_scale = cpe->ch[ch].sf_idx[w][g]; @@ -666,7 +674,7 @@ static void psy_3gpp_process(AACPsyConte } } - memcpy(pctx->prev_band, pctx->band, sizeof(pctx->band)); + memcpy(pch->prev_band, pch->band, sizeof(pch->band)); psy_create_output(apc, cpe, channel, 0); }

1 0

[soc]: r2904 - aacenc/aacpsy.c
by kostya 29 Jul '08

29 Jul '08

Author: kostya Date: Tue Jul 29 19:37:10 2008 New Revision: 2904 Log: 1000l Mixed arrays for short and long windows Modified: aacenc/aacpsy.c Modified: aacenc/aacpsy.c ============================================================================== --- aacenc/aacpsy.c (original) +++ aacenc/aacpsy.c Tue Jul 29 19:37:10 2008 @@ -327,10 +327,10 @@ typedef struct Psy3gppContext{ float barks [1024]; float bark_l[64]; float bark_s[16]; - float s_low_s[64]; - float s_low_l[16]; - float s_hi_s [64]; - float s_hi_l [16]; + float s_low_l[64]; + float s_low_s[16]; + float s_hi_l [64]; + float s_hi_s [16]; Psy3gppBand band[2][128]; Psy3gppBand prev_band[2][128]; int reservoir;

1 0

[soc]: r2902 - mxf/mxfenc.c
by spyfeng 29 Jul '08

29 Jul '08

Author: spyfeng Date: Tue Jul 29 18:51:50 2008 New Revision: 2902 Log: add a space after "if" before "(" Modified: mxf/mxfenc.c Modified: mxf/mxfenc.c ============================================================================== --- mxf/mxfenc.c (original) +++ mxf/mxfenc.c Tue Jul 29 18:51:50 2008 @@ -902,7 +902,7 @@ static int mxf_build_structural_metadata if (type == SourcePackage) { for (desc = mxf_descriptor_read_table; desc->write; desc++) { - if(s->streams[i]->codec->codec_id == desc->type) { + if (s->streams[i]->codec->codec_id == desc->type) { int (*write)() = desc->write; if (write(s, desc, i) < 0) { av_log(s, AV_LOG_ERROR, "error writing descriptor\n");

1 0

[soc]: r2901 - mxf/mxfenc.c
by spyfeng 29 Jul '08

29 Jul '08

Author: spyfeng Date: Tue Jul 29 18:49:06 2008 New Revision: 2901 Log: use AV_WB24() function instead of the 3 bytes assignment. Modified: mxf/mxfenc.c Modified: mxf/mxfenc.c ============================================================================== --- mxf/mxfenc.c (original) +++ mxf/mxfenc.c Tue Jul 29 18:49:06 2008 @@ -376,9 +376,7 @@ static int mxf_write_preface(AVFormatCon UID uid; ByteIOContext *pb = s->pb; - klv->key[13] = 0x01; - klv->key[14] = 0x2f; - klv->key[15] = 0x00; + AV_WB24(klv->key + 13, 0x012f00); put_buffer(pb, klv->key, 16); klv_encode_ber_length(pb, 146); @@ -434,9 +432,7 @@ static int mxf_write_identification(AVFo UID uid; int length, company_name_len, product_name_len, version_string_len; - klv->key[13] = 0x01; - klv->key[14] = 0x30; - klv->key[15] = 0x00; + AV_WB24(klv->key + 13, 0x013000); put_buffer(pb, klv->key, 16); @@ -485,9 +481,7 @@ static int mxf_write_content_storage(AVF MXFReferenceContext *refs = mxf->reference; ByteIOContext *pb = s->pb; - klv->key[13] = 0x01; - klv->key[14] = 0x18; - klv->key[15] = 0x00; + AV_WB24(klv->key + 13, 0x011800); put_buffer(pb, klv->key, 16); klv_encode_ber_length(pb, 64); @@ -602,9 +596,7 @@ static int mxf_write_track(AVFormatConte const MXFEssenceElementKey *element; int i = 0; - klv->key[13] = 0x01; - klv->key[14] = 0x3b; - klv->key[15] = 0x00; + AV_WB24(klv->key + 13, 0x013b00); put_buffer(pb, klv->key, 16); klv_encode_ber_length(pb, 80); @@ -672,9 +664,7 @@ static int mxf_write_sequence(AVFormatCo AVStream *st; const MXFDataDefinitionUL * data_def_ul; - klv->key[13] = 0x01; - klv->key[14] = 0x0f; - klv->key[15] = 0x00; + AV_WB24(klv->key + 13, 0x010f00); put_buffer(pb, klv->key, 16); klv_encode_ber_length(pb, 80); @@ -713,9 +703,8 @@ static int mxf_write_structural_componen const MXFDataDefinitionUL * data_def_ul; int i; - klv->key[13] = 0x01; - klv->key[14] = 0x11; - klv->key[15] = 0x00; + AV_WB24(klv->key + 13, 0x011100); + put_buffer(pb, klv->key, 16); klv_encode_ber_length(pb, 108); @@ -767,9 +756,7 @@ static int mxf_write_multi_descriptor(AV MXFReferenceContext *refs = mxf->reference; ByteIOContext *pb = s->pb; - klv->key[13] = 0x01; - klv->key[14] = 0x44; - klv->key[15] = 0x00; + AV_WB24(klv->key + 13, 0x014400); put_buffer(pb, klv->key, 16); klv_encode_ber_length(pb, 64 + 16 * s->nb_streams);

1 0

[soc]: r2899 - mxf/mxfenc.c
by spyfeng 29 Jul '08

29 Jul '08

Author: spyfeng Date: Tue Jul 29 18:19:57 2008 New Revision: 2899 Log: changed function mxf_write_local_tag() to void Modified: mxf/mxfenc.c Modified: mxf/mxfenc.c ============================================================================== --- mxf/mxfenc.c (original) +++ mxf/mxfenc.c Tue Jul 29 18:19:57 2008 @@ -320,11 +320,10 @@ static int mxf_write_primer_pack(AVForma return 0; } -static int mxf_write_local_tag(ByteIOContext *pb, int value_size, int tag) +static void mxf_write_local_tag(ByteIOContext *pb, int value_size, int tag) { put_be16(pb, tag); put_be16(pb, value_size); - return 0; } static void mxf_write_reference(ByteIOContext *pb, int ref_count, UID *value)

1 0