avcodec/exrdsp: improve the ExrDSPContext->reorder_pixels prototype
authorJames Almer <jamrial@gmail.com>
Sun, 17 Sep 2017 21:56:39 +0000 (18:56 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 17 Sep 2017 22:01:40 +0000 (19:01 -0300)
Make dst be the first parameter and src const. It's more in line with the rest of the codebase.

Signed-off-by: James Almer <jamrial@gmail.com>
libavcodec/exr.c
libavcodec/exrdsp.c
libavcodec/exrdsp.h
libavcodec/x86/exrdsp.asm
libavcodec/x86/exrdsp_init.c

index de2f05d..230d5bb 100644 (file)
@@ -289,7 +289,7 @@ static int zip_uncompress(EXRContext *s, const uint8_t *src, int compressed_size
     av_assert1(uncompressed_size % 2 == 0);
 
     predictor(td->tmp, uncompressed_size);
-    s->dsp.reorder_pixels(td->tmp, td->uncompressed_data, uncompressed_size);
+    s->dsp.reorder_pixels(td->uncompressed_data, td->tmp, uncompressed_size);
 
     return 0;
 }
@@ -336,7 +336,7 @@ static int rle_uncompress(EXRContext *ctx, const uint8_t *src, int compressed_si
     av_assert1(uncompressed_size % 2 == 0);
 
     predictor(td->tmp, uncompressed_size);
-    ctx->dsp.reorder_pixels(td->tmp, td->uncompressed_data, uncompressed_size);
+    ctx->dsp.reorder_pixels(td->uncompressed_data, td->tmp, uncompressed_size);
 
     return 0;
 }
index e59dac3..871b6f1 100644 (file)
@@ -24,7 +24,7 @@
 #include "exrdsp.h"
 #include "config.h"
 
-static void reorder_pixels_scalar(uint8_t *src, uint8_t *dst, ptrdiff_t size)
+static void reorder_pixels_scalar(uint8_t *dst, const uint8_t *src, ptrdiff_t size)
 {
     const uint8_t *t1 = src;
     int half_size     = size / 2;
index 09a76a5..d8cb002 100644 (file)
@@ -23,7 +23,7 @@
 #include "libavutil/common.h"
 
 typedef struct ExrDSPContext {
-    void (*reorder_pixels)(uint8_t *src, uint8_t *dst, ptrdiff_t size);
+    void (*reorder_pixels)(uint8_t *dst, const uint8_t *src, ptrdiff_t size);
 } ExrDSPContext;
 
 void ff_exrdsp_init(ExrDSPContext *c);
index 91d9c0b..b91a7be 100644 (file)
 SECTION .text
 
 ;------------------------------------------------------------------------------
-; void ff_reorder_pixels(uint8_t *src, uint8_t *dst, ptrdiff_t size)
+; void ff_reorder_pixels(uint8_t *dst, const uint8_t *src, ptrdiff_t size);
 ;------------------------------------------------------------------------------
 
 %macro REORDER_PIXELS 0
-cglobal reorder_pixels, 3,4,3, src1, dst, size, src2
+cglobal reorder_pixels, 3,4,3, dst, src1, size, src2
     lea                              src2q, [src1q+sizeq] ; src2 = src + 2 * half_size
     add                               dstq, sizeq         ; dst offset by size
     shr                              sizeq, 1             ; half_size
index c0f508b..5669be3 100644 (file)
@@ -22,9 +22,9 @@
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/exrdsp.h"
 
-void ff_reorder_pixels_sse2(uint8_t *src, uint8_t *dst, ptrdiff_t size);
+void ff_reorder_pixels_sse2(uint8_t *dst, const uint8_t *src, ptrdiff_t size);
 
-void ff_reorder_pixels_avx2(uint8_t *src, uint8_t *dst, ptrdiff_t size);
+void ff_reorder_pixels_avx2(uint8_t *dst, const uint8_t *src, ptrdiff_t size);
 
 av_cold void ff_exrdsp_init_x86(ExrDSPContext *dsp)
 {