generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hevc_deblock: change tc type

Browse Source 
The x86 asm expects int32_t so use that type.

Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Christophe Gisquet 2014-08-04 22:29:37 +02:00 committed by Michael Niedermayer
parent 9f02a2b224
commit 6786848585
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/hevc_filter.c
View File

@ -337,8 +337,8 @@ static void deblocking_filter_CTB(HEVCContext *s, int x0, int y0)
{ {
uint8_t *src; uint8_t *src;
int x, y; int x, y;
int chroma; int chroma, beta;
int c_tc[2], tc[2], beta; int32_t c_tc[2], tc[2];
uint8_t no_p[2] = { 0 }; uint8_t no_p[2] = { 0 };
uint8_t no_q[2] = { 0 }; uint8_t no_q[2] = { 0 };

16
libavcodec/hevcdsp.h
View File

@ -95,26 +95,26 @@ typedef struct HEVCDSPContext {
int ox1, intptr_t mx, intptr_t my, int width); int ox1, intptr_t mx, intptr_t my, int width);
void (*hevc_h_loop_filter_luma)(uint8_t *pix, ptrdiff_t stride, void (*hevc_h_loop_filter_luma)(uint8_t *pix, ptrdiff_t stride,
int beta, int *tc, int beta, int32_t *tc,
uint8_t *no_p, uint8_t *no_q); uint8_t *no_p, uint8_t *no_q);
void (*hevc_v_loop_filter_luma)(uint8_t *pix, ptrdiff_t stride, void (*hevc_v_loop_filter_luma)(uint8_t *pix, ptrdiff_t stride,
int beta, int *tc, int beta, int32_t *tc,
uint8_t *no_p, uint8_t *no_q); uint8_t *no_p, uint8_t *no_q);
void (*hevc_h_loop_filter_chroma)(uint8_t *pix, ptrdiff_t stride, void (*hevc_h_loop_filter_chroma)(uint8_t *pix, ptrdiff_t stride,
int *tc, uint8_t *no_p, uint8_t *no_q); int32_t *tc, uint8_t *no_p, uint8_t *no_q);
void (*hevc_v_loop_filter_chroma)(uint8_t *pix, ptrdiff_t stride, void (*hevc_v_loop_filter_chroma)(uint8_t *pix, ptrdiff_t stride,
int *tc, uint8_t *no_p, uint8_t *no_q); int32_t *tc, uint8_t *no_p, uint8_t *no_q);
void (*hevc_h_loop_filter_luma_c)(uint8_t *pix, ptrdiff_t stride, void (*hevc_h_loop_filter_luma_c)(uint8_t *pix, ptrdiff_t stride,
int beta, int *tc, int beta, int32_t *tc,
uint8_t *no_p, uint8_t *no_q); uint8_t *no_p, uint8_t *no_q);
void (*hevc_v_loop_filter_luma_c)(uint8_t *pix, ptrdiff_t stride, void (*hevc_v_loop_filter_luma_c)(uint8_t *pix, ptrdiff_t stride,
int beta, int *tc, int beta, int32_t *tc,
uint8_t *no_p, uint8_t *no_q); uint8_t *no_p, uint8_t *no_q);
void (*hevc_h_loop_filter_chroma_c)(uint8_t *pix, ptrdiff_t stride, void (*hevc_h_loop_filter_chroma_c)(uint8_t *pix, ptrdiff_t stride,
int *tc, uint8_t *no_p, int32_t *tc, uint8_t *no_p,
uint8_t *no_q); uint8_t *no_q);
void (*hevc_v_loop_filter_chroma_c)(uint8_t *pix, ptrdiff_t stride, void (*hevc_v_loop_filter_chroma_c)(uint8_t *pix, ptrdiff_t stride,
int *tc, uint8_t *no_p, int32_t *tc, uint8_t *no_p,
uint8_t *no_q); uint8_t *no_q);
} HEVCDSPContext; } HEVCDSPContext;

8
libavcodec/hevcdsp_template.c
View File

