Always 8.
Unified · Split
| @@ -239,18 +239,18 @@ static void mpeg_motion_field(MpegEncContext *s, uint8_t *dest_y, · 238 unmodified lines | |||
| 239 | int bottom_field, int field_select, | 239 | int bottom_field, int field_select, |
| 240 | uint8_t *const *ref_picture, | 240 | uint8_t *const *ref_picture, |
| 241 | op_pixels_func (*pix_op)[4], | 241 | op_pixels_func (*pix_op)[4], |
| 242 | int motion_x, int motion_y, int h, int mb_y) | 242 | int motion_x, int motion_y, int mb_y) |
| 243 | { | 243 | { |
| 244 | #if !CONFIG_SMALL | 244 | #if !CONFIG_SMALL |
| 245 | if (s->out_format == FMT_MPEG1) | 245 | if (s->out_format == FMT_MPEG1) |
| 246 | mpeg_motion_internal(s, dest_y, dest_cb, dest_cr, 1, | 246 | mpeg_motion_internal(s, dest_y, dest_cb, dest_cr, 1, |
| 247 | bottom_field, field_select, ref_picture, pix_op, | 247 | bottom_field, field_select, ref_picture, pix_op, |
| 248 | motion_x, motion_y, h, 1, 0, mb_y); | 248 | motion_x, motion_y, 8, 1, 0, mb_y); |
| 249 | else | 249 | else |
| 250 | #endif | 250 | #endif |
| 251 | mpeg_motion_internal(s, dest_y, dest_cb, dest_cr, 1, | 251 | mpeg_motion_internal(s, dest_y, dest_cb, dest_cr, 1, |
| 252 | bottom_field, field_select, ref_picture, pix_op, | 252 | bottom_field, field_select, ref_picture, pix_op, |
| 253 | motion_x, motion_y, h, 0, 0, mb_y); | 253 | motion_x, motion_y, 8, 0, 0, mb_y); |
| 254 | } | 254 | } |
| 255 | 255 | ||
| 256 | // FIXME: SIMDify, avg variant, 16x16 version | 256 | // FIXME: SIMDify, avg variant, 16x16 version |
| @@ -738,12 +738,12 @@ static av_always_inline void mpv_motion_internal(MpegEncContext *s, · 481 unmodified lines | |||
| 738 | mpeg_motion_field(s, dest_y, dest_cb, dest_cr, | 738 | mpeg_motion_field(s, dest_y, dest_cb, dest_cr, |
| 739 | 0, s->field_select[dir][0], | 739 | 0, s->field_select[dir][0], |
| 740 | ref_picture, pix_op, | 740 | ref_picture, pix_op, |
| 741 | s->mv[dir][0][0], s->mv[dir][0][1], 8, mb_y); | 741 | s->mv[dir][0][0], s->mv[dir][0][1], mb_y); |
| 742 | /* bottom field */ | 742 | /* bottom field */ |
| 743 | mpeg_motion_field(s, dest_y, dest_cb, dest_cr, | 743 | mpeg_motion_field(s, dest_y, dest_cb, dest_cr, |
| 744 | 1, s->field_select[dir][1], | 744 | 1, s->field_select[dir][1], |
| 745 | ref_picture, pix_op, | 745 | ref_picture, pix_op, |
| 746 | s->mv[dir][1][0], s->mv[dir][1][1], 8, mb_y); | 746 | s->mv[dir][1][0], s->mv[dir][1][1], mb_y); |
| 747 | } | 747 | } |
| 748 | } else { | 748 | } else { |
| 749 | av_assert2(s->out_format == FMT_MPEG1); | 749 | av_assert2(s->out_format == FMT_MPEG1); |
| @@ -790,7 +790,7 @@ static av_always_inline void mpv_motion_internal(MpegEncContext *s, · 40 unmodified lines | |||
| 790 | mpeg_motion_field(s, dest_y, dest_cb, dest_cr, | 790 | mpeg_motion_field(s, dest_y, dest_cb, dest_cr, |
| 791 | j, j ^ i, ref_picture, pix_op, | 791 | j, j ^ i, ref_picture, pix_op, |
| 792 | s->mv[dir][2 * i + j][0], | 792 | s->mv[dir][2 * i + j][0], |
| 793 | s->mv[dir][2 * i + j][1], 8, mb_y); | 793 | s->mv[dir][2 * i + j][1], mb_y); |
| 794 | pix_op = s->hdsp.avg_pixels_tab; | 794 | pix_op = s->hdsp.avg_pixels_tab; |
| 795 | } | 795 | } |
| 796 | } else { | 796 | } else { |