*/
/**
- * @file aac.c
+ * @file libavcodec/aac.c
* AAC decoder
* @author Oded Shimon ( ods15 ods15 dyndns org )
* @author Maxim Gavrilov ( maxim.gavrilov gmail com )
#include "avcodec.h"
+#include "internal.h"
#include "bitstream.h"
#include "dsputil.h"
#include "lpc.h"
#include "aactab.h"
#include "aacdectab.h"
#include "mpeg4audio.h"
+#include "aac_parser.h"
#include <assert.h>
#include <errno.h>
*/
static int decode_pce(AACContext * ac, enum ChannelPosition new_che_pos[4][MAX_ELEM_ID],
GetBitContext * gb) {
- int num_front, num_side, num_back, num_lfe, num_assoc_data, num_cc;
+ int num_front, num_side, num_back, num_lfe, num_assoc_data, num_cc, sampling_index;
skip_bits(gb, 2); // object_type
- ac->m4ac.sampling_index = get_bits(gb, 4);
- if(ac->m4ac.sampling_index > 11) {
+ sampling_index = get_bits(gb, 4);
+ if(sampling_index > 12) {
av_log(ac->avccontext, AV_LOG_ERROR, "invalid sampling rate index %d\n", ac->m4ac.sampling_index);
return -1;
}
+ ac->m4ac.sampling_index = sampling_index;
ac->m4ac.sample_rate = ff_mpeg4audio_sample_rates[ac->m4ac.sampling_index];
num_front = get_bits(gb, 4);
num_side = get_bits(gb, 4);
int extension_flag, ret;
if(get_bits1(gb)) { // frameLengthFlag
- av_log_missing_feature(ac->avccontext, "960/120 MDCT window is", 1);
+ ff_log_missing_feature(ac->avccontext, "960/120 MDCT window is", 1);
return -1;
}
if((i = ff_mpeg4audio_get_config(&ac->m4ac, data, data_size)) < 0)
return -1;
- if(ac->m4ac.sampling_index > 11) {
+ if(ac->m4ac.sampling_index > 12) {
av_log(ac->avccontext, AV_LOG_ERROR, "invalid sampling rate index %d\n", ac->m4ac.sampling_index);
return -1;
}
ac->avccontext = avccontext;
- if (avccontext->extradata_size <= 0 ||
- decode_audio_specific_config(ac, avccontext->extradata, avccontext->extradata_size))
+ if (avccontext->extradata_size > 0) {
+ if(decode_audio_specific_config(ac, avccontext->extradata, avccontext->extradata_size))
+ return -1;
+ avccontext->sample_rate = ac->m4ac.sample_rate;
+ } else if (avccontext->channels > 0) {
+ enum ChannelPosition new_che_pos[4][MAX_ELEM_ID];
+ memset(new_che_pos, 0, 4 * MAX_ELEM_ID * sizeof(new_che_pos[0][0]));
+ if(set_default_channel_config(ac, new_che_pos, avccontext->channels - (avccontext->channels == 8)))
+ return -1;
+ if(output_configure(ac, ac->che_pos, new_che_pos))
+ return -1;
+ ac->m4ac.sample_rate = avccontext->sample_rate;
+ } else {
+ ff_log_missing_feature(ac->avccontext, "Implicit channel configuration is", 0);
return -1;
+ }
avccontext->sample_fmt = SAMPLE_FMT_S16;
- avccontext->sample_rate = ac->m4ac.sample_rate;
avccontext->frame_size = 1024;
AAC_INIT_VLC_STATIC( 0, 144);
ac->sf_offset = 60;
}
-#ifndef CONFIG_HARDCODED_TABLES
+#if !CONFIG_HARDCODED_TABLES
for (i = 0; i < 428; i++)
ff_aac_pow2sf_tab[i] = pow(2, (i - 200)/4.);
#endif /* CONFIG_HARDCODED_TABLES */
memset(ics, 0, sizeof(IndividualChannelStream));
return -1;
} else {
- av_log_missing_feature(ac->avccontext, "Predictor bit set but LTP is", 1);
+ ff_log_missing_feature(ac->avccontext, "Predictor bit set but LTP is", 1);
memset(ics, 0, sizeof(IndividualChannelStream));
return -1;
}
const int c = 1024/ics->num_windows;
const uint16_t * offsets = ics->swb_offset;
float *coef_base = coef;
+ static const float sign_lookup[] = { 1.0f, -1.0f };
for (g = 0; g < ics->num_windows; g++)
memset(coef + g * 128 + offsets[ics->max_sfb], 0, sizeof(float)*(c - offsets[ics->max_sfb]));
const int dim = cur_band_type >= FIRST_PAIR_BT ? 2 : 4;
const int is_cb_unsigned = IS_CODEBOOK_UNSIGNED(cur_band_type);
int group;
- if (cur_band_type == ZERO_BT) {
+ if (cur_band_type == ZERO_BT || cur_band_type == INTENSITY_BT2 || cur_band_type == INTENSITY_BT) {
for (group = 0; group < ics->group_len[g]; group++) {
memset(coef + group * 128 + offsets[i], 0, (offsets[i+1] - offsets[i])*sizeof(float));
}
coef[group*128+k] *= scale;
}
}
- }else if (cur_band_type != INTENSITY_BT2 && cur_band_type != INTENSITY_BT) {
+ }else {
for (group = 0; group < ics->group_len[g]; group++) {
for (k = offsets[i]; k < offsets[i+1]; k += dim) {
const int index = get_vlc2(gb, vlc_spectral[cur_band_type - 1].table, 6, 3);
}
vq_ptr = &ff_aac_codebook_vectors[cur_band_type - 1][index * dim];
if (is_cb_unsigned) {
- for (j = 0; j < dim; j++)
- if (vq_ptr[j])
- coef[coef_tmp_idx + j] = 1 - 2*(int)get_bits1(gb);
+ if (vq_ptr[0]) coef[coef_tmp_idx ] = sign_lookup[get_bits1(gb)];
+ if (vq_ptr[1]) coef[coef_tmp_idx + 1] = sign_lookup[get_bits1(gb)];
+ if (dim == 4) {
+ if (vq_ptr[2]) coef[coef_tmp_idx + 2] = sign_lookup[get_bits1(gb)];
+ if (vq_ptr[3]) coef[coef_tmp_idx + 3] = sign_lookup[get_bits1(gb)];
+ }
}else {
- for (j = 0; j < dim; j++)
- coef[coef_tmp_idx + j] = 1.0f;
+ coef[coef_tmp_idx ] = 1.0f;
+ coef[coef_tmp_idx + 1] = 1.0f;
+ if (dim == 4) {
+ coef[coef_tmp_idx + 2] = 1.0f;
+ coef[coef_tmp_idx + 3] = 1.0f;
+ }
}
if (cur_band_type == ESC_BT) {
for (j = 0; j < 2; j++) {
return -1;
}
n = (1<<n) + get_bits(gb, n);
- coef[coef_tmp_idx + j] *= cbrtf(fabsf(n)) * n;
+ coef[coef_tmp_idx + j] *= cbrtf(n) * n;
}else
coef[coef_tmp_idx + j] *= vq_ptr[j];
}
}else
- for (j = 0; j < dim; j++)
- coef[coef_tmp_idx + j] *= vq_ptr[j];
- for (j = 0; j < dim; j++)
- coef[coef_tmp_idx + j] *= sf[idx];
+ {
+ coef[coef_tmp_idx ] *= vq_ptr[0];
+ coef[coef_tmp_idx + 1] *= vq_ptr[1];
+ if (dim == 4) {
+ coef[coef_tmp_idx + 2] *= vq_ptr[2];
+ coef[coef_tmp_idx + 3] *= vq_ptr[3];
+ }
+ }
+ coef[coef_tmp_idx ] *= sf[idx];
+ coef[coef_tmp_idx + 1] *= sf[idx];
+ if (dim == 4) {
+ coef[coef_tmp_idx + 2] *= sf[idx];
+ coef[coef_tmp_idx + 3] *= sf[idx];
+ }
}
}
}
int sfb, k;
if (!sce->ics.predictor_initialized) {
- reset_all_predictors(sce->ics.predictor_state);
+ reset_all_predictors(sce->predictor_state);
sce->ics.predictor_initialized = 1;
}
if (sce->ics.window_sequence[0] != EIGHT_SHORT_SEQUENCE) {
for (sfb = 0; sfb < ff_aac_pred_sfb_max[ac->m4ac.sampling_index]; sfb++) {
for (k = sce->ics.swb_offset[sfb]; k < sce->ics.swb_offset[sfb + 1]; k++) {
- predict(ac, &sce->ics.predictor_state[k], &sce->coeffs[k],
+ predict(ac, &sce->predictor_state[k], &sce->coeffs[k],
sce->ics.predictor_present && sce->ics.prediction_used[sfb]);
}
}
if (sce->ics.predictor_reset_group)
- reset_predictor_group(sce->ics.predictor_state, sce->ics.predictor_reset_group);
+ reset_predictor_group(sce->predictor_state, sce->ics.predictor_reset_group);
} else
- reset_all_predictors(sce->ics.predictor_state);
+ reset_all_predictors(sce->predictor_state);
}
/**
if ((tns->present = get_bits1(gb)) && decode_tns(ac, tns, gb, ics))
return -1;
if (get_bits1(gb)) {
- av_log_missing_feature(ac->avccontext, "SSR", 1);
+ ff_log_missing_feature(ac->avccontext, "SSR", 1);
return -1;
}
}
if (decode_spectrum_and_dequant(ac, out, gb, sce->sf, pulse_present, &pulse, ics, sce->band_type) < 0)
return -1;
- if(ac->m4ac.object_type == AOT_AAC_MAIN)
+ if(ac->m4ac.object_type == AOT_AAC_MAIN && !common_window)
apply_prediction(ac, sce);
return 0;
if ((ret = decode_ics(ac, &cpe->ch[1], gb, common_window, 0)))
return ret;
- if (common_window && ms_present)
- apply_mid_side_stereo(cpe);
+ if (common_window) {
+ if (ms_present)
+ apply_mid_side_stereo(cpe);
+ if (ac->m4ac.object_type == AOT_AAC_MAIN) {
+ apply_prediction(ac, &cpe->ch[0]);
+ apply_prediction(ac, &cpe->ch[1]);
+ }
+ }
apply_intensity_stereo(cpe, ms_present);
return 0;
gain = cge ? get_vlc2(gb, vlc_scalefactors.table, 7, 3) - 60: 0;
gain_cache = pow(scale, -gain);
}
- for (g = 0; g < sce->ics.num_window_groups; g++) {
- for (sfb = 0; sfb < sce->ics.max_sfb; sfb++, idx++) {
- if (sce->band_type[idx] != ZERO_BT) {
- if (!cge) {
- int t = get_vlc2(gb, vlc_scalefactors.table, 7, 3) - 60;
- if (t) {
- int s = 1;
- t = gain += t;
- if (sign) {
- s -= 2 * (t & 0x1);
- t >>= 1;
+ if (coup->coupling_point == AFTER_IMDCT) {
+ coup->gain[c][0] = gain_cache;
+ } else {
+ for (g = 0; g < sce->ics.num_window_groups; g++) {
+ for (sfb = 0; sfb < sce->ics.max_sfb; sfb++, idx++) {
+ if (sce->band_type[idx] != ZERO_BT) {
+ if (!cge) {
+ int t = get_vlc2(gb, vlc_scalefactors.table, 7, 3) - 60;
+ if (t) {
+ int s = 1;
+ t = gain += t;
+ if (sign) {
+ s -= 2 * (t & 0x1);
+ t >>= 1;
+ }
+ gain_cache = pow(scale, -t) * s;
}
- gain_cache = pow(scale, -t) * s;
}
+ coup->gain[c][idx] = gain_cache;
}
- coup->gain[c][idx] = gain_cache;
}
}
}
*/
static int decode_sbr_extension(AACContext * ac, GetBitContext * gb, int crc, int cnt) {
// TODO : sbr_extension implementation
- av_log_missing_feature(ac->avccontext, "SBR", 0);
+ ff_log_missing_feature(ac->avccontext, "SBR", 0);
skip_bits_long(gb, 8*cnt - 4); // -4 due to reading extension type
return cnt;
}
const float * lwindow_prev = ics->use_kb_window[1] ? ff_aac_kbd_long_1024 : ff_sine_1024;
const float * swindow_prev = ics->use_kb_window[1] ? ff_aac_kbd_short_128 : ff_sine_128;
float * buf = ac->buf_mdct;
- DECLARE_ALIGNED(16, float, temp[128]);
+ float * temp = ac->temp;
int i;
// imdct
}
}
+static int parse_adts_frame_header(AACContext * ac, GetBitContext * gb) {
+
+ int size;
+ AACADTSHeaderInfo hdr_info;
+
+ size = ff_aac_parse_header(gb, &hdr_info);
+ if (size > 0) {
+ if (hdr_info.chan_config)
+ ac->m4ac.chan_config = hdr_info.chan_config;
+ ac->m4ac.sample_rate = hdr_info.sample_rate;
+ ac->m4ac.sampling_index = hdr_info.sampling_index;
+ ac->m4ac.object_type = hdr_info.object_type;
+ }
+ if (hdr_info.num_aac_frames == 1) {
+ if (!hdr_info.crc_absent)
+ skip_bits(gb, 16);
+ } else {
+ ff_log_missing_feature(ac->avccontext, "More than one AAC RDB per ADTS frame is", 0);
+ return -1;
+ }
+ return size;
+}
+
static int aac_decode_frame(AVCodecContext * avccontext, void * data, int * data_size, const uint8_t * buf, int buf_size) {
AACContext * ac = avccontext->priv_data;
GetBitContext gb;
init_get_bits(&gb, buf, buf_size*8);
+ if (show_bits(&gb, 12) == 0xfff) {
+ if ((err = parse_adts_frame_header(ac, &gb)) < 0) {
+ av_log(avccontext, AV_LOG_ERROR, "Error decoding AAC frame header.\n");
+ return -1;
+ }
+ if (ac->m4ac.sampling_index > 12) {
+ av_log(ac->avccontext, AV_LOG_ERROR, "invalid sampling rate index %d\n", ac->m4ac.sampling_index);
+ return -1;
+ }
+ }
+
// parse
while ((elem_type = get_bits(&gb, 3)) != TYPE_END) {
elem_id = get_bits(&gb, 4);
ac->che[TYPE_SCE][elem_id] = ac->che[TYPE_LFE][0];
ac->che[TYPE_LFE][0] = NULL;
}
- if(elem_type < TYPE_DSE) {
- if(!ac->che[elem_type][elem_id])
- return -1;
- if(elem_type != TYPE_CCE)
- ac->che[elem_type][elem_id]->coup.coupling_point = 4;
+ if(elem_type < TYPE_DSE && !ac->che[elem_type][elem_id]) {
+ av_log(ac->avccontext, AV_LOG_ERROR, "channel element %d.%d is not allocated\n", elem_type, elem_id);
+ return -1;
}
switch (elem_type) {
projects / ffmpeg / blobdiff