comparison h261.c @ 2225:35fc37209ea0 libavcodec

H.261 decoder improvements - GOB's can exist of only MBA_STUFFING codes: it crashed before, but it is fixed now - Clearer code - Some extra checks so the decoder is more resilient against errors patch by (Maarten Daniels <maarten dot daniels at student dot luc dot ac dot be>)

2224:11d54cb7ac4e

#define H261_MTYPE_VLC_BITS 6
#define H261_MV_VLC_BITS 7
#define H261_CBP_VLC_BITS 9
#define TCOEFF_VLC_BITS 9

#define MAX_MBA 33
#define IS_FIL(a)    ((a)&MB_TYPE_H261_FIL)

/**
 * H261Context
 */

    int mba_diff;
    int mtype;
    int current_mv_x;
    int current_mv_y;
    int gob_number;
    int loop_filter;
    int bits_left; //8 - nr of bits left of the following frame in the last byte in this frame
    int last_bits; //bits left of the following frame in the last byte in this frame
}H261Context;

void ff_h261_loop_filter(H261Context * h){
    MpegEncContext * const s = &h->s;
    const int linesize  = s->linesize;

    s->dsp.h261_loop_filter(dest_cr, uvlinesize);
}

static int h261_decode_block(H261Context *h, DCTELEM *block,
                             int n, int coded);
static int h261_decode_mb(H261Context *h,
                      DCTELEM block[6][64]);
void ff_set_qscale(MpegEncContext * s, int qscale);

/***********************************************/
/* decoding */

