|
|
|
@@ -923,8 +923,8 @@ decode_intra_mb: |
|
|
|
const int index= 4*i + block_width*j; |
|
|
|
int16_t (* mv_cache)[2]= &sl->mv_cache[list][ scan8[index] ]; |
|
|
|
pred_motion(h, sl, index, block_width, list, sl->ref_cache[list][ scan8[index] ], &mx, &my); |
|
|
|
mx += get_se_golomb(&sl->gb); |
|
|
|
my += get_se_golomb(&sl->gb); |
|
|
|
mx += (unsigned)get_se_golomb(&sl->gb); |
|
|
|
my += (unsigned)get_se_golomb(&sl->gb); |
|
|
|
ff_tlog(h->avctx, "final mv:%d %d\n", mx, my); |
|
|
|
|
|
|
|
if(IS_SUB_8X8(sub_mb_type)){ |
|
|
|
@@ -977,8 +977,8 @@ decode_intra_mb: |
|
|
|
for (list = 0; list < sl->list_count; list++) { |
|
|
|
if(IS_DIR(mb_type, 0, list)){ |
|
|
|
pred_motion(h, sl, 0, 4, list, sl->ref_cache[list][ scan8[0] ], &mx, &my); |
|
|
|
mx += get_se_golomb(&sl->gb); |
|
|
|
my += get_se_golomb(&sl->gb); |
|
|
|
mx += (unsigned)get_se_golomb(&sl->gb); |
|
|
|
my += (unsigned)get_se_golomb(&sl->gb); |
|
|
|
ff_tlog(h->avctx, "final mv:%d %d\n", mx, my); |
|
|
|
|
|
|
|
fill_rectangle(sl->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4); |
|
|
|
@@ -1012,8 +1012,8 @@ decode_intra_mb: |
|
|
|
unsigned int val; |
|
|
|
if(IS_DIR(mb_type, i, list)){ |
|
|
|
pred_16x8_motion(h, sl, 8*i, list, sl->ref_cache[list][scan8[0] + 16*i], &mx, &my); |
|
|
|
mx += get_se_golomb(&sl->gb); |
|
|
|
my += get_se_golomb(&sl->gb); |
|
|
|
mx += (unsigned)get_se_golomb(&sl->gb); |
|
|
|
my += (unsigned)get_se_golomb(&sl->gb); |
|
|
|
ff_tlog(h->avctx, "final mv:%d %d\n", mx, my); |
|
|
|
|
|
|
|
val= pack16to32(mx,my); |
|
|
|
@@ -1050,8 +1050,8 @@ decode_intra_mb: |
|
|
|
unsigned int val; |
|
|
|
if(IS_DIR(mb_type, i, list)){ |
|
|
|
pred_8x16_motion(h, sl, i*4, list, sl->ref_cache[list][ scan8[0] + 2*i ], &mx, &my); |
|
|
|
mx += get_se_golomb(&sl->gb); |
|
|
|
my += get_se_golomb(&sl->gb); |
|
|
|
mx += (unsigned)get_se_golomb(&sl->gb); |
|
|
|
my += (unsigned)get_se_golomb(&sl->gb); |
|
|
|
ff_tlog(h->avctx, "final mv:%d %d\n", mx, my); |
|
|
|
|
|
|
|
val= pack16to32(mx,my); |
|
|
|
|