diff options
| author | Ramiro Polla <ramiro.polla@gmail.com> | 2024-05-08 17:19:49 +0200 |
|---|---|---|
| committer | Ramiro Polla <ramiro.polla@gmail.com> | 2024-05-11 10:13:58 +0200 |
| commit | b8af0809fbbf61ceeab6d88143f9c0bb4985029e (patch) | |
| tree | 995054336a2e001ab2203222e2a9462314fb98b2 | |
| parent | 713c6eba8dc7b4d9c592232ad9fad621b3fb4d50 (diff) | |
| download | ffmpeg-b8af0809fbbf61ceeab6d88143f9c0bb4985029e.tar.gz | |
libavcodec/mpegvideo_enc: fix multi-threaded motion estimation rounding for mpeg4
ff_init_me() was being called after ff_update_duplicate_context(),
which caused the propagation of the initialization to other thread
contexts to be delayed by one frame.
In the case of mpeg4 (or flipflop_rounding), this would make the
hpel_put functions differ between the first thread (which would be
correctly initialized) and the other threads (which would be stale
from the previous frame).
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 2a75973ac4..b601a1a9e4 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -3623,6 +3623,9 @@ static int encode_picture(MpegEncContext *s) s->q_chroma_intra_matrix16 = s->q_intra_matrix16; } + if(ff_init_me(s)<0) + return -1; + s->mb_intra=0; //for the rate distortion & bit compare functions for(i=1; i<context_count; i++){ ret = ff_update_duplicate_context(s->thread_context[i], s); @@ -3630,9 +3633,6 @@ static int encode_picture(MpegEncContext *s) return ret; } - if(ff_init_me(s)<0) - return -1; - /* Estimate motion for every MB */ if(s->pict_type != AV_PICTURE_TYPE_I){ s->lambda = (s->lambda * s->me_penalty_compensation + 128) >> 8; |