static void h261_decode_init_vlc(H261Context *h){
    static int done = 0;

    if(!done){
        done = 1;
        init_vlc(&h261_mba_vlc, H261_MBA_VLC_BITS, 34,
                 h261_mba_bits, 1, 1,
                 h261_mba_code, 1, 1);
        init_vlc(&h261_mtype_vlc, H261_MTYPE_VLC_BITS, 10,
                 h261_mtype_bits, 1, 1,
                 h261_mtype_code, 1, 1);

    h261_decode_init_vlc(h);

    h->bits_left = 0;
    h->last_bits = 0;
    
    return 0;
}

/**

 */
static int h261_decode_gob_header(H261Context *h){
    unsigned int val;
    MpegEncContext * const s = &h->s;
    
    /* Check for GOB Start Code */
    val = show_bits(&s->gb, 15);
    if(val)
        return -1;

    /* We have a GBSC */
    skip_bits(&s->gb, 16);

    h->gob_number = get_bits(&s->gb, 4); /* GN */
    s->qscale = get_bits(&s->gb, 5); /* GQUANT */

    /* GEI */
    while (get_bits1(&s->gb) != 0) {
        skip_bits(&s->gb, 8);
    }

 */
static int ff_h261_resync(H261Context *h){
    MpegEncContext * const s = &h->s;
    int left, ret;

    if(show_bits(&s->gb, 15)==0){
        ret= h261_decode_gob_header(h);
        if(ret>=0)
            return 0;
    }
    //ok, its not where its supposed to be ...
    s->gb= s->last_resync_gb;
    align_get_bits(&s->gb);
    left= s->gb.size_in_bits - get_bits_count(&s->gb);

    for(;left>15+1+4+5; left-=8){
        if(show_bits(&s->gb, 15)==0){
            GetBitContext bak= s->gb;

            ret= h261_decode_gob_header(h);
            if(ret>=0)
                return 0;

            s->gb= bak;
        }
        skip_bits(&s->gb, 8);
    }

    return -1;
}

    return 0;
}

static int decode_mv_component(GetBitContext *gb, int v){
    int mv_diff = get_vlc2(gb, h261_mv_vlc.table, H261_MV_VLC_BITS, 2);
    mv_diff = mvmap[mv_diff];

    if(mv_diff && !get_bits1(gb))
        mv_diff= -mv_diff;
    

    else if(v >= 16) v-= 32;

    return v;
}

static int h261_decode_mb(H261Context *h,
                          DCTELEM block[6][64])
{
    MpegEncContext * const s = &h->s;
    int i, cbp, xy, old_mtype;

    cbp = 63;
    // Read mba
    do{
        h->mba_diff = get_vlc2(&s->gb, h261_mba_vlc.table, H261_MBA_VLC_BITS, 2)+1;
    }
    while( h->mba_diff == MAX_MBA + 1 ); // stuffing

    if ( h->mba_diff < 0 )
        return -1;

    h->current_mba += h->mba_diff;

    if ( h->current_mba > MAX_MBA )
        return -1;
    
    s->mb_x= ((h->gob_number-1) % 2) * 11 + ((h->current_mba-1) % 11);
    s->mb_y= ((h->gob_number-1) / 2) * 3 + ((h->current_mba-1) / 11);

    xy = s->mb_x + s->mb_y * s->mb_stride;

    ff_init_block_index(s);
    ff_update_block_index(s);
    s->dsp.clear_blocks(s->block[0]);

    // Read mtype
    old_mtype = h->mtype;
    h->mtype = get_vlc2(&s->gb, h261_mtype_vlc.table, H261_MTYPE_VLC_BITS, 2);
    h->mtype = h261_mtype_map[h->mtype];

    if (IS_FIL (h->mtype))
        h->loop_filter = 1;

    // Read mquant
    if ( IS_QUANT ( h->mtype ) ){
        ff_set_qscale(s, get_bits(&s->gb, 5));
    }

intra:
    /* decode each block */
    if(s->mb_intra || HAS_CBP(h->mtype)){
        for (i = 0; i < 6; i++) {
            if (h261_decode_block(h, block[i], i, cbp&32) < 0){
                return -1;
            }
            cbp+=cbp;
        }
    }

    /* per-MB end of slice check */
    {
        int v= show_bits(&s->gb, 15);

        if(get_bits_count(&s->gb) + 15 > s->gb.size_in_bits){
            v>>= get_bits_count(&s->gb) + 15 - s->gb.size_in_bits;
        }

        if(v==0){
            return SLICE_END;
        }
    }
    return SLICE_OK;
}

/**
 * decodes a macroblock

 * @return <0 if no startcode found
 */
int h261_decode_picture_header(H261Context *h){
    MpegEncContext * const s = &h->s;
    int format, i;
    static int h261_framecounter = 0;
    uint32_t startcode;
    align_get_bits(&s->gb);

    startcode = (h->last_bits << (12 - (8-h->bits_left))) | get_bits(&s->gb, 20-8 - (8- h->bits_left));

    /* PEI */
    while (get_bits1(&s->gb) != 0){
        skip_bits(&s->gb, 8);
    }

    //h261 has no I-FRAMES, pass the test in MPV_frame_start in mpegvideo.c
    if(h261_framecounter > 1)
        s->pict_type = P_TYPE;
    else
        s->pict_type = I_TYPE;

    h261_framecounter++;

    h->gob_number = 0;
    return 0;
}

static int h261_decode_gob(H261Context *h){
    MpegEncContext * const s = &h->s;
    int v;
    
    ff_set_qscale(s, s->qscale);

    /* check for empty gob */
    v= show_bits(&s->gb, 15);

    if(get_bits_count(&s->gb) + 15 > s->gb.size_in_bits){
        v>>= get_bits_count(&s->gb) + 15 - s->gb.size_in_bits;
    }

    if(v==0){
        h261_decode_mb_skipped(h, 0, 33);
        return 0;
    }

    /* decode mb's */
    while(h->current_mba <= MAX_MBA)
    {
        int ret;
        /* DCT & quantize */
        ret= h261_decode_mb(h, s->block);
        if(ret<0){
            const int xy= s->mb_x + s->mb_y*s->mb_stride;
            if(ret==SLICE_END){
                MPV_decode_mb(s, s->block);
                if(h->loop_filter){
                    ff_h261_loop_filter(h);
                }
                h->loop_filter = 0;
                h261_decode_mb_skipped(h, h->current_mba-h->mba_diff, h->current_mba-1);
                h261_decode_mb_skipped(h, h->current_mba, 33);                
                return 0;
            }else if(ret==SLICE_NOEND){
                av_log(s->avctx, AV_LOG_ERROR, "Slice mismatch at MB: %d\n", xy);
                return -1;
            }
            av_log(s->avctx, AV_LOG_ERROR, "Error at MB: %d\n", xy);
            return -1;
        }
        MPV_decode_mb(s, s->block);
        if(h->loop_filter){
            ff_h261_loop_filter(h);
        }

        h->loop_filter = 0;
        h261_decode_mb_skipped(h, h->current_mba-h->mba_diff, h->current_mba-1);
    }
    
    return -1;
}

2225:35fc37209ea0

#define H261_MTYPE_VLC_BITS 6
#define H261_MV_VLC_BITS 7
#define H261_CBP_VLC_BITS 9
#define TCOEFF_VLC_BITS 9

#define MBA_STUFFING 33
#define MBA_STARTCODE 34
#define IS_FIL(a)    ((a)&MB_TYPE_H261_FIL)

/**
 * H261Context
 */

    int mba_diff;
    int mtype;
    int current_mv_x;
    int current_mv_y;
    int gob_number;
    int bits_left; //8 - nr of bits left of the following frame in the last byte in this frame
    int last_bits; //bits left of the following frame in the last byte in this frame
    int gob_start_code_skipped; // 1 if gob start code is already read before gob header is read
}H261Context;

