[FFmpeg-cvslog] avcodec/hnm4video: Optimize postprocess_current_frame()
Michael Niedermayer
git at videolan.org
Wed Sep 4 22:26:08 EEST 2019
ffmpeg | branch: release/4.2 | Michael Niedermayer <michael at niedermayer.cc> | Sat Aug 3 01:49:55 2019 +0200| [2a59101eb193febc93fd7612300a2033a725da43] | committer: Michael Niedermayer
avcodec/hnm4video: Optimize postprocess_current_frame()
Improves: Timeout (220sec -> 108sec)
Improves: 15570/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HNM4_VIDEO_fuzzer-5085482213441536
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Tomas Härdin <tjoppen at acc.umu.se>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit cd460f4da04c05d6ba93ccbbe294e948768f0937)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2a59101eb193febc93fd7612300a2033a725da43
---
libavcodec/hnm4video.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/libavcodec/hnm4video.c b/libavcodec/hnm4video.c
index 95a284065e..177ce1d47a 100644
--- a/libavcodec/hnm4video.c
+++ b/libavcodec/hnm4video.c
@@ -117,14 +117,17 @@ static void unpack_intraframe(AVCodecContext *avctx, uint8_t *src,
static void postprocess_current_frame(AVCodecContext *avctx)
{
Hnm4VideoContext *hnm = avctx->priv_data;
- uint32_t x, y, src_x, src_y;
+ uint32_t x, y, src_y;
+ int width = hnm->width;
for (y = 0; y < hnm->height; y++) {
+ uint8_t *dst = hnm->processed + y * width;
+ const uint8_t *src = hnm->current;
src_y = y - (y % 2);
- src_x = src_y * hnm->width + (y % 2);
- for (x = 0; x < hnm->width; x++) {
- hnm->processed[(y * hnm->width) + x] = hnm->current[src_x];
- src_x += 2;
+ src += src_y * width + (y % 2);
+ for (x = 0; x < width; x++) {
+ dst[x] = *src;
+ src += 2;
}
}
}
More information about the ffmpeg-cvslog
mailing list