wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avcodec/mpegvideo_motion: Optimize check away

Browse source 
Only MPEG-2 can have field motion vectors with coded fields.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2024-04-28 12:36:58 +02:00
parent f44d212e0e
commit 5f505995db
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libavcodec/mpegvideo_motion.c
View file

@ -719,7 +719,11 @@ static av_always_inline void mpv_motion_internal(MpegEncContext *s,
dir, ref_picture, qpix_op, pix_op);
break;
case MV_TYPE_FIELD:
if (s->picture_structure == PICT_FRAME) {
// Only MPEG-1/2 can have a picture_structure != PICT_FRAME here.
if (!CONFIG_SMALL)
av_assert2(is_mpeg12 || s->picture_structure == PICT_FRAME);
if ((!CONFIG_SMALL && !is_mpeg12) ||
s->picture_structure == PICT_FRAME) {
if (!is_mpeg12 && s->quarter_sample) {
for (i = 0; i < 2; i++)
qpel_motion(s, dest_y, dest_cb, dest_cr,
@ -739,6 +743,7 @@ static av_always_inline void mpv_motion_internal(MpegEncContext *s,
s->mv[dir][1][0], s->mv[dir][1][1], 8, mb_y);
}
} else {
av_assert2(s->out_format == FMT_MPEG1);
if (s->picture_structure != s->field_select[dir][0] + 1 &&
s->pict_type != AV_PICTURE_TYPE_B && !s->first_field) {
ref_picture = s->current_picture_ptr->f->data;