[FFmpeg-cvslog] avcodec/ffv1dec_template: Optimize golomb run mode

Michael Niedermayer git at videolan.org
Sun Mar 17 13:18:13 EET 2019


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Fri Mar  8 13:05:13 2019 +0100| [efe4aef90fd8d4259aed0a6ffe317b5be6557da9] | committer: Michael Niedermayer

avcodec/ffv1dec_template: Optimize golomb run mode

Fixes: Timeout (34sec -> 12sec)
Fixes: 13398/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FFV1_fuzzer-5664106709778432

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavcodec/ffv1dec_template.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/ffv1dec_template.c b/libavcodec/ffv1dec_template.c
index 25032feda0..1b7f6c4bf5 100644
--- a/libavcodec/ffv1dec_template.c
+++ b/libavcodec/ffv1dec_template.c
@@ -86,6 +86,11 @@ static av_always_inline int RENAME(decode_line)(FFV1Context *s, int w,
                         run_mode = 2;
                     }
                 }
+                while (run_count > 1 && w-x > 1) {
+                    sample[1][x] = RENAME(predict)(sample[1] + x, sample[0] + x);
+                    x++;
+                    run_count--;
+                }
                 run_count--;
                 if (run_count < 0) {
                     run_mode  = 0;



More information about the ffmpeg-cvslog mailing list