comparison aac.c @ 10306:c97a6cabee62 libavcodec

AAC: Add channel layout support for channel configuration as defined in the specification

10305:86fadefa1143

static VLC vlc_spectral[11];


static ChannelElement *get_che(AACContext *ac, int type, int elem_id)
{
    static const int8_t tags_per_config[16] = { 0, 1, 1, 2, 3, 3, 4, 5, 0, 0, 0, 0, 0, 0, 0, 0 };
    if (ac->tag_che_map[type][elem_id]) {
        return ac->tag_che_map[type][elem_id];
    }
    if (ac->tags_mapped >= tags_per_config[ac->m4ac.chan_config]) {
        return NULL;

    AVCodecContext *avctx = ac->avccontext;
    int i, type, channels = 0;

    memcpy(che_pos, new_che_pos, 4 * MAX_ELEM_ID * sizeof(new_che_pos[0][0]));

    /* Allocate or free elements depending on if they are in the
     * current program configuration.
     *
     * Set up default 1:1 output mapping.
     *

            } else
                av_freep(&ac->che[type][i]);
        }
    }

    if (channel_config) {
        memset(ac->tag_che_map, 0,       4 * MAX_ELEM_ID * sizeof(ac->che[0][0]));
        ac->tags_mapped = 0;
    } else {
        memcpy(ac->tag_che_map, ac->che, 4 * MAX_ELEM_ID * sizeof(ac->che[0][0]));
        ac->tags_mapped = 4 * MAX_ELEM_ID;
    }

    avctx->channels = channels;

    ac->output_configured = 1;

    aac_decode_frame,
    .long_name = NULL_IF_CONFIG_SMALL("Advanced Audio Coding"),
    .sample_fmts = (const enum SampleFormat[]) {
        SAMPLE_FMT_S16,SAMPLE_FMT_NONE
    },
};

10306:c97a6cabee62

static VLC vlc_spectral[11];


static ChannelElement *get_che(AACContext *ac, int type, int elem_id)
{
    if (ac->tag_che_map[type][elem_id]) {
        return ac->tag_che_map[type][elem_id];
    }
    if (ac->tags_mapped >= tags_per_config[ac->m4ac.chan_config]) {
        return NULL;

    AVCodecContext *avctx = ac->avccontext;
    int i, type, channels = 0;

    memcpy(che_pos, new_che_pos, 4 * MAX_ELEM_ID * sizeof(new_che_pos[0][0]));

    if (channel_config) {
        for (i = 0; i < tags_per_config[channel_config]; i++) {
            const int id = aac_channel_layout_map[channel_config - 1][i][1];
            type         = aac_channel_layout_map[channel_config - 1][i][0];

            if (!ac->che[type][id] && !(ac->che[type][id] = av_mallocz(sizeof(ChannelElement))))
                return AVERROR(ENOMEM);

            if (type != TYPE_CCE) {
                ac->output_data[channels++] = ac->che[type][id]->ch[0].ret;
                if (type == TYPE_CPE)
                    ac->output_data[channels++] = ac->che[type][id]->ch[1].ret;
            }
        }

        memset(ac->tag_che_map, 0,       4 * MAX_ELEM_ID * sizeof(ac->che[0][0]));
        ac->tags_mapped = 0;

        avctx->channel_layout = aac_channel_layout[channel_config - 1];
    } else {
    /* Allocate or free elements depending on if they are in the
     * current program configuration.
     *
     * Set up default 1:1 output mapping.
     *

            } else
                av_freep(&ac->che[type][i]);
        }
    }

        memcpy(ac->tag_che_map, ac->che, 4 * MAX_ELEM_ID * sizeof(ac->che[0][0]));
        ac->tags_mapped = 4 * MAX_ELEM_ID;

        avctx->channel_layout = 0;
    }

    avctx->channels = channels;

    ac->output_configured = 1;

    aac_decode_frame,
    .long_name = NULL_IF_CONFIG_SMALL("Advanced Audio Coding"),
    .sample_fmts = (const enum SampleFormat[]) {
        SAMPLE_FMT_S16,SAMPLE_FMT_NONE
    },
    .channel_layouts = aac_channel_layout,
};