Skip to content

F
ffmpeg.wasm-core
Commit fc97db64 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

interlaced b frames cleanup 

Originally committed as revision 938 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent a343d33e
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 73 deletions
libavcodec/h263.c
View file @ fc97db64
...@@ -2812,13 +2812,19 @@ int h263_decode_mb(MpegEncContext *s, ...@@ -2812,13 +2812,19 @@ int h263_decode_mb(MpegEncContext *s,
return 0; return 0;
} }
modb1= get_bits1(&s->gb); modb1= get_bits1(&s->gb);
if(modb1==0){ if(modb1){
mb_type=4; //like MB_TYPE_B_DIRECT but no vectors coded
cbp=0;
}else{
int field_mv;
modb2= get_bits1(&s->gb); modb2= get_bits1(&s->gb);
mb_type= get_vlc2(&s->gb, mb_type_b_vlc.table, MB_TYPE_B_VLC_BITS, 1); mb_type= get_vlc2(&s->gb, mb_type_b_vlc.table, MB_TYPE_B_VLC_BITS, 1);
if(modb2==0) cbp= get_bits(&s->gb, 6); if(modb2) cbp= 0;
else cbp=0; else cbp= get_bits(&s->gb, 6);
if (mb_type && cbp) {
if (mb_type!=MB_TYPE_B_DIRECT && cbp) {
if(get_bits1(&s->gb)){ if(get_bits1(&s->gb)){
s->qscale +=get_bits1(&s->gb)*4 - 2; s->qscale +=get_bits1(&s->gb)*4 - 2;
if (s->qscale < 1) if (s->qscale < 1)
...@@ -2828,87 +2834,81 @@ int h263_decode_mb(MpegEncContext *s, ...@@ -2828,87 +2834,81 @@ int h263_decode_mb(MpegEncContext *s,
h263_dc_scale(s); h263_dc_scale(s);
} }
} }
s->mv_type= MV_TYPE_16X16; //might be changed to 8X8 or FIELD later field_mv=0;
if(!s->progressive_sequence){ if(!s->progressive_sequence){
if(cbp) if(cbp)
s->interlaced_dct= get_bits1(&s->gb); s->interlaced_dct= get_bits1(&s->gb);
if(mb_type!=MB_TYPE_B_DIRECT){ if(mb_type!=MB_TYPE_B_DIRECT && get_bits1(&s->gb))
if(get_bits1(&s->gb)){ field_mv=1;
s->mv_type= MV_TYPE_FIELD;
if(mb_type!=MB_TYPE_B_BACKW){
s->field_select[0][0]= get_bits1(&s->gb); //FIXME move down
s->field_select[0][1]= get_bits1(&s->gb);
}
if(mb_type!=MB_TYPE_B_FORW){
s->field_select[1][0]= get_bits1(&s->gb);
s->field_select[1][1]= get_bits1(&s->gb);
}
}
}
} }
}else{
s->mv_type= MV_TYPE_16X16; //might be changed to 8X8 later
mb_type=4; //like MB_TYPE_B_DIRECT but no vectors coded
cbp=0;
}
mx=my=0;
if(mb_type==MB_TYPE_B_DIRECT){
mx = h263_decode_motion(s, 0, 1);
my = h263_decode_motion(s, 0, 1);
}
if(s->mv_type==MV_TYPE_16X16){
if(mb_type==MB_TYPE_B_FORW || mb_type==MB_TYPE_B_BIDIR){
s->mv_dir = MV_DIR_FORWARD;
mx = h263_decode_motion(s, s->last_mv[0][0][0], s->f_code);
my = h263_decode_motion(s, s->last_mv[0][0][1], s->f_code);
s->last_mv[0][1][0]= s->last_mv[0][0][0]= s->mv[0][0][0] = mx;
s->last_mv[0][1][1]= s->last_mv[0][0][1]= s->mv[0][0][1] = my;
}else
s->mv_dir = 0;
if(mb_type==MB_TYPE_B_BACKW || mb_type==MB_TYPE_B_BIDIR){
s->mv_dir |= MV_DIR_BACKWARD;
mx = h263_decode_motion(s, s->last_mv[1][0][0], s->b_code);
my = h263_decode_motion(s, s->last_mv[1][0][1], s->b_code);
s->last_mv[1][1][0]= s->last_mv[1][0][0]= s->mv[1][0][0] = mx;
s->last_mv[1][1][1]= s->last_mv[1][0][1]= s->mv[1][0][1] = my;
}
if(mb_type!=4 && mb_type!=MB_TYPE_B_DIRECT)
PRINT_MB_TYPE(mb_type==MB_TYPE_B_FORW ? "F" : (mb_type==MB_TYPE_B_BACKW ? "B" : "T"));
}else{
/* MV_TYPE_FIELD */
if(mb_type==MB_TYPE_B_FORW || mb_type==MB_TYPE_B_BIDIR){
s->mv_dir = MV_DIR_FORWARD;
for(i=0; i<2; i++){
mx = h263_decode_motion(s, s->last_mv[0][i][0] , s->f_code);
my = h263_decode_motion(s, s->last_mv[0][i][1]/2, s->f_code);
s->last_mv[0][i][0]= s->mv[0][i][0] = mx;
s->last_mv[0][i][1]= (s->mv[0][i][1] = my)*2;
}
}else
s->mv_dir = 0;
if(mb_type==MB_TYPE_B_BACKW || mb_type==MB_TYPE_B_BIDIR){ if(mb_type!=MB_TYPE_B_DIRECT && !field_mv){
s->mv_dir |= MV_DIR_BACKWARD; s->mv_type= MV_TYPE_16X16;
for(i=0; i<2; i++){ if(mb_type!=MB_TYPE_B_BACKW){
mx = h263_decode_motion(s, s->last_mv[1][i][0] , s->b_code); s->mv_dir = MV_DIR_FORWARD;
my = h263_decode_motion(s, s->last_mv[1][i][1]/2, s->b_code);
s->last_mv[1][i][0]= s->mv[1][i][0] = mx; mx = h263_decode_motion(s, s->last_mv[0][0][0], s->f_code);
s->last_mv[1][i][1]= (s->mv[1][i][1] = my)*2; my = h263_decode_motion(s, s->last_mv[0][0][1], s->f_code);
s->last_mv[0][1][0]= s->last_mv[0][0][0]= s->mv[0][0][0] = mx;
s->last_mv[0][1][1]= s->last_mv[0][0][1]= s->mv[0][0][1] = my;
}else
s->mv_dir = 0;
if(mb_type!=MB_TYPE_B_FORW){
s->mv_dir |= MV_DIR_BACKWARD;
mx = h263_decode_motion(s, s->last_mv[1][0][0], s->b_code);
my = h263_decode_motion(s, s->last_mv[1][0][1], s->b_code);
s->last_mv[1][1][0]= s->last_mv[1][0][0]= s->mv[1][0][0] = mx;
s->last_mv[1][1][1]= s->last_mv[1][0][1]= s->mv[1][0][1] = my;
}
if(mb_type!=MB_TYPE_B_DIRECT)
PRINT_MB_TYPE(mb_type==MB_TYPE_B_FORW ? "F" : (mb_type==MB_TYPE_B_BACKW ? "B" : "T"));
}else if(mb_type!=MB_TYPE_B_DIRECT){
s->mv_type= MV_TYPE_FIELD;
if(mb_type!=MB_TYPE_B_BACKW){
s->mv_dir = MV_DIR_FORWARD;
s->field_select[0][0]= get_bits1(&s->gb);
s->field_select[0][1]= get_bits1(&s->gb);
for(i=0; i<2; i++){
mx = h263_decode_motion(s, s->last_mv[0][i][0] , s->f_code);
my = h263_decode_motion(s, s->last_mv[0][i][1]/2, s->f_code);
s->last_mv[0][i][0]= s->mv[0][i][0] = mx;
s->last_mv[0][i][1]= (s->mv[0][i][1] = my)*2;
}
}else
s->mv_dir = 0;
if(mb_type!=MB_TYPE_B_FORW){
s->mv_dir |= MV_DIR_BACKWARD;
s->field_select[1][0]= get_bits1(&s->gb);
s->field_select[1][1]= get_bits1(&s->gb);
for(i=0; i<2; i++){
mx = h263_decode_motion(s, s->last_mv[1][i][0] , s->b_code);
my = h263_decode_motion(s, s->last_mv[1][i][1]/2, s->b_code);
s->last_mv[1][i][0]= s->mv[1][i][0] = mx;
s->last_mv[1][i][1]= (s->mv[1][i][1] = my)*2;
}
} }
if(mb_type!=MB_TYPE_B_DIRECT)
PRINT_MB_TYPE(mb_type==MB_TYPE_B_FORW ? "f" : (mb_type==MB_TYPE_B_BACKW ? "b" : "t"));
} }
if(mb_type!=4 && mb_type!=MB_TYPE_B_DIRECT)
PRINT_MB_TYPE(mb_type==MB_TYPE_B_FORW ? "f" : (mb_type==MB_TYPE_B_BACKW ? "b" : "t"));
} }
if(mb_type==4 || mb_type==MB_TYPE_B_DIRECT){ if(mb_type==4 || mb_type==MB_TYPE_B_DIRECT){
int mb_index= s->mb_x + s->mb_y*s->mb_width; int mb_index= s->mb_x + s->mb_y*s->mb_width;
int i; int i;
if(mb_type==4)
mx=my=0;
else{
mx = h263_decode_motion(s, 0, 1);
my = h263_decode_motion(s, 0, 1);
}
s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT; s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT;
xy= s->block_index[0]; xy= s->block_index[0];
...@@ -2918,6 +2918,7 @@ int h263_decode_mb(MpegEncContext *s, ...@@ -2918,6 +2918,7 @@ int h263_decode_mb(MpegEncContext *s,
//FIXME avoid divides //FIXME avoid divides
switch(s->co_located_type_table[mb_index]){ switch(s->co_located_type_table[mb_index]){
case 0: case 0:
s->mv_type= MV_TYPE_16X16;
s->mv[0][0][0] = s->motion_val[xy][0]*time_pb/time_pp + mx; s->mv[0][0][0] = s->motion_val[xy][0]*time_pb/time_pp + mx;
s->mv[0][0][1] = s->motion_val[xy][1]*time_pb/time_pp + my; s->mv[0][0][1] = s->motion_val[xy][1]*time_pb/time_pp + my;
s->mv[1][0][0] = mx ? s->mv[0][0][0] - s->motion_val[xy][0] s->mv[1][0][0] = mx ? s->mv[0][0][0] - s->motion_val[xy][0]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment