comparison ac3dec.c @ 6869:59ae0494b656 libavcodec

add checks for missing information in the first block

6868:5387096bf92a

        } else {
            /* coupling not in use */
            for (ch = 1; ch <= fbw_channels; ch++)
                s->channel_in_cpl[ch] = 0;
        }
    }

    /* coupling coordinates */
    if (s->cpl_in_use) {
        int cpl_coords_exist = 0;

                            s->cpl_coords[ch][bnd] = cpl_coord_mant << 22;
                        else
                            s->cpl_coords[ch][bnd] = (cpl_coord_mant + 16) << 21;
                        s->cpl_coords[ch][bnd] >>= (cpl_coord_exp + master_cpl_coord);
                    }
                }
            }
        }
        /* phase flags */
        if (channel_mode == AC3_CHMODE_STEREO && cpl_coords_exist) {

            s->num_rematrixing_bands = 4;
            if(s->cpl_in_use && s->start_freq[CPL_CH] <= 61)
                s->num_rematrixing_bands -= 1 + (s->start_freq[CPL_CH] == 37);
            for(bnd=0; bnd<s->num_rematrixing_bands; bnd++)
                s->rematrixing_flags[bnd] = get_bits1(gbc);
        }
    }

    /* exponent strategies for each channel */
    s->exp_strategy[CPL_CH] = EXP_REUSE;

        s->bit_alloc_params.db_per_bit = ff_ac3_db_per_bit_tab[get_bits(gbc, 2)];
        s->bit_alloc_params.floor  = ff_ac3_floor_tab[get_bits(gbc, 3)];
        for(ch=!s->cpl_in_use; ch<=s->channels; ch++) {
            bit_alloc_stages[ch] = FFMAX(bit_alloc_stages[ch], 2);
        }
    }

    /* signal-to-noise ratio offsets and fast gains (signal-to-mask ratios) */
    if (get_bits1(gbc)) {
        int csnr;

        for (ch = !s->cpl_in_use; ch <= s->channels; ch++) { /* snr offset and fast gain */
            s->snr_offset[ch] = (csnr + get_bits(gbc, 4)) << 2;
            s->fast_gain[ch] = ff_ac3_fast_gain_tab[get_bits(gbc, 3)];
        }
        memset(bit_alloc_stages, 3, AC3_MAX_CHANNELS);
    }

    /* coupling leak information */
    if (s->cpl_in_use && get_bits1(gbc)) {
        s->bit_alloc_params.cpl_fast_leak = get_bits(gbc, 3);
        s->bit_alloc_params.cpl_slow_leak = get_bits(gbc, 3);
        bit_alloc_stages[CPL_CH] = FFMAX(bit_alloc_stages[CPL_CH], 2);
    }

    /* delta bit allocation information */
    if (get_bits1(gbc)) {
        /* delta bit allocation exists (strategy) */

6869:59ae0494b656

        } else {
            /* coupling not in use */
            for (ch = 1; ch <= fbw_channels; ch++)
                s->channel_in_cpl[ch] = 0;
        }
    } else if (!blk) {
        av_log(s->avctx, AV_LOG_ERROR, "new coupling strategy must be present in block 0\n");
        return -1;
    }

    /* coupling coordinates */
    if (s->cpl_in_use) {
        int cpl_coords_exist = 0;

                            s->cpl_coords[ch][bnd] = cpl_coord_mant << 22;
                        else
                            s->cpl_coords[ch][bnd] = (cpl_coord_mant + 16) << 21;
                        s->cpl_coords[ch][bnd] >>= (cpl_coord_exp + master_cpl_coord);
                    }
                } else if (!blk) {
                    av_log(s->avctx, AV_LOG_ERROR, "new coupling coordinates must be present in block 0\n");
                    return -1;
                }
            }
        }
        /* phase flags */
        if (channel_mode == AC3_CHMODE_STEREO && cpl_coords_exist) {

            s->num_rematrixing_bands = 4;
            if(s->cpl_in_use && s->start_freq[CPL_CH] <= 61)
                s->num_rematrixing_bands -= 1 + (s->start_freq[CPL_CH] == 37);
            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;
        }
    }

    /* exponent strategies for each channel */
    s->exp_strategy[CPL_CH] = EXP_REUSE;

        s->bit_alloc_params.db_per_bit = ff_ac3_db_per_bit_tab[get_bits(gbc, 2)];
        s->bit_alloc_params.floor  = ff_ac3_floor_tab[get_bits(gbc, 3)];
        for(ch=!s->cpl_in_use; ch<=s->channels; ch++) {
            bit_alloc_stages[ch] = FFMAX(bit_alloc_stages[ch], 2);
        }
    } else if (!blk) {
        av_log(s->avctx, AV_LOG_ERROR, "new bit allocation info must be present in block 0\n");
        return -1;
    }

    /* signal-to-noise ratio offsets and fast gains (signal-to-mask ratios) */
    if (get_bits1(gbc)) {
        int csnr;

        for (ch = !s->cpl_in_use; ch <= s->channels; ch++) { /* snr offset and fast gain */
            s->snr_offset[ch] = (csnr + get_bits(gbc, 4)) << 2;
            s->fast_gain[ch] = ff_ac3_fast_gain_tab[get_bits(gbc, 3)];
        }
        memset(bit_alloc_stages, 3, AC3_MAX_CHANNELS);
    } else if (!blk) {
        av_log(s->avctx, AV_LOG_ERROR, "new snr offsets must be present in block 0\n");
        return -1;
    }

    /* coupling leak information */
    if (s->cpl_in_use && get_bits1(gbc)) {
        s->bit_alloc_params.cpl_fast_leak = get_bits(gbc, 3);
        s->bit_alloc_params.cpl_slow_leak = get_bits(gbc, 3);
        bit_alloc_stages[CPL_CH] = FFMAX(bit_alloc_stages[CPL_CH], 2);
    } else if (!blk) {
        av_log(s->avctx, AV_LOG_ERROR, "new coupling leak info must be present in block 0\n");
        return -1;
    }

    /* delta bit allocation information */
    if (get_bits1(gbc)) {
        /* delta bit allocation exists (strategy) */