virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-02 20:35:37 +02:00
Code Issues Releases Activity

avcodec/exrdsp: improve the ExrDSPContext->reorder_pixels prototype

Browse Source 
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>
This commit is contained in:
James Almer 2017-09-17 18:56:39 -03:00
parent 9b8c1224d7
commit 98d7ad085e
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/exr.c
View File

@ -289,7 +289,7 @@ static int zip_uncompress(EXRContext *s, const uint8_t *src, int compressed_size
av_assert1(uncompressed_size % 2 == 0); av_assert1(uncompressed_size % 2 == 0);
predictor(td->tmp, uncompressed_size); 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; 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); av_assert1(uncompressed_size % 2 == 0);
predictor(td->tmp, uncompressed_size); 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; return 0;
} }

2
libavcodec/exrdsp.c
View File

@ -24,7 +24,7 @@
#include "exrdsp.h" #include "exrdsp.h"
#include "config.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; const uint8_t *t1 = src;
int half_size = size / 2; int half_size = size / 2;

2
libavcodec/exrdsp.h
View File

@ -23,7 +23,7 @@
#include "libavutil/common.h" #include "libavutil/common.h"
typedef struct ExrDSPContext { 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; } ExrDSPContext;
void ff_exrdsp_init(ExrDSPContext *c); void ff_exrdsp_init(ExrDSPContext *c);

4
libavcodec/x86/exrdsp.asm
View File

@ -27,11 +27,11 @@
SECTION .text 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 %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 lea src2q, [src1q+sizeq] ; src2 = src + 2 * half_size
add dstq, sizeq ; dst offset by size add dstq, sizeq ; dst offset by size
shr sizeq, 1 ; half_size shr sizeq, 1 ; half_size

4
libavcodec/x86/exrdsp_init.c
View File

@ -22,9 +22,9 @@
#include "libavutil/x86/cpu.h" #include "libavutil/x86/cpu.h"
#include "libavcodec/exrdsp.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) av_cold void ff_exrdsp_init_x86(ExrDSPContext *dsp)
{ {