comparison rv10.c @ 2848:78ad77267785 libavcodec

error concealment fix

2847:712c84b9d8ce

        return -1;
    }
//if(s->pict_type == P_TYPE) return 0;

    if ((s->mb_x == 0 && s->mb_y == 0) || s->current_picture_ptr==NULL) {
        if(MPV_frame_start(s, avctx) < 0)
            return -1;
    }

#ifdef DEBUG
    printf("qscale=%d\n", s->qscale);
#endif

        s->mv_dir = MV_DIR_FORWARD;
        s->mv_type = MV_TYPE_16X16; 
        ret=ff_h263_decode_mb(s, s->block);

        if (ret == SLICE_ERROR) {
            av_log(s->avctx, AV_LOG_ERROR, "ERROR at MB %d %d\n", s->mb_x, s->mb_y);
            return -1;
        }
        if(s->pict_type != B_TYPE)
            ff_h263_update_motion_val(s);

        }
        if(s->mb_x == s->resync_mb_x)
            s->first_slice_line=0;
        if(ret == SLICE_END) break;
    }

    return buf_size;
}

static int rv10_decode_frame(AVCodecContext *avctx, 

            if(i+1 == avctx->slice_count)
                size= buf_size - offset;
            else
                size= avctx->slice_offset[i+1] - offset;

            if( rv10_decode_packet(avctx, buf+offset, size) < 0 )
                return -1;
        }
    }else{
        if( rv10_decode_packet(avctx, buf, buf_size) < 0 )
            return -1;
    }
    
    if(s->mb_y>=s->mb_height){
        MPV_frame_end(s);
    
        if(s->pict_type==B_TYPE || s->low_delay){
            *pict= *(AVFrame*)&s->current_picture;
            ff_print_debug_info(s, pict);

            *pict= *(AVFrame*)&s->last_picture;
            ff_print_debug_info(s, pict);
        }
        if(s->last_picture_ptr || s->low_delay)
            *data_size = sizeof(AVFrame);
    }

    return buf_size;
}

2848:78ad77267785

        return -1;
    }
//if(s->pict_type == P_TYPE) return 0;

    if ((s->mb_x == 0 && s->mb_y == 0) || s->current_picture_ptr==NULL) {
        if(s->current_picture_ptr){ //FIXME write parser so we always have complete frames?
            ff_er_frame_end(s);
            MPV_frame_end(s);
            s->mb_x= s->mb_y = s->resync_mb_x = s->resync_mb_y= 0;
        }
        if(MPV_frame_start(s, avctx) < 0)
            return -1;
        ff_er_frame_start(s);
    }

#ifdef DEBUG
    printf("qscale=%d\n", s->qscale);
#endif

        s->mv_dir = MV_DIR_FORWARD;
        s->mv_type = MV_TYPE_16X16; 
        ret=ff_h263_decode_mb(s, s->block);

        if (ret == SLICE_ERROR || s->gb.size_in_bits < get_bits_count(&s->gb)) {
            av_log(s->avctx, AV_LOG_ERROR, "ERROR at MB %d %d\n", s->mb_x, s->mb_y);
            return -1;
        }
        if(s->pict_type != B_TYPE)
            ff_h263_update_motion_val(s);

        }
        if(s->mb_x == s->resync_mb_x)
            s->first_slice_line=0;
        if(ret == SLICE_END) break;
    }

    ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, AC_END|DC_END|MV_END);

    return buf_size;
}

static int rv10_decode_frame(AVCodecContext *avctx, 

            if(i+1 == avctx->slice_count)
                size= buf_size - offset;
            else
                size= avctx->slice_offset[i+1] - offset;

            rv10_decode_packet(avctx, buf+offset, size);
        }
    }else{
        rv10_decode_packet(avctx, buf, buf_size);
    }
    
    if(s->mb_y>=s->mb_height){
        ff_er_frame_end(s);
        MPV_frame_end(s);
    
        if(s->pict_type==B_TYPE || s->low_delay){
            *pict= *(AVFrame*)&s->current_picture;
            ff_print_debug_info(s, pict);

            *pict= *(AVFrame*)&s->last_picture;
            ff_print_debug_info(s, pict);
        }
        if(s->last_picture_ptr || s->low_delay)
            *data_size = sizeof(AVFrame);
        s->current_picture_ptr= NULL; //so we can detect if frame_end wasnt called (find some nicer solution...)
    }

    return buf_size;
}