|
|
@ -468,16 +468,14 @@ static int svq1_encode_plane(SVQ1EncContext *s, int plane, |
|
|
|
|
|
|
|
|
|
|
|
put_bits(&s->reorder_pb[5], SVQ1_BLOCK_INTER_LEN, SVQ1_BLOCK_INTER_CODE); |
|
|
|
put_bits(&s->reorder_pb[5], SVQ1_BLOCK_INTER_LEN, SVQ1_BLOCK_INTER_CODE); |
|
|
|
|
|
|
|
|
|
|
|
s->m.pb = s->reorder_pb[5]; |
|
|
|
|
|
|
|
mx = motion_ptr[0]; |
|
|
|
mx = motion_ptr[0]; |
|
|
|
my = motion_ptr[1]; |
|
|
|
my = motion_ptr[1]; |
|
|
|
av_assert1(mx >= -32 && mx <= 31); |
|
|
|
av_assert1(mx >= -32 && mx <= 31); |
|
|
|
av_assert1(my >= -32 && my <= 31); |
|
|
|
av_assert1(my >= -32 && my <= 31); |
|
|
|
av_assert1(pred_x >= -32 && pred_x <= 31); |
|
|
|
av_assert1(pred_x >= -32 && pred_x <= 31); |
|
|
|
av_assert1(pred_y >= -32 && pred_y <= 31); |
|
|
|
av_assert1(pred_y >= -32 && pred_y <= 31); |
|
|
|
ff_h263_encode_motion(&s->m.pb, mx - pred_x, 1); |
|
|
|
ff_h263_encode_motion(&s->reorder_pb[5], mx - pred_x, 1); |
|
|
|
ff_h263_encode_motion(&s->m.pb, my - pred_y, 1); |
|
|
|
ff_h263_encode_motion(&s->reorder_pb[5], my - pred_y, 1); |
|
|
|
s->reorder_pb[5] = s->m.pb; |
|
|
|
|
|
|
|
score[1] += lambda * put_bits_count(&s->reorder_pb[5]); |
|
|
|
score[1] += lambda * put_bits_count(&s->reorder_pb[5]); |
|
|
|
|
|
|
|
|
|
|
|
dxy = (mx & 1) + 2 * (my & 1); |
|
|
|
dxy = (mx & 1) + 2 * (my & 1); |
|
|
|