diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-07-30 00:52:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-11-15 12:25:45 +0100 |
| commit | fd897acc35d45f0b72aee2021170a679b53ffe50 (patch) | |
| tree | 27cf372e852edaad92386e5b5b67801957570b04 | |
| parent | 26d48144e5994ea88a21d7a8918e231ae6d86c9d (diff) | |
| download | ffmpeg-fd897acc35d45f0b72aee2021170a679b53ffe50.tar.gz | |
avcodec/scpr: Use av_memcpy_backptr() in type 17 and 33
This makes the changed code-path faster.
Change not tested except with the fuzzer testcase as I found no other testcase.
Improves: Timeout (136sec -> 74sec)
Improves: 16040/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SCPR_fuzzer-5705876062601216
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
(cherry picked from commit 950a21e83c742714d6afbecd3e3fd1887e80fa40)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/scpr.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/scpr.c b/libavcodec/scpr.c index 6d9c437c0b..1ec1b6d583 100644 --- a/libavcodec/scpr.c +++ b/libavcodec/scpr.c @@ -782,7 +782,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, s->current_frame->linesize[0] / 4); } else if (type == 17) { uint32_t clr, *dst = (uint32_t *)s->current_frame->data[0]; - int x, y; + int y; frame->key_frame = 1; bytestream2_skip(gb, 1); @@ -798,9 +798,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, clr = bytestream2_get_le24(gb); } for (y = 0; y < avctx->height; y++) { - for (x = 0; x < avctx->width; x++) { - dst[x] = clr; - } + dst[0] = clr; + av_memcpy_backptr((uint8_t*)(dst+1), 4, 4*avctx->width - 4); dst += s->current_frame->linesize[0] / 4; } } else if (type == 0 || type == 1) { |