comparison error_resilience.c @ 11511:6bf21de8e6eb libavcodec

Hotfix for regtest-error failure a proper fix appears to require changing h263/mpeg2/motion est to index ref_index like h264. Ill do this change and then revert this hotfix but it will take a bit time.

11510:927b985f73f4

                        for(j=0; j<pred_count; j++){
                            sum_x+= mv_predictor[j][0];
                            sum_y+= mv_predictor[j][1];
                            sum_r+= ref[j];
                            if(j && ref[j] != ref[j-1])
                                goto skip_mean_and_median;
                        }

                        /* mean */
                        mv_predictor[pred_count][0] = sum_x/j;

                        uint8_t *src= s->current_picture.data[0] + mb_x*16 + mb_y*16*s->linesize;

                        s->current_picture.motion_val[0][mot_index][0]= s->mv[0][0][0]= mv_predictor[j][0];
                        s->current_picture.motion_val[0][mot_index][1]= s->mv[0][0][1]= mv_predictor[j][1];

                        if(ref[j]<0) //predictor intra or otherwise not available
                            continue;

                        decode_mb(s, ref[j]);

                        if(mb_x>0 && fixed[mb_xy-1]){

            pic->motion_val[i]= pic->motion_val_base[i]+4;
        }
        pic->motion_subsample_log2= 3;
        s->current_picture= *s->current_picture_ptr;
    }

    if(s->avctx->debug&FF_DEBUG_ER){
        for(mb_y=0; mb_y<s->mb_height; mb_y++){
            for(mb_x=0; mb_x<s->mb_width; mb_x++){
                int status= s->error_status_table[mb_x + mb_y*s->mb_stride];

11511:6bf21de8e6eb

                        for(j=0; j<pred_count; j++){
                            sum_x+= mv_predictor[j][0];
                            sum_y+= mv_predictor[j][1];
                            sum_r+= ref[j];
                            if(j && ref[j] != ref[j-1] && s->codec_id == CODEC_ID_H264)
                                goto skip_mean_and_median;
                        }

                        /* mean */
                        mv_predictor[pred_count][0] = sum_x/j;

                        uint8_t *src= s->current_picture.data[0] + mb_x*16 + mb_y*16*s->linesize;

                        s->current_picture.motion_val[0][mot_index][0]= s->mv[0][0][0]= mv_predictor[j][0];
                        s->current_picture.motion_val[0][mot_index][1]= s->mv[0][0][1]= mv_predictor[j][1];

                        if(ref[j]<0 && s->codec_id == CODEC_ID_H264) //predictor intra or otherwise not available
                            continue;

                        decode_mb(s, ref[j]);

                        if(mb_x>0 && fixed[mb_xy-1]){

            pic->motion_val[i]= pic->motion_val_base[i]+4;
        }
        pic->motion_subsample_log2= 3;
        s->current_picture= *s->current_picture_ptr;
    }
    pic->ref_index[0]= av_realloc(pic->ref_index[0], s->mb_stride * s->mb_height * 4 * sizeof(uint8_t));

    if(s->avctx->debug&FF_DEBUG_ER){
        for(mb_y=0; mb_y<s->mb_height; mb_y++){
            for(mb_x=0; mb_x<s->mb_width; mb_x++){
                int status= s->error_status_table[mb_x + mb_y*s->mb_stride];