comparison wavpack.c @ 11212:4a0b77af9d9c libavcodec

cosmetics: reindent after last commit

11211:dfeaae916502

    int16_t *dst16 = dst;
    int32_t *dst32 = dst;
    float   *dstfl = dst;

    if(s->samples_left == s->samples)
    s->one = s->zero = s->zeroes = 0;
    do{
        L = wv_get_value(s, gb, 0, &last);
        if(last) break;
        R = wv_get_value(s, gb, 1, &last);
        if(last) break;

        count++;
    }while(!last && count < s->max_samples);

    s->samples_left -= count;
    if(!s->samples_left){
    if(crc != s->CRC){
        av_log(s->avctx, AV_LOG_ERROR, "CRC error\n");
        return -1;
    }
    if(s->got_extra_bits && crc_extra_bits != s->crc_extra_bits){
        av_log(s->avctx, AV_LOG_ERROR, "Extra bits CRC error\n");
        return -1;
    }
    wv_reset_saved_context(s);
    }else{
        s->pos = pos;
        s->sc.crc = crc;
        s->sc.bits_used = get_bits_count(&s->gb);
        if(s->got_extra_bits){

    int16_t *dst16 = dst;
    int32_t *dst32 = dst;
    float   *dstfl = dst;

    if(s->samples_left == s->samples)
    s->one = s->zero = s->zeroes = 0;
    do{
        T = wv_get_value(s, gb, 0, &last);
        S = 0;
        if(last) break;
        for(i = 0; i < s->terms; i++){

        count++;
    }while(!last && count < s->samples);

    s->samples_left -= count;
    if(!s->samples_left){
    if(crc != s->CRC){
        av_log(s->avctx, AV_LOG_ERROR, "CRC error\n");
        return -1;
    }
    if(s->got_extra_bits && crc_extra_bits != s->crc_extra_bits){
        av_log(s->avctx, AV_LOG_ERROR, "Extra bits CRC error\n");
        return -1;
    }
    wv_reset_saved_context(s);
    }else{
        s->pos = pos;
        s->sc.crc = crc;
        s->sc.bits_used = get_bits_count(&s->gb);
        if(s->got_extra_bits){

        *data_size = 0;
        return 0;
    }

    if(!s->samples_left){
    memset(s->decorr, 0, MAX_TERMS * sizeof(Decorr));
    memset(s->ch, 0, sizeof(s->ch));
    s->extra_bits = 0;
    s->and = s->or = s->shift = 0;
    s->got_extra_bits = 0;
    }

    s->samples = AV_RL32(buf); buf += 4;
    if(!s->samples){
        *data_size = 0;

            buf += size;
        }
        if(id & WP_IDF_ODD) buf++;
    }
    if(!s->samples_left){
    if(!got_terms){
        av_log(avctx, AV_LOG_ERROR, "No block with decorrelation terms\n");
        return -1;
    }
    if(!got_weights){
        av_log(avctx, AV_LOG_ERROR, "No block with decorrelation weights\n");
        return -1;
    }
    if(!got_samples){
        av_log(avctx, AV_LOG_ERROR, "No block with decorrelation samples\n");
        return -1;
    }
    if(!got_entropy){
        av_log(avctx, AV_LOG_ERROR, "No block with entropy info\n");
        return -1;
    }
    if(s->hybrid && !got_hybrid){
        av_log(avctx, AV_LOG_ERROR, "Hybrid config not found\n");
        return -1;
    }
    if(!got_bs){
        av_log(avctx, AV_LOG_ERROR, "Packed samples not found\n");
        return -1;
    }
    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;
        }
    }
    s->samples_left = s->samples;
    }else{
        init_get_bits(&s->gb, avpkt->data + s->sc.offset, s->sc.size);
        skip_bits_long(&s->gb, s->sc.bits_used);
        if(s->got_extra_bits){
            init_get_bits(&s->gb_extra_bits, avpkt->data + s->extra_sc.offset,

11212:4a0b77af9d9c

    int16_t *dst16 = dst;
    int32_t *dst32 = dst;
    float   *dstfl = dst;

    if(s->samples_left == s->samples)
        s->one = s->zero = s->zeroes = 0;
    do{
        L = wv_get_value(s, gb, 0, &last);
        if(last) break;
        R = wv_get_value(s, gb, 1, &last);
        if(last) break;

        count++;
    }while(!last && count < s->max_samples);

    s->samples_left -= count;
    if(!s->samples_left){
        if(crc != s->CRC){
            av_log(s->avctx, AV_LOG_ERROR, "CRC error\n");
            return -1;
        }
        if(s->got_extra_bits && crc_extra_bits != s->crc_extra_bits){
            av_log(s->avctx, AV_LOG_ERROR, "Extra bits CRC error\n");
            return -1;
        }
        wv_reset_saved_context(s);
    }else{
        s->pos = pos;
        s->sc.crc = crc;
        s->sc.bits_used = get_bits_count(&s->gb);
        if(s->got_extra_bits){

    int16_t *dst16 = dst;
    int32_t *dst32 = dst;
    float   *dstfl = dst;

    if(s->samples_left == s->samples)
        s->one = s->zero = s->zeroes = 0;
    do{
        T = wv_get_value(s, gb, 0, &last);
        S = 0;
        if(last) break;
        for(i = 0; i < s->terms; i++){

        count++;
    }while(!last && count < s->samples);

    s->samples_left -= count;
    if(!s->samples_left){
        if(crc != s->CRC){
            av_log(s->avctx, AV_LOG_ERROR, "CRC error\n");
            return -1;
        }
        if(s->got_extra_bits && crc_extra_bits != s->crc_extra_bits){
            av_log(s->avctx, AV_LOG_ERROR, "Extra bits CRC error\n");
            return -1;
        }
        wv_reset_saved_context(s);
    }else{
        s->pos = pos;
        s->sc.crc = crc;
        s->sc.bits_used = get_bits_count(&s->gb);
        if(s->got_extra_bits){

        *data_size = 0;
        return 0;
    }

    if(!s->samples_left){
        memset(s->decorr, 0, MAX_TERMS * sizeof(Decorr));
        memset(s->ch, 0, sizeof(s->ch));
        s->extra_bits = 0;
        s->and = s->or = s->shift = 0;
        s->got_extra_bits = 0;
    }

    s->samples = AV_RL32(buf); buf += 4;
    if(!s->samples){
        *data_size = 0;

            buf += size;
        }
        if(id & WP_IDF_ODD) buf++;
    }
    if(!s->samples_left){
        if(!got_terms){
            av_log(avctx, AV_LOG_ERROR, "No block with decorrelation terms\n");
            return -1;
        }
        if(!got_weights){
            av_log(avctx, AV_LOG_ERROR, "No block with decorrelation weights\n");
            return -1;
        }
        if(!got_samples){
            av_log(avctx, AV_LOG_ERROR, "No block with decorrelation samples\n");
            return -1;
        }
        if(!got_entropy){
            av_log(avctx, AV_LOG_ERROR, "No block with entropy info\n");
            return -1;
        }
        if(s->hybrid && !got_hybrid){
            av_log(avctx, AV_LOG_ERROR, "Hybrid config not found\n");
            return -1;
        }
        if(!got_bs){
            av_log(avctx, AV_LOG_ERROR, "Packed samples not found\n");
            return -1;
        }
        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;
            }
        }
        s->samples_left = s->samples;
    }else{
        init_get_bits(&s->gb, avpkt->data + s->sc.offset, s->sc.size);
        skip_bits_long(&s->gb, s->sc.bits_used);
        if(s->got_extra_bits){
            init_get_bits(&s->gb_extra_bits, avpkt->data + s->extra_sc.offset,