diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-09-22 02:32:22 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-09-22 02:32:22 +0000 |
| commit | 48e025e5b6abf462d62a3d7cd8ce84d0ceeb4e46 (patch) | |
| tree | 83eb81284f0ea750a5cf9ab4ed1ad0df3a27fada /libavcodec | |
| parent | 471341a7f3ba48ed62897d9b935342ec3f4761cb (diff) | |
Fix ref_shift so that it is correct for more/all? MBAFF/PAFF mixes.
Fixes at least MR9_BT_B.
Originally committed as revision 15380 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 15 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 1 |
2 files changed, 11 insertions, 5 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 294525d3ac..d7f686c17a 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -938,6 +938,7 @@ static inline void direct_ref_list_init(H264Context * const h){ memcpy(cur->ref_count[0], cur->ref_count[1], sizeof(cur->ref_count[0])); memcpy(cur->ref_poc [0], cur->ref_poc [1], sizeof(cur->ref_poc [0])); } + cur->mbaff= FRAME_MBAFF; if(cur->pict_type != FF_B_TYPE || h->direct_spatial_mv_pred) return; for(list=0; list<2; list++){ @@ -1179,16 +1180,20 @@ single_col: }else{ /* direct temporal mv pred */ const int *map_col_to_list0[2] = {h->map_col_to_list0[0], h->map_col_to_list0[1]}; const int *dist_scale_factor = h->dist_scale_factor; + int ref_shift= 1; if(FRAME_MBAFF && IS_INTERLACED(*mb_type)){ map_col_to_list0[0] = h->map_col_to_list0_field[s->mb_y&1][0]; map_col_to_list0[1] = h->map_col_to_list0_field[s->mb_y&1][1]; dist_scale_factor =h->dist_scale_factor_field[s->mb_y&1]; + ref_shift--; } + if(h->ref_list[1][0].mbaff && IS_INTERLACED(mb_type_col[0])) + ref_shift++; + if(IS_INTERLACED(*mb_type) != IS_INTERLACED(mb_type_col[0])){ /* FIXME assumes direct_8x8_inference == 1 */ int y_shift = 2*!IS_INTERLACED(*mb_type); - int ref_shift= FRAME_MBAFF ? y_shift : 1; for(i8=0; i8<4; i8++){ const int x8 = i8&1; @@ -1239,8 +1244,8 @@ single_col: if(IS_INTRA(mb_type_col[0])){ ref=mv0=mv1=0; }else{ - const int ref0 = l1ref0[0] >= 0 ? map_col_to_list0[0][l1ref0[0]] - : map_col_to_list0[1][l1ref1[0]]; + const int ref0 = l1ref0[0] >= 0 ? map_col_to_list0[0][(l1ref0[0]*2)>>ref_shift] + : map_col_to_list0[1][(l1ref1[0]*2)>>ref_shift]; const int scale = dist_scale_factor[ref0]; const int16_t *mv_col = l1ref0[0] >= 0 ? l1mv0[0] : l1mv1[0]; int mv_l0[2]; @@ -1271,11 +1276,11 @@ single_col: continue; } - ref0 = l1ref0[x8 + y8*b8_stride]; + ref0 = (l1ref0[x8 + y8*b8_stride]*2)>>ref_shift; if(ref0 >= 0) ref0 = map_col_to_list0[0][ref0]; else{ - ref0 = map_col_to_list0[1][l1ref1[x8 + y8*b8_stride]]; + ref0 = map_col_to_list0[1][(l1ref1[x8 + y8*b8_stride]*2)>>ref_shift]; l1mv= l1mv1; } scale = dist_scale_factor[ref0]; diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 86247c2ce1..0477d443d2 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -120,6 +120,7 @@ typedef struct Picture{ int long_ref; ///< 1->long term reference 0->short term reference int ref_poc[2][2][16]; ///< h264 POCs of the frames used as reference (FIXME need per slice) int ref_count[2][2]; ///< number of entries in ref_poc (FIXME need per slice) + int mbaff; ///< h264 1 -> MBAFF frame 0-> not MBAFF int mb_var_sum; ///< sum of MB variance for current frame int mc_mb_var_sum; ///< motion compensated MB variance for current frame |