|
|
|
|
@ -101,7 +101,7 @@ static VLC cbpc_b_vlc; |
|
|
|
|
/* init vlcs */ |
|
|
|
|
|
|
|
|
|
/* XXX: find a better solution to handle static init */ |
|
|
|
|
void h263_decode_init_vlc(MpegEncContext *s) |
|
|
|
|
void ff_h263_decode_init_vlc(MpegEncContext *s) |
|
|
|
|
{ |
|
|
|
|
static int done = 0; |
|
|
|
|
|
|
|
|
|
@ -118,18 +118,18 @@ void h263_decode_init_vlc(MpegEncContext *s) |
|
|
|
|
&ff_h263_cbpy_tab[0][1], 2, 1, |
|
|
|
|
&ff_h263_cbpy_tab[0][0], 2, 1, 64); |
|
|
|
|
INIT_VLC_STATIC(&mv_vlc, MV_VLC_BITS, 33, |
|
|
|
|
&mvtab[0][1], 2, 1, |
|
|
|
|
&mvtab[0][0], 2, 1, 538); |
|
|
|
|
&ff_mvtab[0][1], 2, 1, |
|
|
|
|
&ff_mvtab[0][0], 2, 1, 538); |
|
|
|
|
init_rl(&ff_h263_rl_inter, ff_h263_static_rl_table_store[0]); |
|
|
|
|
init_rl(&rl_intra_aic, ff_h263_static_rl_table_store[1]); |
|
|
|
|
init_rl(&ff_rl_intra_aic, ff_h263_static_rl_table_store[1]); |
|
|
|
|
INIT_VLC_RL(ff_h263_rl_inter, 554); |
|
|
|
|
INIT_VLC_RL(rl_intra_aic, 554); |
|
|
|
|
INIT_VLC_RL(ff_rl_intra_aic, 554); |
|
|
|
|
INIT_VLC_STATIC(&h263_mbtype_b_vlc, H263_MBTYPE_B_VLC_BITS, 15, |
|
|
|
|
&h263_mbtype_b_tab[0][1], 2, 1, |
|
|
|
|
&h263_mbtype_b_tab[0][0], 2, 1, 80); |
|
|
|
|
&ff_h263_mbtype_b_tab[0][1], 2, 1, |
|
|
|
|
&ff_h263_mbtype_b_tab[0][0], 2, 1, 80); |
|
|
|
|
INIT_VLC_STATIC(&cbpc_b_vlc, CBPC_B_VLC_BITS, 4, |
|
|
|
|
&cbpc_b_tab[0][1], 2, 1, |
|
|
|
|
&cbpc_b_tab[0][0], 2, 1, 8); |
|
|
|
|
&ff_cbpc_b_tab[0][1], 2, 1, |
|
|
|
|
&ff_cbpc_b_tab[0][0], 2, 1, 8); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ -269,7 +269,7 @@ int ff_h263_resync(MpegEncContext *s){ |
|
|
|
|
return -1; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
int h263_decode_motion(MpegEncContext * s, int pred, int f_code) |
|
|
|
|
int ff_h263_decode_motion(MpegEncContext * s, int pred, int f_code) |
|
|
|
|
{ |
|
|
|
|
int code, val, sign, shift; |
|
|
|
|
code = get_vlc2(&s->gb, mv_vlc.table, MV_VLC_BITS, 2); |
|
|
|
|
@ -379,16 +379,16 @@ static void preview_obmc(MpegEncContext *s){ |
|
|
|
|
if ((cbpc & 16) == 0) { |
|
|
|
|
s->current_picture.f.mb_type[xy] = MB_TYPE_16x16 | MB_TYPE_L0; |
|
|
|
|
/* 16x16 motion prediction */ |
|
|
|
|
mot_val= h263_pred_motion(s, 0, 0, &pred_x, &pred_y); |
|
|
|
|
mot_val= ff_h263_pred_motion(s, 0, 0, &pred_x, &pred_y); |
|
|
|
|
if (s->umvplus) |
|
|
|
|
mx = h263p_decode_umotion(s, pred_x); |
|
|
|
|
else |
|
|
|
|
mx = h263_decode_motion(s, pred_x, 1); |
|
|
|
|
mx = ff_h263_decode_motion(s, pred_x, 1); |
|
|
|
|
|
|
|
|
|
if (s->umvplus) |
|
|
|
|
my = h263p_decode_umotion(s, pred_y); |
|
|
|
|
else |
|
|
|
|
my = h263_decode_motion(s, pred_y, 1); |
|
|
|
|
my = ff_h263_decode_motion(s, pred_y, 1); |
|
|
|
|
|
|
|
|
|
mot_val[0 ]= mot_val[2 ]= |
|
|
|
|
mot_val[0+stride]= mot_val[2+stride]= mx; |
|
|
|
|
@ -397,16 +397,16 @@ static void preview_obmc(MpegEncContext *s){ |
|
|
|
|
} else { |
|
|
|
|
s->current_picture.f.mb_type[xy] = MB_TYPE_8x8 | MB_TYPE_L0; |
|
|
|
|
for(i=0;i<4;i++) { |
|
|
|
|
mot_val = h263_pred_motion(s, i, 0, &pred_x, &pred_y); |
|
|
|
|
mot_val = ff_h263_pred_motion(s, i, 0, &pred_x, &pred_y); |
|
|
|
|
if (s->umvplus) |
|
|
|
|
mx = h263p_decode_umotion(s, pred_x); |
|
|
|
|
else |
|
|
|
|
mx = h263_decode_motion(s, pred_x, 1); |
|
|
|
|
mx = ff_h263_decode_motion(s, pred_x, 1); |
|
|
|
|
|
|
|
|
|
if (s->umvplus) |
|
|
|
|
my = h263p_decode_umotion(s, pred_y); |
|
|
|
|
else |
|
|
|
|
my = h263_decode_motion(s, pred_y, 1); |
|
|
|
|
my = ff_h263_decode_motion(s, pred_y, 1); |
|
|
|
|
if (s->umvplus && (mx - pred_x) == 1 && (my - pred_y) == 1) |
|
|
|
|
skip_bits1(&s->gb); /* Bit stuffing to prevent PSC */ |
|
|
|
|
mot_val[0] = mx; |
|
|
|
|
@ -430,7 +430,7 @@ static void h263_decode_dquant(MpegEncContext *s){ |
|
|
|
|
|
|
|
|
|
if(s->modified_quant){ |
|
|
|
|
if(get_bits1(&s->gb)) |
|
|
|
|
s->qscale= modified_quant_tab[get_bits1(&s->gb)][ s->qscale ]; |
|
|
|
|
s->qscale= ff_modified_quant_tab[get_bits1(&s->gb)][ s->qscale ]; |
|
|
|
|
else |
|
|
|
|
s->qscale= get_bits(&s->gb, 5); |
|
|
|
|
}else |
|
|
|
|
@ -448,7 +448,7 @@ static int h263_decode_block(MpegEncContext * s, DCTELEM * block, |
|
|
|
|
|
|
|
|
|
scan_table = s->intra_scantable.permutated; |
|
|
|
|
if (s->h263_aic && s->mb_intra) { |
|
|
|
|
rl = &rl_intra_aic; |
|
|
|
|
rl = &ff_rl_intra_aic; |
|
|
|
|
i = 0; |
|
|
|
|
if (s->ac_pred) { |
|
|
|
|
if (s->h263_aic_dir) |
|
|
|
|
@ -537,7 +537,7 @@ retry: |
|
|
|
|
if (i >= 64){ |
|
|
|
|
if(s->alt_inter_vlc && rl == &ff_h263_rl_inter && !s->mb_intra){ |
|
|
|
|
//Looks like a hack but no, it's the way it is supposed to work ...
|
|
|
|
|
rl = &rl_intra_aic; |
|
|
|
|
rl = &ff_rl_intra_aic; |
|
|
|
|
i = 0; |
|
|
|
|
s->gb= gb; |
|
|
|
|
s->dsp.clear_block(block); |
|
|
|
|
@ -554,7 +554,7 @@ retry: |
|
|
|
|
} |
|
|
|
|
not_coded: |
|
|
|
|
if (s->mb_intra && s->h263_aic) { |
|
|
|
|
h263_pred_acdc(s, block, n); |
|
|
|
|
ff_h263_pred_acdc(s, block, n); |
|
|
|
|
i = 63; |
|
|
|
|
} |
|
|
|
|
s->block_last_index[n] = i; |
|
|
|
|
@ -653,11 +653,11 @@ int ff_h263_decode_mb(MpegEncContext *s, |
|
|
|
|
s->current_picture.f.mb_type[xy] = MB_TYPE_16x16 | MB_TYPE_L0; |
|
|
|
|
/* 16x16 motion prediction */ |
|
|
|
|
s->mv_type = MV_TYPE_16X16; |
|
|
|
|
h263_pred_motion(s, 0, 0, &pred_x, &pred_y); |
|
|
|
|
ff_h263_pred_motion(s, 0, 0, &pred_x, &pred_y); |
|
|
|
|
if (s->umvplus) |
|
|
|
|
mx = h263p_decode_umotion(s, pred_x); |
|
|
|
|
else |
|
|
|
|
mx = h263_decode_motion(s, pred_x, 1); |
|
|
|
|
mx = ff_h263_decode_motion(s, pred_x, 1); |
|
|
|
|
|
|
|
|
|
if (mx >= 0xffff) |
|
|
|
|
return -1; |
|
|
|
|
@ -665,7 +665,7 @@ int ff_h263_decode_mb(MpegEncContext *s, |
|
|
|
|
if (s->umvplus) |
|
|
|
|
my = h263p_decode_umotion(s, pred_y); |
|
|
|
|
else |
|
|
|
|
my = h263_decode_motion(s, pred_y, 1); |
|
|
|
|
my = ff_h263_decode_motion(s, pred_y, 1); |
|
|
|
|
|
|
|
|
|
if (my >= 0xffff) |
|
|
|
|
return -1; |
|
|
|
|
@ -678,18 +678,18 @@ int ff_h263_decode_mb(MpegEncContext *s, |
|
|
|
|
s->current_picture.f.mb_type[xy] = MB_TYPE_8x8 | MB_TYPE_L0; |
|
|
|
|
s->mv_type = MV_TYPE_8X8; |
|
|
|
|
for(i=0;i<4;i++) { |
|
|
|
|
mot_val = h263_pred_motion(s, i, 0, &pred_x, &pred_y); |
|
|
|
|
mot_val = ff_h263_pred_motion(s, i, 0, &pred_x, &pred_y); |
|
|
|
|
if (s->umvplus) |
|
|
|
|
mx = h263p_decode_umotion(s, pred_x); |
|
|
|
|
else |
|
|
|
|
mx = h263_decode_motion(s, pred_x, 1); |
|
|
|
|
mx = ff_h263_decode_motion(s, pred_x, 1); |
|
|
|
|
if (mx >= 0xffff) |
|
|
|
|
return -1; |
|
|
|
|
|
|
|
|
|
if (s->umvplus) |
|
|
|
|
my = h263p_decode_umotion(s, pred_y); |
|
|
|
|
else |
|
|
|
|
my = h263_decode_motion(s, pred_y, 1); |
|
|
|
|
my = ff_h263_decode_motion(s, pred_y, 1); |
|
|
|
|
if (my >= 0xffff) |
|
|
|
|
return -1; |
|
|
|
|
s->mv[0][i][0] = mx; |
|
|
|
|
@ -761,11 +761,11 @@ int ff_h263_decode_mb(MpegEncContext *s, |
|
|
|
|
//FIXME UMV
|
|
|
|
|
|
|
|
|
|
if(USES_LIST(mb_type, 0)){ |
|
|
|
|
int16_t *mot_val= h263_pred_motion(s, 0, 0, &mx, &my); |
|
|
|
|
int16_t *mot_val= ff_h263_pred_motion(s, 0, 0, &mx, &my); |
|
|
|
|
s->mv_dir = MV_DIR_FORWARD; |
|
|
|
|
|
|
|
|
|
mx = h263_decode_motion(s, mx, 1); |
|
|
|
|
my = h263_decode_motion(s, my, 1); |
|
|
|
|
mx = ff_h263_decode_motion(s, mx, 1); |
|
|
|
|
my = ff_h263_decode_motion(s, my, 1); |
|
|
|
|
|
|
|
|
|
s->mv[0][0][0] = mx; |
|
|
|
|
s->mv[0][0][1] = my; |
|
|
|
|
@ -774,11 +774,11 @@ int ff_h263_decode_mb(MpegEncContext *s, |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if(USES_LIST(mb_type, 1)){ |
|
|
|
|
int16_t *mot_val= h263_pred_motion(s, 0, 1, &mx, &my); |
|
|
|
|
int16_t *mot_val= ff_h263_pred_motion(s, 0, 1, &mx, &my); |
|
|
|
|
s->mv_dir |= MV_DIR_BACKWARD; |
|
|
|
|
|
|
|
|
|
mx = h263_decode_motion(s, mx, 1); |
|
|
|
|
my = h263_decode_motion(s, my, 1); |
|
|
|
|
mx = ff_h263_decode_motion(s, mx, 1); |
|
|
|
|
my = ff_h263_decode_motion(s, my, 1); |
|
|
|
|
|
|
|
|
|
s->mv[1][0][0] = mx; |
|
|
|
|
s->mv[1][0][1] = my; |
|
|
|
|
@ -829,8 +829,8 @@ intra: |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
while(pb_mv_count--){ |
|
|
|
|
h263_decode_motion(s, 0, 1); |
|
|
|
|
h263_decode_motion(s, 0, 1); |
|
|
|
|
ff_h263_decode_motion(s, 0, 1); |
|
|
|
|
ff_h263_decode_motion(s, 0, 1); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/* decode each block */ |
|
|
|
|
@ -864,7 +864,7 @@ end: |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/* most is hardcoded. should extend to handle all h263 streams */ |
|
|
|
|
int h263_decode_picture_header(MpegEncContext *s) |
|
|
|
|
int ff_h263_decode_picture_header(MpegEncContext *s) |
|
|
|
|
{ |
|
|
|
|
int format, width, height, i; |
|
|
|
|
uint32_t startcode; |
|
|
|
|
@ -916,8 +916,8 @@ int h263_decode_picture_header(MpegEncContext *s) |
|
|
|
|
if (format != 7 && format != 6) { |
|
|
|
|
s->h263_plus = 0; |
|
|
|
|
/* H.263v1 */ |
|
|
|
|
width = h263_format[format][0]; |
|
|
|
|
height = h263_format[format][1]; |
|
|
|
|
width = ff_h263_format[format][0]; |
|
|
|
|
height = ff_h263_format[format][1]; |
|
|
|
|
if (!width) |
|
|
|
|
return -1; |
|
|
|
|
|
|
|
|
|
@ -1024,8 +1024,8 @@ int h263_decode_picture_header(MpegEncContext *s) |
|
|
|
|
s->avctx->sample_aspect_ratio= ff_h263_pixel_aspect[s->aspect_ratio_info]; |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
width = h263_format[format][0]; |
|
|
|
|
height = h263_format[format][1]; |
|
|
|
|
width = ff_h263_format[format][0]; |
|
|
|
|
height = ff_h263_format[format][1]; |
|
|
|
|
s->avctx->sample_aspect_ratio= (AVRational){12,11}; |
|
|
|
|
} |
|
|
|
|
if ((width == 0) || (height == 0)) |
|
|
|
|
|
Martin Storsjö
13 years ago