Hotfix for regtest-error failure
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Mar 2010 16:51:36 +0000 (16:51 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Mar 2010 16:51:36 +0000 (16:51 +0000)
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.

Originally committed as revision 22608 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/error_resilience.c

index c6eea38..58eaa34 100644 (file)
@@ -486,7 +486,7 @@ int score_sum=0;
                             sum_x+= mv_predictor[j][0];
                             sum_y+= mv_predictor[j][1];
                             sum_r+= ref[j];
-                            if(j && ref[j] != ref[j-1])
+                            if(j && ref[j] != ref[j-1] && s->codec_id == CODEC_ID_H264)
                                 goto skip_mean_and_median;
                         }
 
@@ -549,7 +549,7 @@ skip_mean_and_median:
                         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
+                        if(ref[j]<0 && s->codec_id == CODEC_ID_H264) //predictor intra or otherwise not available
                             continue;
 
                         decode_mb(s, ref[j]);
@@ -767,6 +767,7 @@ void ff_er_frame_end(MpegEncContext *s){
         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++){