comparison aac.c @ 11819:9bdc0fe882fa libavcodec

aacdec: Work around illegal files with all elem_id tags set to the same value. Fixes issue 1882.

11818:fd38b5438c26

static const char overread_err[] = "Input buffer exhausted before END element found\n";

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;

            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);

        if (elem_type < TYPE_DSE && !(che=get_che(ac, elem_type, elem_id))) {

11819:9bdc0fe882fa

static const char overread_err[] = "Input buffer exhausted before END element found\n";

static ChannelElement *get_che(AACContext *ac, int type, int elem_id)
{
    /* Some buggy encoders appear to set all elem_ids to zero and rely on
    channels always occurring in the same order. This is expressly forbidden
    by the spec but we will try to work around it.
    */
    int err_printed = 0;
    while (ac->tags_seen_this_frame[type][elem_id] && elem_id < MAX_ELEM_ID) {
        if (ac->output_configured < OC_LOCKED && !err_printed) {
            av_log(ac->avccontext, AV_LOG_WARNING, "Duplicate channel tag found, attempting to remap.\n");
            err_printed = 1;
        }
        elem_id++;
    }
    if (elem_id == MAX_ELEM_ID)
        return NULL;
    ac->tags_seen_this_frame[type][elem_id] = 1;

    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;

            av_log(ac->avccontext, AV_LOG_ERROR, "invalid sampling rate index %d\n", ac->m4ac.sampling_index);
            return -1;
        }
    }

    memset(ac->tags_seen_this_frame, 0, sizeof(ac->tags_seen_this_frame));
    // parse
    while ((elem_type = get_bits(&gb, 3)) != TYPE_END) {
        elem_id = get_bits(&gb, 4);

        if (elem_type < TYPE_DSE && !(che=get_che(ac, elem_type, elem_id))) {