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

[soc]: r4370 - wmapro/wma3dec.c
by faust3 01 Jun '09

01 Jun '09

Author: faust3 Date: Mon Jun 1 16:19:40 2009 New Revision: 4370 Log: factor out cur_subframe Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Mon Jun 1 16:11:10 2009 (r4369) +++ wmapro/wma3dec.c Mon Jun 1 16:19:40 2009 (r4370) @@ -1165,15 +1165,16 @@ static int wma_decode_subframe(WMA3Decod /** get a list of all channels that contain the estimated block */ s->channels_for_cur_subframe = 0; for(i=0;i<s->num_channels;i++){ + const int cur_subframe = s->channel[i].cur_subframe; /** substract already processed samples */ total_samples -= s->channel[i].decoded_samples; /** and count if there are multiple subframes that match our profile */ if(offset == s->channel[i].decoded_samples && - subframe_len == s->channel[i].subframe_len[s->channel[i].cur_subframe]){ - total_samples -= s->channel[i].subframe_len[s->channel[i].cur_subframe]; + subframe_len == s->channel[i].subframe_len[cur_subframe]){ + total_samples -= s->channel[i].subframe_len[cur_subframe]; s->channel[i].decoded_samples += - s->channel[i].subframe_len[s->channel[i].cur_subframe]; + s->channel[i].subframe_len[cur_subframe]; s->channel_indexes_for_cur_subframe[s->channels_for_cur_subframe] = i; ++s->channels_for_cur_subframe; }

1 0

[soc]: r4369 - wmapro/wma3dec.c
by faust3 01 Jun '09

01 Jun '09

Author: faust3 Date: Mon Jun 1 16:11:10 2009 New Revision: 4369 Log: reworked wma_decode_scale_factors Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Mon Jun 1 15:22:08 2009 (r4368) +++ wmapro/wma3dec.c Mon Jun 1 16:11:10 2009 (r4369) @@ -920,7 +920,6 @@ static int wma_decode_coeffs(WMA3DecodeC static int wma_decode_scale_factors(WMA3DecodeContext* s) { int i; - const int idx0 = av_log2(s->samples_per_frame/s->subframe_len); /** should never consume more than 5344 bits * MAX_CHANNELS * (1 + MAX_BANDS * 23) @@ -928,21 +927,31 @@ static int wma_decode_scale_factors(WMA3 for(i=0;i<s->channels_for_cur_subframe;i++){ int c = s->channel_indexes_for_cur_subframe[i]; + int* sf; + int* sf_end = s->channel[c].scale_factors + s->num_bands; /** resample scale factors for the new block size */ if(s->channel[c].reuse_sf){ - const int idx1 = av_log2(s->samples_per_frame/s->channel[c].scale_factor_block_len); + const int blocks_per_frame = s->samples_per_frame/s->subframe_len; + const int res_blocks_per_frame = s->samples_per_frame / + s->channel[c].scale_factor_block_len; + const int idx0 = av_log2(blocks_per_frame); + const int idx1 = av_log2(res_blocks_per_frame); const int16_t* sf_offsets = &s->sf_offsets[s->num_possible_block_sizes * MAX_BANDS * idx0 + MAX_BANDS * idx1]; int b; for(b=0;b<s->num_bands;b++) - s->channel[c].resampled_scale_factors[b] = s->channel[c].scale_factors[*sf_offsets++]; + s->channel[c].resampled_scale_factors[b] = + s->channel[c].scale_factors[*sf_offsets++]; - s->channel[c].max_scale_factor = s->channel[c].resampled_scale_factors[0]; - for(b=1;b<s->num_bands;b++){ - if(s->channel[c].resampled_scale_factors[b] > s->channel[c].max_scale_factor) - s->channel[c].max_scale_factor = s->channel[c].resampled_scale_factors[b]; + s->channel[c].max_scale_factor = + s->channel[c].resampled_scale_factors[0]; + sf = s->channel[c].resampled_scale_factors + 1; + while(sf < s->channel[c].resampled_scale_factors + s->num_bands){ + if(*sf > s->channel[c].max_scale_factor) + s->channel[c].max_scale_factor = *sf; + ++sf; } } @@ -952,24 +961,26 @@ static int wma_decode_scale_factors(WMA3 s->channel[c].transmit_sf = 1; if(s->channel[c].transmit_sf){ - int b; if(!s->channel[c].reuse_sf){ - int i; int val; /** decode DPCM coded scale factors */ s->channel[c].scale_factor_step = get_bits(&s->gb,2) + 1; - val = get_vlc2(&s->gb, sf_vlc.table, SCALEVLCBITS, ((FF_WMA3_HUFF_SCALE_MAXBITS+SCALEVLCBITS-1)/SCALEVLCBITS)); - s->channel[c].scale_factors[0] = 45 / s->channel[c].scale_factor_step + val - 60; - for(i=1;i<s->num_bands;i++){ - val = get_vlc2(&s->gb, sf_vlc.table, SCALEVLCBITS, ((FF_WMA3_HUFF_SCALE_MAXBITS+SCALEVLCBITS-1)/SCALEVLCBITS)); - s->channel[c].scale_factors[i] = s->channel[c].scale_factors[i-1] + val - 60; + val = get_vlc2(&s->gb, sf_vlc.table, SCALEVLCBITS, + ((FF_WMA3_HUFF_SCALE_MAXBITS+SCALEVLCBITS-1)/SCALEVLCBITS)); + s->channel[c].scale_factors[0] = 45 / + s->channel[c].scale_factor_step + val - 60; + for(sf = s->channel[c].scale_factors + 1; sf < sf_end; sf++) { + val = get_vlc2(&s->gb, sf_vlc.table, SCALEVLCBITS, + ((FF_WMA3_HUFF_SCALE_MAXBITS+SCALEVLCBITS-1)/SCALEVLCBITS)); + *sf = *(sf - 1) + val - 60; } }else{ int i; /** run level decode differences to the resampled factors */ - memcpy(s->channel[c].scale_factors,s->channel[c].resampled_scale_factors, + memcpy(s->channel[c].scale_factors, + s->channel[c].resampled_scale_factors, sizeof(int) * s->num_bands); for(i=0;i<s->num_bands;i++){ @@ -996,7 +1007,8 @@ static int wma_decode_scale_factors(WMA3 i += skip; if(i >= s->num_bands){ - av_log(s->avctx,AV_LOG_ERROR,"invalid scale factor coding\n"); + av_log(s->avctx,AV_LOG_ERROR, + "invalid scale factor coding\n"); return 0; }else s->channel[c].scale_factors[i] += (val ^ sign) - sign; @@ -1005,9 +1017,9 @@ static int wma_decode_scale_factors(WMA3 s->channel[c].reuse_sf = 1; s->channel[c].max_scale_factor = s->channel[c].scale_factors[0]; - for(b=1;b<s->num_bands;b++){ - if(s->channel[c].max_scale_factor < s->channel[c].scale_factors[b]) - s->channel[c].max_scale_factor = s->channel[c].scale_factors[b]; + for(sf=s->channel[c].scale_factors + 1; sf < sf_end; sf++){ + if(s->channel[c].max_scale_factor < *sf) + s->channel[c].max_scale_factor = *sf; } s->channel[c].scale_factor_block_len = s->subframe_len; }

1 0

[soc]: r4368 - wmapro/wma3dec.c
by faust3 01 Jun '09

01 Jun '09

Author: faust3 Date: Mon Jun 1 15:22:08 2009 New Revision: 4368 Log: avoid repeated minimum number of samples calculations during wma_decode_tilehdr Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Mon Jun 1 15:09:24 2009 (r4367) +++ wmapro/wma3dec.c Mon Jun 1 15:22:08 2009 (r4368) @@ -474,10 +474,13 @@ static int wma_decode_tilehdr(WMA3Decode int read_channel_mask = 1; int channels_for_cur_subframe = 0; int subframe_len; + /** minimum number of samples that need to be read */ + int min_samples = s->min_samples_per_subframe; if(fixed_channel_layout){ read_channel_mask = 0; channels_for_cur_subframe = s->num_channels; + min_samples *= channels_for_cur_subframe; min_channel_len = s->channel[0].channel_len; }else{ /** find channels with the smallest overall length */ @@ -490,9 +493,10 @@ static int wma_decode_tilehdr(WMA3Decode ++channels_for_cur_subframe; } } + min_samples *= channels_for_cur_subframe; if(channels_for_cur_subframe == 1 || - s->min_samples_per_subframe * channels_for_cur_subframe == missing_samples) + min_samples == missing_samples) read_channel_mask = 0; } @@ -508,8 +512,9 @@ static int wma_decode_tilehdr(WMA3Decode } } - /** if we have the choice get next subframe length from the bitstream */ - if(s->min_samples_per_subframe * channels_for_cur_subframe != missing_samples){ + /** if we have the choice get next subframe length from the + bitstream */ + if(min_samples != missing_samples){ int log2_subframe_len = 0; /* 1 bit indicates if the subframe length is zero */ if(subframe_len_zero_bit){

1 0

[soc]: r4367 - wmapro/wma3dec.c
by faust3 01 Jun '09

01 Jun '09

Author: faust3 Date: Mon Jun 1 15:09:24 2009 New Revision: 4367 Log: factor out the sine window index Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Mon Jun 1 13:45:45 2009 (r4366) +++ wmapro/wma3dec.c Mon Jun 1 15:09:24 2009 (r4367) @@ -363,10 +363,10 @@ static av_cold int wma_decode_init(AVCod /** init MDCT windows: simple sinus window */ for(i=0 ; i<BLOCK_NB_SIZES ; i++) { - int n; - n = 1 << (BLOCK_MAX_BITS - i); - ff_sine_window_init(ff_sine_windows[BLOCK_MAX_BITS - i - 7], n); - s->windows[BLOCK_NB_SIZES-i-1] = ff_sine_windows[BLOCK_MAX_BITS - i - 7]; + const int n = 1 << (BLOCK_MAX_BITS - i); + const int win_idx = BLOCK_MAX_BITS - i - 7; + ff_sine_window_init(ff_sine_windows[win_idx], n); + s->windows[BLOCK_NB_SIZES-i-1] = ff_sine_windows[win_idx]; } /** calculate subwoofer cutoff values */

1 0

[soc]: r4346 - in wmapro: wma3.h wma3dec.c
by faust3 01 Jun '09

01 Jun '09

Author: faust3 Date: Sat May 30 22:36:24 2009 New Revision: 4346 Log: use a sine table when calculating the decorrelation matrix Modified: wmapro/wma3.h wmapro/wma3dec.c Modified: wmapro/wma3.h ============================================================================== --- wmapro/wma3.h Sat May 30 21:22:28 2009 (r4345) +++ wmapro/wma3.h Sat May 30 22:36:24 2009 (r4346) @@ -93,6 +93,7 @@ typedef struct WMA3DecodeContext { MDCTContext mdct_ctx[BLOCK_NB_SIZES]; ///< MDCT context per block size DECLARE_ALIGNED_16(float, tmp[BLOCK_MAX_SIZE]); ///< imdct output buffer float* windows[BLOCK_NB_SIZES]; ///< window per block size + float sin64[33]; ///< sinus table for decorrelation VLC sf_vlc; ///< scale factor dpcm vlc VLC sf_rl_vlc; ///< scale factor run length vlc VLC vec4_vlc; ///< 4 coefficients per symbol Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat May 30 21:22:28 2009 (r4345) +++ wmapro/wma3dec.c Sat May 30 22:36:24 2009 (r4346) @@ -432,6 +432,10 @@ static av_cold int wma_decode_init(AVCod } } + /** calculate sine values for the decorrelation matrix */ + for(i=0;i<33;i++) + s->sin64[i] = sin(i*M_PI / 64.0); + wma_dump_context(s); avctx->channel_layout = channel_mask; return 0; @@ -644,11 +648,19 @@ static void wma_decode_decorrelation_mat float v1 = tmp1[y]; float v2 = tmp2[y]; int n = rotation_offset[offset + x]; - float cosv = sin(n*M_PI / 64.0); // FIXME: use one table for this - float sinv = -cos(n*M_PI / 64.0); + float sinv; + float cosv; - chgroup->decorrelation_matrix[y + x * chgroup->num_channels] = (v1 * cosv) + (v2 * sinv); - chgroup->decorrelation_matrix[y + i * chgroup->num_channels] = (v1 * -sinv) + (v2 * cosv); + if(n<32){ + sinv = s->sin64[n]; + cosv = s->sin64[32-n]; + }else{ + sinv = s->sin64[64-n]; + cosv = -s->sin64[n-32]; + } + + chgroup->decorrelation_matrix[y + x * chgroup->num_channels] = (v1 * sinv) - (v2 * cosv); + chgroup->decorrelation_matrix[y + i * chgroup->num_channels] = (v1 * cosv) + (v2 * sinv); } } offset += i;

4 5

[soc]: r4366 - in wmapro: wma3.h wma3dec.c
by faust3 01 Jun '09

01 Jun '09

Author: faust3 Date: Mon Jun 1 13:45:45 2009 New Revision: 4366 Log: make sin64 static so that it can be reused for multiple instances Modified: wmapro/wma3.h wmapro/wma3dec.c Modified: wmapro/wma3.h ============================================================================== --- wmapro/wma3.h Mon Jun 1 13:37:49 2009 (r4365) +++ wmapro/wma3.h Mon Jun 1 13:45:45 2009 (r4366) @@ -93,7 +93,6 @@ typedef struct WMA3DecodeContext { MDCTContext mdct_ctx[BLOCK_NB_SIZES]; ///< MDCT context per block size DECLARE_ALIGNED_16(float, tmp[BLOCK_MAX_SIZE]); ///< imdct output buffer float* windows[BLOCK_NB_SIZES]; ///< window per block size - float sin64[33]; ///< sinus table for decorrelation int coef_max[2]; ///< max length of vlc codes /** frame size dependent frame information (set during initialization) */ Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Mon Jun 1 13:37:49 2009 (r4365) +++ wmapro/wma3dec.c Mon Jun 1 13:45:45 2009 (r4366) @@ -87,6 +87,7 @@ static VLC vec4_vlc; static VLC vec2_vlc; ///< 2 coefficients per symbol static VLC vec1_vlc; ///< 1 coefficient per symbol static VLC coef_vlc[2]; ///< coefficient run length vlc codes +static float sin64[33]; ///< sinus table for decorrelation /** @@ -396,7 +397,7 @@ static av_cold int wma_decode_init(AVCod /** calculate sine values for the decorrelation matrix */ for(i=0;i<33;i++) - s->sin64[i] = sin(i*M_PI / 64.0); + sin64[i] = sin(i*M_PI / 64.0); wma_dump_context(s); avctx->channel_layout = channel_mask; @@ -625,11 +626,11 @@ static void wma_decode_decorrelation_mat float cosv; if(n<32){ - sinv = s->sin64[n]; - cosv = s->sin64[32-n]; + sinv = sin64[n]; + cosv = sin64[32-n]; }else{ - sinv = s->sin64[64-n]; - cosv = -s->sin64[n-32]; + sinv = sin64[64-n]; + cosv = -sin64[n-32]; } chgroup->decorrelation_matrix[y + x * chgroup->num_channels] =

1 0

[soc]: r4354 - wmapro/wma3dec.c
by faust3 01 Jun '09

01 Jun '09

Author: faust3 Date: Sun May 31 10:36:44 2009 New Revision: 4354 Log: use FFMIN FFMAX where possible Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sun May 31 10:00:02 2009 (r4353) +++ wmapro/wma3dec.c Sun May 31 10:36:44 2009 (r4354) @@ -367,10 +367,8 @@ static av_cold int wma_decode_init(AVCod for(i=0;i< s->num_possible_block_sizes;i++){ int block_size = s->samples_per_frame / (1 << i); int cutoff = ceil(block_size * 440.0 / (double)s->avctx->sample_rate + 0.5); - if(cutoff < 4) - cutoff = 4; - if(cutoff > block_size) - cutoff = block_size; + cutoff = FFMAX(cutoff, 4); + cutoff = FFMIN(cutoff, block_size); s->subwoofer_cutoffs[i] = cutoff; } @@ -1491,8 +1489,7 @@ static void wma_save_bits(WMA3DecodeCont /** byte align prev_frame buffer */ if(bit_offset){ int missing = 8 - bit_offset; - if(len < missing) - missing = len; + missing = FFMIN(len, missing); s->frame_data[pos++] |= get_bits(gb, missing) << (8 - bit_offset - missing); len -= missing;

3 2

[soc]: r4365 - wmapro/wma3dec.c
by faust3 01 Jun '09

01 Jun '09

Author: faust3 Date: Mon Jun 1 13:37:49 2009 New Revision: 4365 Log: use av_clip to calculate subwoofer cutoffs Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Mon Jun 1 13:31:20 2009 (r4364) +++ wmapro/wma3dec.c Mon Jun 1 13:37:49 2009 (r4365) @@ -374,9 +374,7 @@ static av_cold int wma_decode_init(AVCod int block_size = s->samples_per_frame / (1 << i); int cutoff = ceil(block_size * 440.0 / (double)s->avctx->sample_rate + 0.5); - cutoff = FFMAX(cutoff, 4); - cutoff = FFMIN(cutoff, block_size); - s->subwoofer_cutoffs[i] = cutoff; + s->subwoofer_cutoffs[i] = av_clip(cutoff,4,block_size); } /** set up decorrelation matrixes */

1 0

[soc]: r4364 - in wmapro: wma3.h wma3dec.c
by faust3 01 Jun '09

01 Jun '09

Author: faust3 Date: Mon Jun 1 13:31:20 2009 New Revision: 4364 Log: simplified wma_inverse_channel_transform Modified: wmapro/wma3.h wmapro/wma3dec.c Modified: wmapro/wma3.h ============================================================================== --- wmapro/wma3.h Sun May 31 18:52:15 2009 (r4363) +++ wmapro/wma3.h Mon Jun 1 13:31:20 2009 (r4364) @@ -78,7 +78,7 @@ typedef struct { char transform; ///< controls the type of the transform char transform_band[MAX_BANDS]; ///< controls if the transform is enabled for a certain band float decorrelation_matrix[MAX_CHANNELS*MAX_CHANNELS]; ///< decorrelation matrix - char use_channel[MAX_CHANNELS]; ///< channels that are part of the group + float* channel_data[MAX_CHANNELS]; ///< transformation coefficients } WMA3ChannelGroup; /** Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sun May 31 18:52:15 2009 (r4363) +++ wmapro/wma3dec.c Mon Jun 1 13:31:20 2009 (r4364) @@ -671,12 +671,11 @@ static int wma_decode_channel_transform( for(s->num_chgroups = 0; remaining_channels && s->num_chgroups < s->channels_for_cur_subframe;s->num_chgroups++){ WMA3ChannelGroup* chgroup = &s->chgroup[s->num_chgroups]; + float** channel_data = chgroup->channel_data; chgroup->num_channels = 0; chgroup->transform = 0; /** decode channel mask */ - memset(chgroup->use_channel,0,sizeof(chgroup->use_channel)); - if(remaining_channels > 2){ for(i=0;i<s->channels_for_cur_subframe;i++){ int channel_idx = s->channel_indexes_for_cur_subframe[i]; @@ -684,14 +683,16 @@ static int wma_decode_channel_transform( && get_bits1(&s->gb)){ ++chgroup->num_channels; s->channel[channel_idx].grouped = 1; - chgroup->use_channel[channel_idx] = 1; + *channel_data++ = s->channel[channel_idx].coeffs; } } }else{ chgroup->num_channels = remaining_channels; - for(i=0;i<s->num_channels ;i++){ - chgroup->use_channel[i] = s->channel[i].grouped != 1; - s->channel[i].grouped = 1; + for(i=0;i<s->channels_for_cur_subframe ;i++){ + int channel_idx = s->channel_indexes_for_cur_subframe[i]; + if(!s->channel[channel_idx].grouped) + *channel_data++ = s->channel[channel_idx].coeffs; + s->channel[channel_idx].grouped = 1; } } @@ -1047,50 +1048,37 @@ static void wma_inverse_channel_transfor ++sfb_offsets; } }else if(s->chgroup[i].transform){ - int x; - int b; - int cnt = 0; - float* ch_data[MAX_CHANNELS]; - float sums[MAX_CHANNELS * MAX_CHANNELS]; + float data[MAX_CHANNELS]; + const int num_channels = s->chgroup[i].num_channels; + float** ch_data = s->chgroup[i].channel_data; + float** ch_end = ch_data + num_channels; + const int8_t* tb = s->chgroup[i].transform_band; + int16_t* sfb; /** multichannel decorrelation */ - - /** get the channels that use the transform */ - for(x=0;x<s->channels_for_cur_subframe;x++){ - int chan = s->channel_indexes_for_cur_subframe[x]; - if(s->chgroup[i].use_channel[chan] == 1){ - ch_data[cnt] = s->channel[chan].coeffs; - ++cnt; - } - } - - for(b = 0; b < s->num_bands;b++){ - int y; - if(s->chgroup[i].transform_band[b] == 1){ + for(sfb = s->cur_sfb_offsets ; + sfb < s->cur_sfb_offsets + s->num_bands;sfb++){ + if(*tb++ == 1){ + int y; /** multiply values with the decorrelation_matrix */ - for(y=s->cur_sfb_offsets[b];y<FFMIN(s->cur_sfb_offsets[b+1], s->subframe_len);y++){ - float* matrix = s->chgroup[i].decorrelation_matrix; - int m; + for(y=sfb[0];y<FFMIN(sfb[1], s->subframe_len);y++){ + const float* mat = s->chgroup[i].decorrelation_matrix; + const float* data_end= data + num_channels; + float* data_ptr= data; + float** ch; - for(m = 0;m<s->chgroup[i].num_channels;m++) - sums[m] = 0; + for(ch = ch_data;ch < ch_end; ch++) + *data_ptr++ = (*ch)[y]; - for(m = 0;m<s->chgroup[i].num_channels;m++){ - int k; - for(k=0;k<s->chgroup[i].num_channels;k++) - sums[m] += ch_data[k][0] * - matrix[m*s->chgroup[i].num_channels+k]; - } + for(ch = ch_data; ch < ch_end; ch++){ + float sum = 0; + data_ptr = data; + while(data_ptr < data_end) + sum += *data_ptr++ * *mat++; - for(m = 0;m<s->chgroup[i].num_channels;m++){ - ch_data[m][0] = sums[m]; - ++ch_data[m]; + (*ch)[y] = sum; } } - }else{ /** skip band */ - for(y=0;y<s->chgroup[i].num_channels;y++) - ch_data[y] += - s->cur_sfb_offsets[b+1] - s->cur_sfb_offsets[b]; } } }

1 0