summaryrefslogtreecommitdiff
path: root/libavcodec/hnm4video.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-08-03 01:49:55 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-08-12 08:45:07 +0200
commitcd460f4da04c05d6ba93ccbbe294e948768f0937 (patch)
tree98490dda6100f1ee8ad733ea7b4b83efbdf1fec3 /libavcodec/hnm4video.c
parentaecf5cbd68021e2f2250a2d9aa53493ac73e7c1e (diff)
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@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/hnm4video.c')
-rw-r--r--libavcodec/hnm4video.c13
1 files 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;
}
}
}