comparison aac.c @ 11393:d23864bc3887 libavcodec

AAC: Set codec parameters in the first frame rather than in .init()

11392:384d803faff4

{
    AACContext *ac = avccontext->priv_data;
    int i;

    ac->avccontext = avccontext;

    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) {
        ac->m4ac.sample_rate = avccontext->sample_rate;
    }

    avccontext->sample_fmt = SAMPLE_FMT_S16;
    avccontext->frame_size = 1024;

    AAC_INIT_VLC_STATIC( 0, 304);
    AAC_INIT_VLC_STATIC( 1, 270);
    AAC_INIT_VLC_STATIC( 2, 550);
    AAC_INIT_VLC_STATIC( 3, 300);

    ChannelElement *che = NULL;
    GetBitContext gb;
    enum RawDataBlockType elem_type;
    int err, elem_id, data_size_tmp;
    int buf_consumed;

    init_get_bits(&gb, buf, buf_size * 8);

    if (show_bits(&gb, 12) == 0xfff) {
        if (parse_adts_frame_header(ac, &gb) < 0) {

            return -1;
        }
    }

    spectral_to_sample(ac);

    data_size_tmp = 1024 * avccontext->channels * sizeof(int16_t);
    if (*data_size < data_size_tmp) {
        av_log(avccontext, AV_LOG_ERROR,
               "Output buffer too small (%d) or trying to output too many samples (%d) for this frame.\n",

11393:d23864bc3887

{
    AACContext *ac = avccontext->priv_data;
    int i;

    ac->avccontext = avccontext;
    ac->m4ac.sample_rate = avccontext->sample_rate;

    if (avccontext->extradata_size > 0) {
        if (decode_audio_specific_config(ac, avccontext->extradata, avccontext->extradata_size))
            return -1;
    }

    avccontext->sample_fmt = SAMPLE_FMT_S16;

    AAC_INIT_VLC_STATIC( 0, 304);
    AAC_INIT_VLC_STATIC( 1, 270);
    AAC_INIT_VLC_STATIC( 2, 550);
    AAC_INIT_VLC_STATIC( 3, 300);

    ChannelElement *che = NULL;
    GetBitContext gb;
    enum RawDataBlockType elem_type;
    int err, elem_id, data_size_tmp;
    int buf_consumed;
    int samples = 1024, multiplier;

    init_get_bits(&gb, buf, buf_size * 8);

    if (show_bits(&gb, 12) == 0xfff) {
        if (parse_adts_frame_header(ac, &gb) < 0) {

            return -1;
        }
    }

    spectral_to_sample(ac);

    multiplier = 1;
    samples <<= multiplier;
    if (ac->output_configured < OC_LOCKED) {
        avccontext->sample_rate = ac->m4ac.sample_rate << multiplier;
        avccontext->frame_size = samples;
    }

    data_size_tmp = 1024 * avccontext->channels * sizeof(int16_t);
    if (*data_size < data_size_tmp) {
        av_log(avccontext, AV_LOG_ERROR,
               "Output buffer too small (%d) or trying to output too many samples (%d) for this frame.\n",