comparison dca.c @ 12091:c2a1bb63bd30 libavcodec

DCA: *_bits() -> *_bits_long() where needed, half fix for broken bitstream parsing

12090:82d32c82289d

    /* record number of core channels incase less than max channels are requested */
    num_core_channels = s->prim_channels;

    /* extensions start at 32-bit boundaries into bitstream */
    skip_bits(&s->gb, (-get_bits_count(&s->gb)) & 31);

    while(get_bits_left(&s->gb) >= 32) {
        uint32_t bits = get_bits(&s->gb, 32);

        switch(bits) {
        case 0x5a5a5a5a: {
            int ext_base_ch = s->prim_channels;
            int ext_amode;

            av_log(avctx, AV_LOG_DEBUG, "FSIZE96 = %d bytes\n", get_bits(&s->gb, 12)+1);
            av_log(avctx, AV_LOG_DEBUG, "REVNO = %d\n", get_bits(&s->gb, 4));
            break;
        }

        skip_bits(&s->gb, (-get_bits_count(&s->gb)) & 31);
    }

    channels = s->prim_channels + !!s->lfe;

    if (s->amode<16) {

12091:c2a1bb63bd30

    /* record number of core channels incase less than max channels are requested */
    num_core_channels = s->prim_channels;

    /* extensions start at 32-bit boundaries into bitstream */
    skip_bits_long(&s->gb, (-get_bits_count(&s->gb)) & 31);

    while(get_bits_left(&s->gb) >= 32) {
        uint32_t bits = get_bits_long(&s->gb, 32);

        switch(bits) {
        case 0x5a5a5a5a: {
            int ext_base_ch = s->prim_channels;
            int ext_amode;

            av_log(avctx, AV_LOG_DEBUG, "FSIZE96 = %d bytes\n", get_bits(&s->gb, 12)+1);
            av_log(avctx, AV_LOG_DEBUG, "REVNO = %d\n", get_bits(&s->gb, 4));
            break;
        }

        skip_bits_long(&s->gb, (-get_bits_count(&s->gb)) & 31);
    }

    channels = s->prim_channels + !!s->lfe;

    if (s->amode<16) {