[FFmpeg-cvslog] avcodec/v210dec: do not use accelerated code for the last pixels of a row

Marton Balint git at videolan.org
Tue Jun 21 00:35:49 EEST 2022


ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Sun Jun 12 02:44:38 2022 +0200| [2e895edb5d2ae820e8ead0fbccea3fe2b5749287] | committer: Marton Balint

avcodec/v210dec: do not use accelerated code for the last pixels of a row

ASM code tends to overwrite the buffers by 2-4 bytes and it can cause issues
with slice threads.

Signed-off-by: Marton Balint <cus at passwd.hu>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2e895edb5d2ae820e8ead0fbccea3fe2b5749287
---

 libavcodec/v210dec.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/v210dec.c b/libavcodec/v210dec.c
index e97f43a8e6..4268b5b748 100644
--- a/libavcodec/v210dec.c
+++ b/libavcodec/v210dec.c
@@ -54,7 +54,7 @@ static void decode_row(const uint32_t *src, uint16_t *y, uint16_t *u, uint16_t *
                        void (*unpack_frame)(const uint32_t *src, uint16_t *y, uint16_t *u, uint16_t *v, int width))
 {
     uint32_t val;
-    int w = (width / 12) * 12;
+    int w = (FFMAX(0, width - 12) / 12) * 12;
 
     unpack_frame(src, y, u, v, w);
 
@@ -63,7 +63,7 @@ static void decode_row(const uint32_t *src, uint16_t *y, uint16_t *u, uint16_t *
     v += w >> 1;
     src += (w << 1) / 3;
 
-    if (w < width - 5) {
+    while (w < width - 5) {
         READ_PIXELS(u, y, v);
         READ_PIXELS(y, u, y);
         READ_PIXELS(v, y, u);



More information about the ffmpeg-cvslog mailing list