libavcodec.hg: ac3dec.c comparison

comparison ac3dec.c @ 8136:3085502c4f33 libavcodec

add support for spectral extension

author	jbr
date	Thu, 13 Nov 2008 03:18:13 +0000
parents	c82f8f5657ff
children	c6993d9ed77c

comparison

equal deleted inserted replaced

-:c82f8f5657ff
+:3085502c4f33
 }
 } while(i--);
 /* spectral extension strategy */
 if (s->eac3 && (!blk || get_bits1(gbc))) {
-if (get_bits1(gbc)) {
+s->spx_in_use[blk] = get_bits1(gbc);
-av_log_missing_feature(s->avctx, "Spectral extension", 1);
+if (s->spx_in_use[blk]) {
-return -1;
+int begf, endf;
-}
+int spx_end_subband;
-/* TODO: parse spectral extension strategy info */
-}
+/* determine which channels use spx */
+if (s->channel_mode == AC3_CHMODE_MONO) {
-/* TODO: spectral extension coordinates */
+s->channel_in_spx[1] = 1;
+s->spx_coords_exist[1] = 0;
+} else {
+for (ch = 1; ch <= fbw_channels; ch++) {
+s->channel_in_spx[ch] = get_bits1(gbc);
+s->spx_coords_exist[ch] = 0;
+}
+}
+s->spx_copy_start_freq = get_bits(gbc, 2) * 12 + 25;
+begf = get_bits(gbc, 3);
+endf = get_bits(gbc, 3);
+s->spx_start_subband = begf < 6 ? begf+2 : 2*begf-3;
+spx_end_subband      = endf < 4 ? endf+5 : 2*endf+3;
+s->num_spx_subbands  = spx_end_subband - s->spx_start_subband;
+s->spx_start_freq    = s->spx_start_subband * 12 + 25;
+s->spx_end_freq      = spx_end_subband      * 12 + 25;
+decode_band_structure(gbc, blk, s->eac3, 0,
+s->spx_start_subband, spx_end_subband,
+ff_eac3_default_spx_band_struct,
+s->spx_band_struct, NULL, &s->num_spx_bands,
+s->spx_band_sizes);
+} else {
+for (ch = 1; ch <= fbw_channels; ch++) {
+s->channel_in_spx[ch] = 0;
+s->first_spx_coords[ch] = 1;
+}
+}
+} else {
+s->spx_in_use[blk] = blk ? s->spx_in_use[blk-1] : 0;
+}
+/* spectral extension coordinates */
+if (s->spx_in_use[blk]) {
+for (ch = 1; ch <= fbw_channels; ch++) {
+if (s->channel_in_spx[ch]) {
+if (s->first_spx_coords[ch] || get_bits1(gbc)) {
+int bin, spx_blend;
+int master_spx_coord;
+s->first_spx_coords[ch] = 0;
+s->spx_coords_exist[ch] = 1;
+spx_blend = get_bits(gbc, 5) << 18;
+master_spx_coord = get_bits(gbc, 2) * 3;
+bin = s->spx_start_freq;
+for (bnd = 0; bnd < s->num_spx_bands; bnd++) {
+int spx_coord_exp, spx_coord_mant;
+/* calculate blending factors */
+int bandsize = s->spx_band_sizes[bnd];
+int nratio = (((bin + (bandsize >> 1)) << 23) / s->spx_end_freq) - spx_blend;
+nratio = av_clip(nratio, 0, INT24_MAX);
+s->spx_noise_blend [ch][bnd] = ff_sqrt((            nratio) << 8) * M_SQRT_POW2_15;
+s->spx_signal_blend[ch][bnd] = ff_sqrt((INT24_MAX - nratio) << 8) * M_SQRT_POW2_15;
+bin += bandsize;
+/* decode spx coordinates */
+spx_coord_exp  = get_bits(gbc, 4);
+spx_coord_mant = get_bits(gbc, 2);
+if (spx_coord_exp == 15)
+s->spx_coords[ch][bnd] = spx_coord_mant << 26;
+else
+s->spx_coords[ch][bnd] = (spx_coord_mant + 4) << 25;
+s->spx_coords[ch][bnd] >>= (spx_coord_exp + master_spx_coord);
+}
+} else {
+s->spx_coords_exist[ch] = 0;
+}
+} else {
+s->first_spx_coords[ch] = 1;
+}
+}
+}
 /* coupling strategy */
 if (s->eac3 ? s->cpl_strategy_exists[blk] : get_bits1(gbc)) {
 memset(bit_alloc_stages, 3, AC3_MAX_CHANNELS);
 if (!s->eac3)
 /* phase flags in use */
 if (channel_mode == AC3_CHMODE_STEREO)
 s->phase_flags_in_use = get_bits1(gbc);
 /* coupling frequency range */
-/* TODO: modify coupling end freq if spectral extension is used */
 cpl_start_subband = get_bits(gbc, 4);
+if (s->spx_in_use[blk]) {
+cpl_end_subband = s->spx_start_subband - 1;
+} else {
 cpl_end_subband   = get_bits(gbc, 4) + 3;
+}
 s->num_cpl_subbands = cpl_end_subband - cpl_start_subband;
 if (s->num_cpl_subbands < 0) {
 av_log(s->avctx, AV_LOG_ERROR, "invalid coupling range (%d > %d)\n",
 cpl_start_subband, cpl_end_subband);
 return -1;
 /* stereo rematrixing strategy and band structure */
 if (channel_mode == AC3_CHMODE_STEREO) {
 if ((s->eac3 && !blk) || get_bits1(gbc)) {
 s->num_rematrixing_bands = 4;
-if(cpl_in_use && s->start_freq[CPL_CH] <= 61)
+if (cpl_in_use) {
+if (s->start_freq[CPL_CH] <= 61)
 s->num_rematrixing_bands -= 1 + (s->start_freq[CPL_CH] == 37);
+} else if (s->spx_in_use[blk]) {
+if (s->spx_start_freq <= 61)
+s->num_rematrixing_bands -= 1 + (s->spx_start_freq <= 37) +
+(s->spx_start_freq <= 25);
+}
 for(bnd=0; bnd<s->num_rematrixing_bands; bnd++)
 s->rematrixing_flags[bnd] = get_bits1(gbc);
 } else if (!blk) {
 av_log(s->avctx, AV_LOG_ERROR, "new rematrixing strategy must be present in block 0\n");
 return -1;
 if (s->exp_strategy[blk][ch] != EXP_REUSE) {
 int group_size;
 int prev = s->end_freq[ch];
 if (s->channel_in_cpl[ch])
 s->end_freq[ch] = s->start_freq[CPL_CH];
+else if (s->channel_in_spx[ch])
+s->end_freq[ch] = s->spx_start_freq;
 else {
 int bandwidth_code = get_bits(gbc, 6);
 if (bandwidth_code > 60) {
 av_log(s->avctx, AV_LOG_ERROR, "bandwidth code = %d > 60\n", bandwidth_code);
 return -1;
 this also uncouples channels if coupling is in use. */
 decode_transform_coeffs(s, blk);
 /* TODO: generate enhanced coupling coordinates and uncouple */
-/* TODO: apply spectral extension */
 /* recover coefficients if rematrixing is in use */
 if(s->channel_mode == AC3_CHMODE_STEREO)
 do_rematrixing(s);
+ff_eac3_apply_spectral_extension(s);
 /* apply scaling to coefficients (headroom, dynrng) */
 for(ch=1; ch<=s->channels; ch++) {
 float gain = s->mul_bias / 4194304.0f;
 if(s->channel_mode == AC3_CHMODE_DUALMONO) {

Mercurial > libavcodec.hg

comparison ac3dec.c @ 8136:3085502c4f33 libavcodec