void ff_h261_loop_filter(H261Context * h){
    MpegEncContext * const s = &h->s;
    const int linesize  = s->linesize;

    s->dsp.h261_loop_filter(dest_cr, uvlinesize);
}

static int h261_decode_block(H261Context *h, DCTELEM *block,
                             int n, int coded);
static int h261_decode_mb(H261Context *h);
void ff_set_qscale(MpegEncContext * s, int qscale);

/***********************************************/
/* decoding */

static void h261_decode_init_vlc(H261Context *h){
    static int done = 0;

    if(!done){
        done = 1;
        init_vlc(&h261_mba_vlc, H261_MBA_VLC_BITS, 35,
                 h261_mba_bits, 1, 1,
                 h261_mba_code, 1, 1);
        init_vlc(&h261_mtype_vlc, H261_MTYPE_VLC_BITS, 10,
                 h261_mtype_bits, 1, 1,
                 h261_mtype_code, 1, 1);

    h261_decode_init_vlc(h);

    h->bits_left = 0;
    h->last_bits = 0;
    h->gob_start_code_skipped = 0;
    
    return 0;
}

/**

 */
static int h261_decode_gob_header(H261Context *h){
    unsigned int val;
    MpegEncContext * const s = &h->s;
    
    if ( !h->gob_start_code_skipped ){
        /* Check for GOB Start Code */
        val = show_bits(&s->gb, 15);
        if(val)
            return -1;

        /* We have a GBSC */
        skip_bits(&s->gb, 16);
    }

    h->gob_start_code_skipped = 0;

    h->gob_number = get_bits(&s->gb, 4); /* GN */
    s->qscale = get_bits(&s->gb, 5); /* GQUANT */

    /* Check if gob_number is valid */
    if (s->mb_height==18){ //cif
        if ((h->gob_number<=0) || (h->gob_number>12))
            return -1;
    }
    else{ //qcif
        if ((h->gob_number!=1) && (h->gob_number!=3) && (h->gob_number!=5))
            return -1;
    }

    /* GEI */
    while (get_bits1(&s->gb) != 0) {
        skip_bits(&s->gb, 8);
    }

 */
static int ff_h261_resync(H261Context *h){
    MpegEncContext * const s = &h->s;
    int left, ret;

    if ( h->gob_start_code_skipped ){
        ret= h261_decode_gob_header(h);
        if(ret>=0)
            return 0;
    }
    else{
        if(show_bits(&s->gb, 15)==0){
            ret= h261_decode_gob_header(h);
            if(ret>=0)
                return 0;
        }
        //ok, its not where its supposed to be ...
        s->gb= s->last_resync_gb;
        align_get_bits(&s->gb);
        left= s->gb.size_in_bits - get_bits_count(&s->gb);

        for(;left>15+1+4+5; left-=8){
            if(show_bits(&s->gb, 15)==0){
                GetBitContext bak= s->gb;

                ret= h261_decode_gob_header(h);
                if(ret>=0)
                    return 0;

                s->gb= bak;
            }
            skip_bits(&s->gb, 8);
        }
    }

    return -1;
}

    return 0;
}

static int decode_mv_component(GetBitContext *gb, int v){
    int mv_diff = get_vlc2(gb, h261_mv_vlc.table, H261_MV_VLC_BITS, 2);

    /* check if mv_diff is valid */
    if ( mv_diff < 0 )
        return v;

    mv_diff = mvmap[mv_diff];

    if(mv_diff && !get_bits1(gb))
        mv_diff= -mv_diff;
    

    else if(v >= 16) v-= 32;

    return v;
}

static int h261_decode_mb(H261Context *h){
    MpegEncContext * const s = &h->s;
    int i, cbp, xy, old_mtype;

    cbp = 63;
    // Read mba
    do{
        h->mba_diff = get_vlc2(&s->gb, h261_mba_vlc.table, H261_MBA_VLC_BITS, 2);

        /* Check for slice end */
        /* NOTE: GOB can be empty (no MB data) or exist only of MBA_stuffing */
        if (h->mba_diff == MBA_STARTCODE){ // start code
            h->gob_start_code_skipped = 1;
            return SLICE_END;
        }
    }
    while( h->mba_diff == MBA_STUFFING ); // stuffing

    if ( h->mba_diff < 0 ){
        if ( get_bits_count(&s->gb) + 7 >= s->gb.size_in_bits )
            return SLICE_END;

        av_log(s->avctx, AV_LOG_ERROR, "illegal mba at %d %d\n", s->mb_x, s->mb_y);
        return SLICE_ERROR;
    }

    h->mba_diff += 1;
    h->current_mba += h->mba_diff;

    if ( h->current_mba > MBA_STUFFING )
        return SLICE_ERROR;
    
    s->mb_x= ((h->gob_number-1) % 2) * 11 + ((h->current_mba-1) % 11);
    s->mb_y= ((h->gob_number-1) / 2) * 3 + ((h->current_mba-1) / 11);
    xy = s->mb_x + s->mb_y * s->mb_stride;
    ff_init_block_index(s);
    ff_update_block_index(s);
    s->dsp.clear_blocks(s->block[0]);

    // Read mtype
    old_mtype = h->mtype;
    h->mtype = get_vlc2(&s->gb, h261_mtype_vlc.table, H261_MTYPE_VLC_BITS, 2);
    h->mtype = h261_mtype_map[h->mtype];

    // Read mquant
    if ( IS_QUANT ( h->mtype ) ){
        ff_set_qscale(s, get_bits(&s->gb, 5));
    }

intra:
    /* decode each block */
    if(s->mb_intra || HAS_CBP(h->mtype)){
        for (i = 0; i < 6; i++) {
            if (h261_decode_block(h, s->block[i], i, cbp&32) < 0){
                return SLICE_ERROR;
            }
            cbp+=cbp;
        }
    }

    MPV_decode_mb(s, s->block);

    if(IS_FIL (h->mtype)){
        ff_h261_loop_filter(h);
    }

    return SLICE_OK;
}

/**
 * decodes a macroblock

 * @return <0 if no startcode found
 */
int h261_decode_picture_header(H261Context *h){
    MpegEncContext * const s = &h->s;
    int format, i;
    uint32_t startcode;
    align_get_bits(&s->gb);

    startcode = (h->last_bits << (12 - (8-h->bits_left))) | get_bits(&s->gb, 20-8 - (8- h->bits_left));

    /* PEI */
    while (get_bits1(&s->gb) != 0){
        skip_bits(&s->gb, 8);
    }

    // h261 has no I-FRAMES, but if we pass I_TYPE for the first frame, the codec crashes if it does 
    // not contain all I-blocks (e.g. when a packet is lost)
    s->pict_type = P_TYPE;

    h->gob_number = 0;
    return 0;
}

static int h261_decode_gob(H261Context *h){
    MpegEncContext * const s = &h->s;
    
    ff_set_qscale(s, s->qscale);

    /* decode mb's */
    while(h->current_mba <= MBA_STUFFING)
    {
        int ret;
        /* DCT & quantize */
        ret= h261_decode_mb(h);
        if(ret<0){
            if(ret==SLICE_END){
                h261_decode_mb_skipped(h, h->current_mba, 33);                
                return 0;
            }
            av_log(s->avctx, AV_LOG_ERROR, "Error at MB: %d\n", s->mb_x + s->mb_y*s->mb_stride);
            return -1;
        }
        
        h261_decode_mb_skipped(h, h->current_mba-h->mba_diff, h->current_mba-1);
    }
    
    return -1;
}