@ -1693,21 +1693,21 @@ static void FUNC(hevc_loop_filter_chroma)(uint8_t *_pix, ptrdiff_t _xstride,
} }
static void FUNC(hevc_h_loop_filter_chroma)(uint8_t *pix, ptrdiff_t stride, static void FUNC(hevc_h_loop_filter_chroma)(uint8_t *pix, ptrdiff_t stride,
int *tc, uint8_t *no_p, int32_t *tc, uint8_t *no_p,
uint8_t *no_q) uint8_t *no_q)
{ {
FUNC(hevc_loop_filter_chroma)(pix, stride, sizeof(pixel), tc, no_p, no_q); FUNC(hevc_loop_filter_chroma)(pix, stride, sizeof(pixel), tc, no_p, no_q);
} }
static void FUNC(hevc_v_loop_filter_chroma)(uint8_t *pix, ptrdiff_t stride, static void FUNC(hevc_v_loop_filter_chroma)(uint8_t *pix, ptrdiff_t stride,
int *tc, uint8_t *no_p, int32_t *tc, uint8_t *no_p,
uint8_t *no_q) uint8_t *no_q)
{ {
FUNC(hevc_loop_filter_chroma)(pix, sizeof(pixel), stride, tc, no_p, no_q); FUNC(hevc_loop_filter_chroma)(pix, sizeof(pixel), stride, tc, no_p, no_q);
} }
static void FUNC(hevc_h_loop_filter_luma)(uint8_t *pix, ptrdiff_t stride, static void FUNC(hevc_h_loop_filter_luma)(uint8_t *pix, ptrdiff_t stride,
int beta, int *tc, uint8_t *no_p, int beta, int32_t *tc, uint8_t *no_p,
uint8_t *no_q) uint8_t *no_q)
{ {
FUNC(hevc_loop_filter_luma)(pix, stride, sizeof(pixel), FUNC(hevc_loop_filter_luma)(pix, stride, sizeof(pixel),
@ -1715,7 +1715,7 @@ static void FUNC(hevc_h_loop_filter_luma)(uint8_t *pix, ptrdiff_t stride,
} }
static void FUNC(hevc_v_loop_filter_luma)(uint8_t *pix, ptrdiff_t stride, static void FUNC(hevc_v_loop_filter_luma)(uint8_t *pix, ptrdiff_t stride,
int beta, int *tc, uint8_t *no_p, int beta, int32_t *tc, uint8_t *no_p,
uint8_t *no_q) uint8_t *no_q)
{ {
FUNC(hevc_loop_filter_luma)(pix, sizeof(pixel), stride, FUNC(hevc_loop_filter_luma)(pix, sizeof(pixel), stride,

8
libavcodec/x86/hevc_deblock.asm
View File

@ -625,7 +625,7 @@ ALIGN 16
%endmacro %endmacro
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_hevc_v_loop_filter_chroma(uint8_t *_pix, ptrdiff_t _stride, int *_tc, ; void ff_hevc_v_loop_filter_chroma(uint8_t *_pix, ptrdiff_t _stride, int32_t *tc,
; uint8_t *_no_p, uint8_t *_no_q); ; uint8_t *_no_p, uint8_t *_no_q);
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro LOOP_FILTER_CHROMA 0 %macro LOOP_FILTER_CHROMA 0
@ -660,7 +660,7 @@ cglobal hevc_v_loop_filter_chroma_12, 3, 5, 7, pix, stride, tc, pix0, r3stride
RET RET
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_hevc_h_loop_filter_chroma(uint8_t *_pix, ptrdiff_t _stride, int *_tc, ; void ff_hevc_h_loop_filter_chroma(uint8_t *_pix, ptrdiff_t _stride, int32_t *tc,
; uint8_t *_no_p, uint8_t *_no_q); ; uint8_t *_no_p, uint8_t *_no_q);
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
cglobal hevc_h_loop_filter_chroma_8, 3, 4, 7, pix, stride, tc, pix0 cglobal hevc_h_loop_filter_chroma_8, 3, 4, 7, pix, stride, tc, pix0
@ -724,7 +724,7 @@ LOOP_FILTER_CHROMA
%macro LOOP_FILTER_LUMA 0 %macro LOOP_FILTER_LUMA 0
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_hevc_v_loop_filter_luma(uint8_t *_pix, ptrdiff_t _stride, int beta, ; void ff_hevc_v_loop_filter_luma(uint8_t *_pix, ptrdiff_t _stride, int beta,
; int *_tc, uint8_t *_no_p, uint8_t *_no_q); ; int32_t *tc, uint8_t *_no_p, uint8_t *_no_q);
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
cglobal hevc_v_loop_filter_luma_8, 4, 14, 16, pix, stride, beta, tc, pix0, src3stride cglobal hevc_v_loop_filter_luma_8, 4, 14, 16, pix, stride, beta, tc, pix0, src3stride
sub pixq, 4 sub pixq, 4
@ -764,7 +764,7 @@ cglobal hevc_v_loop_filter_luma_12, 4, 14, 16, pix, stride, beta, tc, pix0, src3
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_hevc_h_loop_filter_luma(uint8_t *_pix, ptrdiff_t _stride, int beta, ; void ff_hevc_h_loop_filter_luma(uint8_t *_pix, ptrdiff_t _stride, int beta,
; int *_tc, uint8_t *_no_p, uint8_t *_no_q); ; int32_t *tc, uint8_t *_no_p, uint8_t *_no_q);
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
cglobal hevc_h_loop_filter_luma_8, 4, 14, 16, pix, stride, beta, tc, pix0, src3stride cglobal hevc_h_loop_filter_luma_8, 4, 14, 16, pix, stride, beta, tc, pix0, src3stride
lea src3strideq, [3 * strideq] lea src3strideq, [3 * strideq]