1. ffmpeg
  2. Commit 902c96ae16a0a1935388d22cd2f9e916262811a6
Browse code

avcodec/error_resilience: Use a symmetric check for skipping MV estimation

This speeds up the testcase by a factor of 4

Fixes: Timeout
Fixes: 13100/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMV2_fuzzer-5767533905313792

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit e4289cb253e29e4d62dc46759eb1a45d8f6d82df)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Michael Niedermayer authored on 2019/02/20 02:41:42
Showing 1 changed files
libavcodec/error_resilience.c
History View file @ 902c96a
... ... 
@@ -438,7 +438,7 @@ static void guess_mv(ERContext *s)
438 438 
     }
439 439
440 440 
     if ((!(s->avctx->error_concealment&FF_EC_GUESS_MVS)) ||
441 
-        num_avail <= mb_width / 2) {
441 
+        num_avail <= FFMAX(mb_width, mb_height) / 2) {
442 442 
         for (mb_y = 0; mb_y < mb_height; mb_y++) {
443 443 
             for (mb_x = 0; mb_x < s->mb_width; mb_x++) {
444 444 
                 const int mb_xy = mb_x + mb_y * s->mb_stride;