diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-12-27 10:36:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-12-31 17:44:26 +0100 |
| commit | c4276a7f30f0521d61644bfbe8869000f82488e9 (patch) | |
| tree | 98be9dbfcb190eaed0c7fa7faf5d34683bb743ba | |
| parent | 20564d23fd931c7f7b55b878b5bcd60e24e0a739 (diff) | |
| download | ffmpeg-c4276a7f30f0521d61644bfbe8869000f82488e9.tar.gz | |
avcodec/scpr: Avoid per pixel y checks in decode_run_i
about 1% faster
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/scpr.h | 39 |
1 files changed, 22 insertions, 17 deletions
diff --git a/libavcodec/scpr.h b/libavcodec/scpr.h index e22188ab3a..15cb87c464 100644 --- a/libavcodec/scpr.h +++ b/libavcodec/scpr.h @@ -89,12 +89,12 @@ static int decode_run_i(AVCodecContext *avctx, uint32_t ptype, int run, uint32_t lx = *plx, ly = *ply; + if (y >= avctx->height) + return AVERROR_INVALIDDATA; + switch (ptype) { case 0: while (run-- > 0) { - if (y >= avctx->height) - return AVERROR_INVALIDDATA; - dst[y * linesize + x] = clr; lx = x; ly = y; @@ -102,14 +102,13 @@ static int decode_run_i(AVCodecContext *avctx, uint32_t ptype, int run, if (x >= avctx->width) { x = 0; (y)++; + if (y >= avctx->height && run) + return AVERROR_INVALIDDATA; } } break; case 1: while (run-- > 0) { - if (y >= avctx->height) - return AVERROR_INVALIDDATA; - dst[y * linesize + x] = dst[ly * linesize + lx]; lx = x; ly = y; @@ -117,15 +116,17 @@ static int decode_run_i(AVCodecContext *avctx, uint32_t ptype, int run, if (x >= avctx->width) { x = 0; (y)++; + if (y >= avctx->height && run) + return AVERROR_INVALIDDATA; } } clr = dst[ly * linesize + lx]; break; case 2: - while (run-- > 0) { - if (y < 1 || y >= avctx->height) - return AVERROR_INVALIDDATA; + if (y < 1) + return AVERROR_INVALIDDATA; + while (run-- > 0) { clr = dst[y * linesize + x + off + 1]; dst[y * linesize + x] = clr; lx = x; @@ -134,19 +135,20 @@ static int decode_run_i(AVCodecContext *avctx, uint32_t ptype, int run, if (x >= avctx->width) { x = 0; (y)++; + if (y >= avctx->height && run) + return AVERROR_INVALIDDATA; } } break; case 4: + if (y < 1 || (y == 1 && x == 0)) + return AVERROR_INVALIDDATA; + while (run-- > 0) { uint8_t *odst = (uint8_t *)dst; int off1 = (ly * linesize + lx) * 4; int off2 = ((y * linesize + x) + off) * 4; - if (y < 1 || y >= avctx->height || - (y == 1 && x == 0)) - return AVERROR_INVALIDDATA; - if (x == 0) { z = backstep * 4; } else { @@ -170,15 +172,16 @@ static int decode_run_i(AVCodecContext *avctx, uint32_t ptype, int run, if (x >= avctx->width) { x = 0; (y)++; + if (y >= avctx->height && run) + return AVERROR_INVALIDDATA; } } break; case 5: - while (run-- > 0) { - if (y < 1 || y >= avctx->height || - (y == 1 && x == 0)) - return AVERROR_INVALIDDATA; + if (y < 1 || (y == 1 && x == 0)) + return AVERROR_INVALIDDATA; + while (run-- > 0) { if (x == 0) { z = backstep; } else { @@ -193,6 +196,8 @@ static int decode_run_i(AVCodecContext *avctx, uint32_t ptype, int run, if (x >= avctx->width) { x = 0; (y)++; + if (y >= avctx->height && run) + return AVERROR_INVALIDDATA; } } break; |