virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-11 14:30:22 +02:00
Code Issues Releases Activity

10l (field select readed at the wrong place ...)

Browse Source 
Originally committed as revision 939 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2002-09-13 11:47:57 +00:00
parent fc97db6435
commit e3bd83f874
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libavcodec/h263.c
View File

@ -2840,10 +2840,21 @@ int h263_decode_mb(MpegEncContext *s,
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 && get_bits1(&s->gb)) if(mb_type!=MB_TYPE_B_DIRECT && get_bits1(&s->gb)){
field_mv=1; field_mv=1;
if(mb_type!=MB_TYPE_B_BACKW){
s->field_select[0][0]= get_bits1(&s->gb);
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);
}
}
} }
s->mv_dir = 0;
if(mb_type!=MB_TYPE_B_DIRECT && !field_mv){ if(mb_type!=MB_TYPE_B_DIRECT && !field_mv){
s->mv_type= MV_TYPE_16X16; s->mv_type= MV_TYPE_16X16;
if(mb_type!=MB_TYPE_B_BACKW){ if(mb_type!=MB_TYPE_B_BACKW){
@ -2853,8 +2864,7 @@ int h263_decode_mb(MpegEncContext *s,
my = h263_decode_motion(s, s->last_mv[0][0][1], 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][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; 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){ if(mb_type!=MB_TYPE_B_FORW){
s->mv_dir |= MV_DIR_BACKWARD; s->mv_dir |= MV_DIR_BACKWARD;
@ -2868,10 +2878,9 @@ int h263_decode_mb(MpegEncContext *s,
PRINT_MB_TYPE(mb_type==MB_TYPE_B_FORW ? "F" : (mb_type==MB_TYPE_B_BACKW ? "B" : "T")); 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){ }else if(mb_type!=MB_TYPE_B_DIRECT){
s->mv_type= MV_TYPE_FIELD; s->mv_type= MV_TYPE_FIELD;
if(mb_type!=MB_TYPE_B_BACKW){ if(mb_type!=MB_TYPE_B_BACKW){
s->mv_dir = MV_DIR_FORWARD; 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++){ for(i=0; i<2; i++){
mx = h263_decode_motion(s, s->last_mv[0][i][0] , s->f_code); mx = h263_decode_motion(s, s->last_mv[0][i][0] , s->f_code);
@ -2879,13 +2888,10 @@ int h263_decode_mb(MpegEncContext *s,
s->last_mv[0][i][0]= s->mv[0][i][0] = mx; 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; 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){ if(mb_type!=MB_TYPE_B_FORW){
s->mv_dir |= MV_DIR_BACKWARD; 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++){ for(i=0; i<2; i++){
mx = h263_decode_motion(s, s->last_mv[1][i][0] , s->b_code); mx = h263_decode_motion(s, s->last_mv[1][i][0] , s->b_code);