diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-08-05 16:29:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-09-28 01:25:17 +0200 |
| commit | a423970511bc3b271a1e4202f3bcf60773de657b (patch) | |
| tree | 5a24c7075a7f7e46ea161172b6f99c36bea3ca07 /libavcodec/gdv.c | |
| parent | b90d8cc7466386a166dd72107457498aa5a7c43d (diff) | |
| download | ffmpeg-a423970511bc3b271a1e4202f3bcf60773de657b.tar.gz | |
avcodec/gdv: Factor terms out of inner loops in rescale()
This also replaces some loops by memcpy()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/gdv.c')
| -rw-r--r-- | libavcodec/gdv.c | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/libavcodec/gdv.c b/libavcodec/gdv.c index 79ca157dde..274552a7be 100644 --- a/libavcodec/gdv.c +++ b/libavcodec/gdv.c @@ -83,44 +83,51 @@ static void rescale(GDVContext *gdv, uint8_t *dst, int w, int h, int scale_v, in if (gdv->scale_h && gdv->scale_v) { for (j = 0; j < h; j++) { int y = h - j - 1; + uint8_t *dst1 = dst + PREAMBLE_SIZE + y * w; + uint8_t *src1 = dst + PREAMBLE_SIZE + (y>>1) * (w>>1); for (i = 0; i < w; i++) { int x = w - i - 1; - dst[PREAMBLE_SIZE + x + y * w] = dst[PREAMBLE_SIZE + (x>>1) + (y>>1) * (w>>1)]; + dst1[x] = src1[(x>>1)]; } } } else if (gdv->scale_h) { for (j = 0; j < h; j++) { int y = h - j - 1; - for (x = 0; x < w; x++) { - dst[PREAMBLE_SIZE + x + y * w] = dst[PREAMBLE_SIZE + x + (y>>1) * w]; - } + uint8_t *dst1 = dst + PREAMBLE_SIZE + y * w; + uint8_t *src1 = dst + PREAMBLE_SIZE + (y>>1) * w; + memcpy(dst1, src1, w); } } else if (gdv->scale_v) { for (j = 0; j < h; j++) { int y = h - j - 1; + uint8_t *dst1 = dst + PREAMBLE_SIZE + y * w; + uint8_t *src1 = dst + PREAMBLE_SIZE + y * (w>>1); for (i = 0; i < w; i++) { int x = w - i - 1; - dst[PREAMBLE_SIZE + x + y * w] = dst[PREAMBLE_SIZE + (x>>1) + y * (w>>1)]; + dst1[x] = src1[(x>>1)]; } } } if (scale_h && scale_v) { for (y = 0; y < (h>>1); y++) { + uint8_t *dst1 = dst + PREAMBLE_SIZE + y * (w>>1); + uint8_t *src1 = dst + PREAMBLE_SIZE + y*2 * w; for (x = 0; x < (w>>1); x++) { - dst[PREAMBLE_SIZE + x + y * (w>>1)] = dst[PREAMBLE_SIZE + x*2 + y*2 * w]; + dst1[x] = src1[x*2]; } } } else if (scale_h) { for (y = 0; y < (h>>1); y++) { - for (x = 0; x < w; x++) { - dst[PREAMBLE_SIZE + x + y * w] = dst[PREAMBLE_SIZE + x + y*2 * w]; - } + uint8_t *dst1 = dst + PREAMBLE_SIZE + y * w; + uint8_t *src1 = dst + PREAMBLE_SIZE + y*2 * w; + memcpy(dst1, src1, w); } } else if (scale_v) { for (y = 0; y < h; y++) { + uint8_t *dst1 = dst + PREAMBLE_SIZE + y * w; for (x = 0; x < (w>>1); x++) { - dst[PREAMBLE_SIZE + x + y * w] = dst[PREAMBLE_SIZE + x*2 + y * w]; + dst1[x] = dst1[x*2]; } } } |