har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ref_shift so that it is correct for more/all? MBAFF/PAFF mixes.

Browse Source 
Fixes at least MR9_BT_B.

Originally committed as revision 15380 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2008-09-22 02:32:22 +00:00
parent 471341a7f3
commit 48e025e5b6
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/h264.c
View File

@ -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_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])); 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) if(cur->pict_type != FF_B_TYPE || h->direct_spatial_mv_pred)
return; return;
for(list=0; list<2; list++){ for(list=0; list<2; list++){
@ -1179,16 +1180,20 @@ single_col:
}else{ /* direct temporal mv pred */ }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 *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; const int *dist_scale_factor = h->dist_scale_factor;
int ref_shift= 1;
if(FRAME_MBAFF && IS_INTERLACED(*mb_type)){ 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[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]; 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]; 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])){ if(IS_INTERLACED(*mb_type) != IS_INTERLACED(mb_type_col[0])){
/* FIXME assumes direct_8x8_inference == 1 */ /* FIXME assumes direct_8x8_inference == 1 */
int y_shift = 2*!IS_INTERLACED(*mb_type); int y_shift = 2*!IS_INTERLACED(*mb_type);
int ref_shift= FRAME_MBAFF ? y_shift : 1;
for(i8=0; i8<4; i8++){ for(i8=0; i8<4; i8++){
const int x8 = i8&1; const int x8 = i8&1;
@ -1239,8 +1244,8 @@ single_col:
if(IS_INTRA(mb_type_col[0])){ if(IS_INTRA(mb_type_col[0])){
ref=mv0=mv1=0; ref=mv0=mv1=0;
}else{ }else{
const int ref0 = l1ref0[0] >= 0 ? map_col_to_list0[0][l1ref0[0]] const int ref0 = l1ref0[0] >= 0 ? map_col_to_list0[0][(l1ref0[0]*2)>>ref_shift]
: map_col_to_list0[1][l1ref1[0]]; : map_col_to_list0[1][(l1ref1[0]*2)>>ref_shift];
const int scale = dist_scale_factor[ref0]; const int scale = dist_scale_factor[ref0];
const int16_t *mv_col = l1ref0[0] >= 0 ? l1mv0[0] : l1mv1[0]; const int16_t *mv_col = l1ref0[0] >= 0 ? l1mv0[0] : l1mv1[0];
int mv_l0[2]; int mv_l0[2];
@ -1271,11 +1276,11 @@ single_col:
continue; continue;
} }
ref0 = l1ref0[x8 + y8*b8_stride]; ref0 = (l1ref0[x8 + y8*b8_stride]*2)>>ref_shift;
if(ref0 >= 0) if(ref0 >= 0)
ref0 = map_col_to_list0[0][ref0]; ref0 = map_col_to_list0[0][ref0];
else{ 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; l1mv= l1mv1;
} }
scale = dist_scale_factor[ref0]; scale = dist_scale_factor[ref0];

1
libavcodec/mpegvideo.h
View File

@ -120,6 +120,7 @@ typedef struct Picture{
int long_ref; ///< 1->long term reference 0->short term reference 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_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 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 mb_var_sum; ///< sum of MB variance for current frame
int mc_mb_var_sum; ///< motion compensated MB variance for current frame int mc_mb_var_sum; ///< motion compensated MB variance for current frame