comparison faxcompr.c @ 8481:f456c3aebe1c libavcodec

Get rid of pix_left in the 2d code, it is simpler that way.

8480:c0f1e9a9402c

    *runs++ = 0;
    return 0;
}

static int decode_group3_2d_line(AVCodecContext *avctx, GetBitContext *gb,
                                 int pix_left, int *runs, const int *runend, const int *ref)
{
    int mode = 0, offs = 0, run = 0, saved_run = 0, t;
    int run_off = *ref++;
    int *run_start = runs;

    runend--; // for the last written 0

    while(pix_left > 0){
        int cmode = get_vlc2(gb, ccitt_group3_2d_vlc.table, 9, 1);
        if(cmode == -1){
            av_log(avctx, AV_LOG_ERROR, "Incorrect mode VLC\n");
            return -1;
        }

        }
        if(!cmode){//pass mode
            run_off += *ref++;
            run = run_off - offs;
            run_off += *ref++;
            pix_left -= run;
            if(pix_left < 0){
                av_log(avctx, AV_LOG_ERROR, "Run went out of bounds\n");
                return -1;
            }
            offs += run;
            saved_run += run;
        }else if(cmode == 1){//horizontal mode
            int k;
            for(k = 0; k < 2; k++){
                run = 0;

                if(runs >= runend){
                    av_log(avctx, AV_LOG_ERROR, "Run overrun\n");
                    return -1;
                }
                saved_run = 0;
                pix_left -= run;
                if(pix_left < 0){
                    av_log(avctx, AV_LOG_ERROR, "Run went out of bounds\n");
                    return -1;
                }
                offs += run;
                mode = !mode;
            }
        }else if(cmode == 9 || cmode == 10){
            av_log(avctx, AV_LOG_ERROR, "Special modes are not supported (yet)\n");
            return -1;

            run = run_off - offs + (cmode - 5);
            if(cmode >= 5)
                run_off += *ref++;
            else
                run_off -= *--ref;
            pix_left -= run;
            if(pix_left < 0){
                av_log(avctx, AV_LOG_ERROR, "Run went out of bounds\n");
                return -1;
            }
            offs += run;
            *runs++ = run + saved_run;
            if(runs >= runend){
                av_log(avctx, AV_LOG_ERROR, "Run overrun\n");
                return -1;
            }

8481:f456c3aebe1c

    *runs++ = 0;
    return 0;
}

static int decode_group3_2d_line(AVCodecContext *avctx, GetBitContext *gb,
                                 int width, int *runs, const int *runend, const int *ref)
{
    int mode = 0, offs = 0, run = 0, saved_run = 0, t;
    int run_off = *ref++;
    int *run_start = runs;

    runend--; // for the last written 0

    while(offs < width){
        int cmode = get_vlc2(gb, ccitt_group3_2d_vlc.table, 9, 1);
        if(cmode == -1){
            av_log(avctx, AV_LOG_ERROR, "Incorrect mode VLC\n");
            return -1;
        }

        }
        if(!cmode){//pass mode
            run_off += *ref++;
            run = run_off - offs;
            run_off += *ref++;
            offs += run;
            if(offs > width){
                av_log(avctx, AV_LOG_ERROR, "Run went out of bounds\n");
                return -1;
            }
            saved_run += run;
        }else if(cmode == 1){//horizontal mode
            int k;
            for(k = 0; k < 2; k++){
                run = 0;

                if(runs >= runend){
                    av_log(avctx, AV_LOG_ERROR, "Run overrun\n");
                    return -1;
                }
                saved_run = 0;
                offs += run;
                if(offs > width){
                    av_log(avctx, AV_LOG_ERROR, "Run went out of bounds\n");
                    return -1;
                }
                mode = !mode;
            }
        }else if(cmode == 9 || cmode == 10){
            av_log(avctx, AV_LOG_ERROR, "Special modes are not supported (yet)\n");
            return -1;

            run = run_off - offs + (cmode - 5);
            if(cmode >= 5)
                run_off += *ref++;
            else
                run_off -= *--ref;
            offs += run;
            if(offs > width){
                av_log(avctx, AV_LOG_ERROR, "Run went out of bounds\n");
                return -1;
            }
            *runs++ = run + saved_run;
            if(runs >= runend){
                av_log(avctx, AV_LOG_ERROR, "Run overrun\n");
                return -1;
            }