comparison wavpack.c @ 10535:95f3daa991a2 libavcodec

Use get_bits_left() instead of size_in_bits - get_bits_count().

10534:4cd2ef16fb63

    int sign;
    int exp = s->float_max_exp;

    if(s->got_extra_bits){
        const int max_bits = 1 + 23 + 8 + 1;
        const int left_bits = s->gb_extra_bits.size_in_bits - get_bits_count(&s->gb_extra_bits);

        if(left_bits + 8 * FF_INPUT_BUFFER_PADDING_SIZE < max_bits)
            return 0.0;
    }

    if(!got_float && avctx->sample_fmt == SAMPLE_FMT_FLT){
        av_log(avctx, AV_LOG_ERROR, "Float information not found\n");
        return -1;
    }
    if(s->got_extra_bits && avctx->sample_fmt != SAMPLE_FMT_FLT){
        const int size = s->gb_extra_bits.size_in_bits - get_bits_count(&s->gb_extra_bits);
        const int wanted = s->samples * s->extra_bits << s->stereo_in;
        if(size < wanted){
            av_log(avctx, AV_LOG_ERROR, "Too small EXTRABITS\n");
            s->got_extra_bits = 0;
        }

10535:95f3daa991a2

    int sign;
    int exp = s->float_max_exp;

    if(s->got_extra_bits){
        const int max_bits = 1 + 23 + 8 + 1;
        const int left_bits = get_bits_left(&s->gb_extra_bits);

        if(left_bits + 8 * FF_INPUT_BUFFER_PADDING_SIZE < max_bits)
            return 0.0;
    }

    if(!got_float && avctx->sample_fmt == SAMPLE_FMT_FLT){
        av_log(avctx, AV_LOG_ERROR, "Float information not found\n");
        return -1;
    }
    if(s->got_extra_bits && avctx->sample_fmt != SAMPLE_FMT_FLT){
        const int size = get_bits_left(&s->gb_extra_bits);
        const int wanted = s->samples * s->extra_bits << s->stereo_in;
        if(size < wanted){
            av_log(avctx, AV_LOG_ERROR, "Too small EXTRABITS\n");
            s->got_extra_bits = 0;
        }