Skip to content

F
ffmpeg.wasm-core
Commit 5801f9ed authored by Diego Biurrun's avatar Diego Biurrun
Browse files
Options

h264_intrapred: x86: Update comments left behind in 95c89da3

parent 20abcaa2
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 66 deletions
libavcodec/x86/h264_intrapred.asm
View file @ 5801f9ed
...@@ -49,7 +49,7 @@ cextern pw_17 ...@@ -49,7 +49,7 @@ cextern pw_17
cextern pw_32 cextern pw_32
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred16x16_vertical_8(uint8_t *src, int stride) ; void ff_pred16x16_vertical_8(uint8_t *src, ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
INIT_MMX mmx INIT_MMX mmx
...@@ -85,7 +85,7 @@ cglobal pred16x16_vertical_8, 2,3 ...@@ -85,7 +85,7 @@ cglobal pred16x16_vertical_8, 2,3
REP_RET REP_RET
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred16x16_horizontal_8(uint8_t *src, int stride) ; void ff_pred16x16_horizontal_8(uint8_t *src, ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro PRED16x16_H 0 %macro PRED16x16_H 0
...@@ -126,7 +126,7 @@ INIT_XMM ssse3 ...@@ -126,7 +126,7 @@ INIT_XMM ssse3
PRED16x16_H PRED16x16_H
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred16x16_dc_8(uint8_t *src, int stride) ; void ff_pred16x16_dc_8(uint8_t *src, ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro PRED16x16_DC 0 %macro PRED16x16_DC 0
...@@ -188,7 +188,7 @@ INIT_XMM ssse3 ...@@ -188,7 +188,7 @@ INIT_XMM ssse3
PRED16x16_DC PRED16x16_DC
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred16x16_tm_vp8_8(uint8_t *src, int stride) ; void ff_pred16x16_tm_vp8_8(uint8_t *src, ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro PRED16x16_TM 0 %macro PRED16x16_TM 0
...@@ -269,7 +269,7 @@ cglobal pred16x16_tm_vp8_8, 2,6,6 ...@@ -269,7 +269,7 @@ cglobal pred16x16_tm_vp8_8, 2,6,6
REP_RET REP_RET
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred16x16_plane_*_8(uint8_t *src, int stride) ; void ff_pred16x16_plane_*_8(uint8_t *src, ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro H264_PRED16x16_PLANE 1 %macro H264_PRED16x16_PLANE 1
...@@ -550,7 +550,7 @@ H264_PRED16x16_PLANE rv40 ...@@ -550,7 +550,7 @@ H264_PRED16x16_PLANE rv40
H264_PRED16x16_PLANE svq3 H264_PRED16x16_PLANE svq3
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred8x8_plane_8(uint8_t *src, int stride) ; void ff_pred8x8_plane_8(uint8_t *src, ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro H264_PRED8x8_PLANE 0 %macro H264_PRED8x8_PLANE 0
...@@ -724,7 +724,7 @@ INIT_XMM ssse3 ...@@ -724,7 +724,7 @@ INIT_XMM ssse3
H264_PRED8x8_PLANE H264_PRED8x8_PLANE
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred8x8_vertical_8(uint8_t *src, int stride) ; void ff_pred8x8_vertical_8(uint8_t *src, ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
INIT_MMX mmx INIT_MMX mmx
...@@ -741,7 +741,7 @@ cglobal pred8x8_vertical_8, 2,2 ...@@ -741,7 +741,7 @@ cglobal pred8x8_vertical_8, 2,2
RET RET
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred8x8_horizontal_8(uint8_t *src, int stride) ; void ff_pred8x8_horizontal_8(uint8_t *src, ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro PRED8x8_H 0 %macro PRED8x8_H 0
...@@ -769,7 +769,7 @@ INIT_MMX ssse3 ...@@ -769,7 +769,7 @@ INIT_MMX ssse3
PRED8x8_H PRED8x8_H
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred8x8_top_dc_8_mmxext(uint8_t *src, int stride) ; void ff_pred8x8_top_dc_8_mmxext(uint8_t *src, ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
INIT_MMX mmxext INIT_MMX mmxext
cglobal pred8x8_top_dc_8, 2,5 cglobal pred8x8_top_dc_8, 2,5
...@@ -803,7 +803,7 @@ cglobal pred8x8_top_dc_8, 2,5 ...@@ -803,7 +803,7 @@ cglobal pred8x8_top_dc_8, 2,5
RET RET
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred8x8_dc_8_mmxext(uint8_t *src, int stride) ; void ff_pred8x8_dc_8_mmxext(uint8_t *src, ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
INIT_MMX mmxext INIT_MMX mmxext
...@@ -864,7 +864,7 @@ cglobal pred8x8_dc_8, 2,5 ...@@ -864,7 +864,7 @@ cglobal pred8x8_dc_8, 2,5
RET RET
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred8x8_dc_rv40_8(uint8_t *src, int stride) ; void ff_pred8x8_dc_rv40_8(uint8_t *src, ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
INIT_MMX mmxext INIT_MMX mmxext
...@@ -901,7 +901,7 @@ cglobal pred8x8_dc_rv40_8, 2,7 ...@@ -901,7 +901,7 @@ cglobal pred8x8_dc_rv40_8, 2,7
REP_RET REP_RET
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred8x8_tm_vp8_8(uint8_t *src, int stride) ; void ff_pred8x8_tm_vp8_8(uint8_t *src, ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro PRED8x8_TM 0 %macro PRED8x8_TM 0
...@@ -1014,7 +1014,7 @@ cglobal pred8x8_tm_vp8_8, 2,3,6 ...@@ -1014,7 +1014,7 @@ cglobal pred8x8_tm_vp8_8, 2,3,6
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred8x8l_top_dc_8(uint8_t *src, int has_topleft, int has_topright, ; void ff_pred8x8l_top_dc_8(uint8_t *src, int has_topleft, int has_topright,
; int stride) ; ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro PRED8x8L_TOP_DC 0 %macro PRED8x8L_TOP_DC 0
cglobal pred8x8l_top_dc_8, 4,4 cglobal pred8x8l_top_dc_8, 4,4
...@@ -1070,7 +1070,7 @@ PRED8x8L_TOP_DC ...@@ -1070,7 +1070,7 @@ PRED8x8L_TOP_DC
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred8x8l_dc_8(uint8_t *src, int has_topleft, int has_topright, ; void ff_pred8x8l_dc_8(uint8_t *src, int has_topleft, int has_topright,
; int stride) ; ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro PRED8x8L_DC 0 %macro PRED8x8L_DC 0
...@@ -1174,7 +1174,7 @@ PRED8x8L_DC ...@@ -1174,7 +1174,7 @@ PRED8x8L_DC
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred8x8l_horizontal_8(uint8_t *src, int has_topleft, ; void ff_pred8x8l_horizontal_8(uint8_t *src, int has_topleft,
; int has_topright, int stride) ; int has_topright, ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro PRED8x8L_HORIZONTAL 0 %macro PRED8x8L_HORIZONTAL 0
...@@ -1246,7 +1246,7 @@ PRED8x8L_HORIZONTAL ...@@ -1246,7 +1246,7 @@ PRED8x8L_HORIZONTAL
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred8x8l_vertical_8(uint8_t *src, int has_topleft, int has_topright, ; void ff_pred8x8l_vertical_8(uint8_t *src, int has_topleft, int has_topright,
; int stride) ; ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro PRED8x8L_VERTICAL 0 %macro PRED8x8L_VERTICAL 0
...@@ -1297,7 +1297,7 @@ PRED8x8L_VERTICAL ...@@ -1297,7 +1297,7 @@ PRED8x8L_VERTICAL
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred8x8l_down_left_8(uint8_t *src, int has_topleft, ; void ff_pred8x8l_down_left_8(uint8_t *src, int has_topleft,
; int has_topright, int stride) ; int has_topright, ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
INIT_MMX mmxext INIT_MMX mmxext
...@@ -1498,7 +1498,7 @@ PRED8x8L_DOWN_LEFT ...@@ -1498,7 +1498,7 @@ PRED8x8L_DOWN_LEFT
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred8x8l_down_right_8_mmxext(uint8_t *src, int has_topleft, ; void ff_pred8x8l_down_right_8_mmxext(uint8_t *src, int has_topleft,
; int has_topright, int stride) ; int has_topright, ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
INIT_MMX mmxext INIT_MMX mmxext
...@@ -1750,7 +1750,7 @@ PRED8x8L_DOWN_RIGHT ...@@ -1750,7 +1750,7 @@ PRED8x8L_DOWN_RIGHT
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred8x8l_vertical_right_8(uint8_t *src, int has_topleft, ; void ff_pred8x8l_vertical_right_8(uint8_t *src, int has_topleft,
; int has_topright, int stride) ; int has_topright, ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
INIT_MMX mmxext INIT_MMX mmxext
...@@ -1978,7 +1978,7 @@ PRED8x8L_VERTICAL_RIGHT ...@@ -1978,7 +1978,7 @@ PRED8x8L_VERTICAL_RIGHT
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred8x8l_vertical_left_8(uint8_t *src, int has_topleft, ; void ff_pred8x8l_vertical_left_8(uint8_t *src, int has_topleft,
; int has_topright, int stride) ; int has_topright, ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro PRED8x8L_VERTICAL_LEFT 0 %macro PRED8x8L_VERTICAL_LEFT 0
...@@ -2068,7 +2068,7 @@ PRED8x8L_VERTICAL_LEFT ...@@ -2068,7 +2068,7 @@ PRED8x8L_VERTICAL_LEFT
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred8x8l_horizontal_up_8(uint8_t *src, int has_topleft, ; void ff_pred8x8l_horizontal_up_8(uint8_t *src, int has_topleft,
; int has_topright, int stride) ; int has_topright, ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro PRED8x8L_HORIZONTAL_UP 0 %macro PRED8x8L_HORIZONTAL_UP 0
...@@ -2156,7 +2156,7 @@ PRED8x8L_HORIZONTAL_UP ...@@ -2156,7 +2156,7 @@ PRED8x8L_HORIZONTAL_UP
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred8x8l_horizontal_down_8(uint8_t *src, int has_topleft, ; void ff_pred8x8l_horizontal_down_8(uint8_t *src, int has_topleft,
; int has_topright, int stride) ; int has_topright, ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
INIT_MMX mmxext INIT_MMX mmxext
...@@ -2404,7 +2404,8 @@ INIT_MMX ssse3 ...@@ -2404,7 +2404,8 @@ INIT_MMX ssse3
PRED8x8L_HORIZONTAL_DOWN PRED8x8L_HORIZONTAL_DOWN
;------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------
; void ff_pred4x4_dc_8_mmxext(uint8_t *src, const uint8_t *topright, int stride) ; void ff_pred4x4_dc_8_mmxext(uint8_t *src, const uint8_t *topright,
; ptrdiff_t stride)
;------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------
INIT_MMX mmxext INIT_MMX mmxext
...@@ -2435,7 +2436,7 @@ cglobal pred4x4_dc_8, 3,5 ...@@ -2435,7 +2436,7 @@ cglobal pred4x4_dc_8, 3,5
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred4x4_tm_vp8_8_mmxext(uint8_t *src, const uint8_t *topright, ; void ff_pred4x4_tm_vp8_8_mmxext(uint8_t *src, const uint8_t *topright,
; int stride) ; ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro PRED4x4_TM 0 %macro PRED4x4_TM 0
...@@ -2517,7 +2518,7 @@ cglobal pred4x4_tm_vp8_8, 3,3 ...@@ -2517,7 +2518,7 @@ cglobal pred4x4_tm_vp8_8, 3,3
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred4x4_vertical_vp8_8_mmxext(uint8_t *src, const uint8_t *topright, ; void ff_pred4x4_vertical_vp8_8_mmxext(uint8_t *src, const uint8_t *topright,
; int stride) ; ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
INIT_MMX mmxext INIT_MMX mmxext
...@@ -2538,7 +2539,7 @@ cglobal pred4x4_vertical_vp8_8, 3,3 ...@@ -2538,7 +2539,7 @@ cglobal pred4x4_vertical_vp8_8, 3,3
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred4x4_down_left_8_mmxext(uint8_t *src, const uint8_t *topright, ; void ff_pred4x4_down_left_8_mmxext(uint8_t *src, const uint8_t *topright,
; int stride) ; ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
INIT_MMX mmxext INIT_MMX mmxext
cglobal pred4x4_down_left_8, 3,3 cglobal pred4x4_down_left_8, 3,3
...@@ -2565,7 +2566,7 @@ cglobal pred4x4_down_left_8, 3,3 ...@@ -2565,7 +2566,7 @@ cglobal pred4x4_down_left_8, 3,3
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
; void ff_pred4x4_vertical_left_8_mmxext(uint8_t *src, const uint8_t *topright, ; void ff_pred4x4_vertical_left_8_mmxext(uint8_t *src, const uint8_t *topright,
; int stride) ; ptrdiff_t stride)
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
INIT_MMX mmxext INIT_MMX mmxext
...@@ -2591,7 +2592,7 @@ cglobal pred4x4_vertical_left_8, 3,3 ...@@ -2591,7 +2592,7 @@ cglobal pred4x4_vertical_left_8, 3,3
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
; void ff_pred4x4_horizontal_up_8_mmxext(uint8_t *src, const uint8_t *topright, ; void ff_pred4x4_horizontal_up_8_mmxext(uint8_t *src, const uint8_t *topright,
; int stride) ; ptrdiff_t stride)
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
INIT_MMX mmxext INIT_MMX mmxext
...@@ -2625,7 +2626,8 @@ cglobal pred4x4_horizontal_up_8, 3,3 ...@@ -2625,7 +2626,8 @@ cglobal pred4x4_horizontal_up_8, 3,3
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
; void ff_pred4x4_horizontal_down_8_mmxext(uint8_t *src, ; void ff_pred4x4_horizontal_down_8_mmxext(uint8_t *src,
; const uint8_t *topright, int stride) ; const uint8_t *topright,
; ptrdiff_t stride)
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
INIT_MMX mmxext INIT_MMX mmxext
...@@ -2661,7 +2663,8 @@ cglobal pred4x4_horizontal_down_8, 3,3 ...@@ -2661,7 +2663,8 @@ cglobal pred4x4_horizontal_down_8, 3,3
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred4x4_vertical_right_8_mmxext(uint8_t *src, ; void ff_pred4x4_vertical_right_8_mmxext(uint8_t *src,
; const uint8_t *topright, int stride) ; const uint8_t *topright,
; ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
INIT_MMX mmxext INIT_MMX mmxext
...@@ -2692,7 +2695,7 @@ cglobal pred4x4_vertical_right_8, 3,3 ...@@ -2692,7 +2695,7 @@ cglobal pred4x4_vertical_right_8, 3,3
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred4x4_down_right_8_mmxext(uint8_t *src, const uint8_t *topright, ; void ff_pred4x4_down_right_8_mmxext(uint8_t *src, const uint8_t *topright,
; int stride) ; ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
INIT_MMX mmxext INIT_MMX mmxext
......
libavcodec/x86/h264_intrapred_10bit.asm
View file @ 5801f9ed
...@@ -50,7 +50,8 @@ SECTION .text ...@@ -50,7 +50,8 @@ SECTION .text
%endmacro %endmacro
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred4x4_down_right(pixel *src, const pixel *topright, int stride) ; void ff_pred4x4_down_right_10(pixel *src, const pixel *topright,
; ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro PRED4x4_DR 0 %macro PRED4x4_DR 0
cglobal pred4x4_down_right_10, 3, 3 cglobal pred4x4_down_right_10, 3, 3
...@@ -86,7 +87,8 @@ INIT_XMM avx ...@@ -86,7 +87,8 @@ INIT_XMM avx
PRED4x4_DR PRED4x4_DR
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
; void ff_pred4x4_vertical_right(pixel *src, const pixel *topright, int stride) ; void ff_pred4x4_vertical_right_10(pixel *src, const pixel *topright,
; ptrdiff_t stride)
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
%macro PRED4x4_VR 0 %macro PRED4x4_VR 0
cglobal pred4x4_vertical_right_10, 3, 3, 6 cglobal pred4x4_vertical_right_10, 3, 3, 6
...@@ -123,7 +125,8 @@ INIT_XMM avx ...@@ -123,7 +125,8 @@ INIT_XMM avx
PRED4x4_VR PRED4x4_VR
;------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------
; void ff_pred4x4_horizontal_down(pixel *src, const pixel *topright, int stride) ; void ff_pred4x4_horizontal_down_10(pixel *src, const pixel *topright,
; ptrdiff_t stride)
;------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------
%macro PRED4x4_HD 0 %macro PRED4x4_HD 0
cglobal pred4x4_horizontal_down_10, 3, 3 cglobal pred4x4_horizontal_down_10, 3, 3
...@@ -163,7 +166,7 @@ INIT_XMM avx ...@@ -163,7 +166,7 @@ INIT_XMM avx
PRED4x4_HD PRED4x4_HD
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred4x4_dc(pixel *src, const pixel *topright, int stride) ; void ff_pred4x4_dc_10(pixel *src, const pixel *topright, ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro HADDD 2 ; sum junk %macro HADDD 2 ; sum junk
%if mmsize == 16 %if mmsize == 16
...@@ -204,7 +207,8 @@ cglobal pred4x4_dc_10, 3, 3 ...@@ -204,7 +207,8 @@ cglobal pred4x4_dc_10, 3, 3
RET RET
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred4x4_down_left(pixel *src, const pixel *topright, int stride) ; void ff_pred4x4_down_left_10(pixel *src, const pixel *topright,
; ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro PRED4x4_DL 0 %macro PRED4x4_DL 0
cglobal pred4x4_down_left_10, 3, 3 cglobal pred4x4_down_left_10, 3, 3
...@@ -232,7 +236,8 @@ INIT_XMM avx ...@@ -232,7 +236,8 @@ INIT_XMM avx
PRED4x4_DL PRED4x4_DL
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred4x4_vertical_left(pixel *src, const pixel *topright, int stride) ; void ff_pred4x4_vertical_left_10(pixel *src, const pixel *topright,
; ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro PRED4x4_VL 0 %macro PRED4x4_VL 0
cglobal pred4x4_vertical_left_10, 3, 3 cglobal pred4x4_vertical_left_10, 3, 3
...@@ -259,7 +264,8 @@ INIT_XMM avx ...@@ -259,7 +264,8 @@ INIT_XMM avx
PRED4x4_VL PRED4x4_VL
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred4x4_horizontal_up(pixel *src, const pixel *topright, int stride) ; void ff_pred4x4_horizontal_up_10(pixel *src, const pixel *topright,
; ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
INIT_MMX mmxext INIT_MMX mmxext
cglobal pred4x4_horizontal_up_10, 3, 3 cglobal pred4x4_horizontal_up_10, 3, 3
...@@ -293,7 +299,7 @@ cglobal pred4x4_horizontal_up_10, 3, 3 ...@@ -293,7 +299,7 @@ cglobal pred4x4_horizontal_up_10, 3, 3
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred8x8_vertical(pixel *src, int stride) ; void ff_pred8x8_vertical_10(pixel *src, ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
INIT_XMM sse2 INIT_XMM sse2
cglobal pred8x8_vertical_10, 2, 2 cglobal pred8x8_vertical_10, 2, 2
...@@ -309,7 +315,7 @@ cglobal pred8x8_vertical_10, 2, 2 ...@@ -309,7 +315,7 @@ cglobal pred8x8_vertical_10, 2, 2
RET RET
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred8x8_horizontal(pixel *src, int stride) ; void ff_pred8x8_horizontal_10(pixel *src, ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
INIT_XMM sse2 INIT_XMM sse2
cglobal pred8x8_horizontal_10, 2, 3 cglobal pred8x8_horizontal_10, 2, 3
...@@ -329,7 +335,7 @@ cglobal pred8x8_horizontal_10, 2, 3 ...@@ -329,7 +335,7 @@ cglobal pred8x8_horizontal_10, 2, 3
REP_RET REP_RET
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_predict_8x8_dc(pixel *src, int stride) ; void ff_predict_8x8_dc_10(pixel *src, ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro MOV8 2-3 %macro MOV8 2-3
; sort of a hack, but it works ; sort of a hack, but it works
...@@ -416,7 +422,7 @@ INIT_XMM sse2 ...@@ -416,7 +422,7 @@ INIT_XMM sse2
PRED8x8_DC pshuflw PRED8x8_DC pshuflw
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred8x8_top_dc(pixel *src, int stride) ; void ff_pred8x8_top_dc_10(pixel *src, ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
INIT_XMM sse2 INIT_XMM sse2
cglobal pred8x8_top_dc_10, 2, 4 cglobal pred8x8_top_dc_10, 2, 4
...@@ -443,7 +449,7 @@ cglobal pred8x8_top_dc_10, 2, 4 ...@@ -443,7 +449,7 @@ cglobal pred8x8_top_dc_10, 2, 4
RET RET
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred8x8_plane(pixel *src, int stride) ; void ff_pred8x8_plane_10(pixel *src, ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
INIT_XMM sse2 INIT_XMM sse2
cglobal pred8x8_plane_10, 2, 7, 7 cglobal pred8x8_plane_10, 2, 7, 7
...@@ -506,8 +512,8 @@ cglobal pred8x8_plane_10, 2, 7, 7 ...@@ -506,8 +512,8 @@ cglobal pred8x8_plane_10, 2, 7, 7
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred8x8l_128_dc(pixel *src, int has_topleft, int has_topright, ; void ff_pred8x8l_128_dc_10(pixel *src, int has_topleft, int has_topright,
; int stride) ; ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro PRED8x8L_128_DC 0 %macro PRED8x8L_128_DC 0
cglobal pred8x8l_128_dc_10, 4, 4 cglobal pred8x8l_128_dc_10, 4, 4
...@@ -531,8 +537,8 @@ INIT_XMM sse2 ...@@ -531,8 +537,8 @@ INIT_XMM sse2
PRED8x8L_128_DC PRED8x8L_128_DC
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred8x8l_top_dc(pixel *src, int has_topleft, int has_topright, ; void ff_pred8x8l_top_dc_10(pixel *src, int has_topleft, int has_topright,
; int stride) ; ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro PRED8x8L_TOP_DC 0 %macro PRED8x8L_TOP_DC 0
cglobal pred8x8l_top_dc_10, 4, 4, 6 cglobal pred8x8l_top_dc_10, 4, 4, 6
...@@ -569,7 +575,8 @@ INIT_XMM avx ...@@ -569,7 +575,8 @@ INIT_XMM avx
PRED8x8L_TOP_DC PRED8x8L_TOP_DC
;------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------
; void ff_pred8x8l_dc(pixel *src, int has_topleft, int has_topright, int stride) ; void ff_pred8x8l_dc_10(pixel *src, int has_topleft, int has_topright,
; ptrdiff_t stride)
;------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------
;TODO: see if scalar is faster ;TODO: see if scalar is faster
%macro PRED8x8L_DC 0 %macro PRED8x8L_DC 0
...@@ -626,8 +633,8 @@ INIT_XMM avx ...@@ -626,8 +633,8 @@ INIT_XMM avx
PRED8x8L_DC PRED8x8L_DC
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred8x8l_vertical(pixel *src, int has_topleft, int has_topright, ; void ff_pred8x8l_vertical_10(pixel *src, int has_topleft, int has_topright,
; int stride) ; ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro PRED8x8L_VERTICAL 0 %macro PRED8x8L_VERTICAL 0
cglobal pred8x8l_vertical_10, 4, 4, 6 cglobal pred8x8l_vertical_10, 4, 4, 6
...@@ -660,8 +667,8 @@ INIT_XMM avx ...@@ -660,8 +667,8 @@ INIT_XMM avx
PRED8x8L_VERTICAL PRED8x8L_VERTICAL
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred8x8l_horizontal(uint8_t *src, int has_topleft, int has_topright, ; void ff_pred8x8l_horizontal_10(uint8_t *src, int has_topleft,
; int stride) ; int has_topright, ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro PRED8x8L_HORIZONTAL 0 %macro PRED8x8L_HORIZONTAL 0
cglobal pred8x8l_horizontal_10, 4, 4, 5 cglobal pred8x8l_horizontal_10, 4, 4, 5
...@@ -715,8 +722,8 @@ INIT_XMM avx ...@@ -715,8 +722,8 @@ INIT_XMM avx
PRED8x8L_HORIZONTAL PRED8x8L_HORIZONTAL
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred8x8l_down_left(pixel *src, int has_topleft, int has_topright, ; void ff_pred8x8l_down_left_10(pixel *src, int has_topleft, int has_topright,
; int stride) ; ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro PRED8x8L_DOWN_LEFT 0 %macro PRED8x8L_DOWN_LEFT 0
cglobal pred8x8l_down_left_10, 4, 4, 7 cglobal pred8x8l_down_left_10, 4, 4, 7
...@@ -782,8 +789,8 @@ INIT_XMM avx ...@@ -782,8 +789,8 @@ INIT_XMM avx
PRED8x8L_DOWN_LEFT PRED8x8L_DOWN_LEFT
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred8x8l_down_right(pixel *src, int has_topleft, int has_topright, ; void ff_pred8x8l_down_right_10(pixel *src, int has_topleft,
; int stride) ; int has_topright, ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro PRED8x8L_DOWN_RIGHT 0 %macro PRED8x8L_DOWN_RIGHT 0
; standard forbids this when has_topleft is false ; standard forbids this when has_topleft is false
...@@ -855,8 +862,8 @@ INIT_XMM avx ...@@ -855,8 +862,8 @@ INIT_XMM avx
PRED8x8L_DOWN_RIGHT PRED8x8L_DOWN_RIGHT
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred8x8l_vertical_right(pixel *src, int has_topleft, ; void ff_pred8x8l_vertical_right_10(pixel *src, int has_topleft,
; int has_topright, int stride) ; int has_topright, ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro PRED8x8L_VERTICAL_RIGHT 0 %macro PRED8x8L_VERTICAL_RIGHT 0
; likewise with 8x8l_down_right ; likewise with 8x8l_down_right
...@@ -924,8 +931,8 @@ INIT_XMM avx ...@@ -924,8 +931,8 @@ INIT_XMM avx
PRED8x8L_VERTICAL_RIGHT PRED8x8L_VERTICAL_RIGHT
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred8x8l_horizontal_up(pixel *src, int has_topleft, ; void ff_pred8x8l_horizontal_up_10(pixel *src, int has_topleft,
; int has_topright, int stride) ; int has_topright, ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro PRED8x8L_HORIZONTAL_UP 0 %macro PRED8x8L_HORIZONTAL_UP 0
cglobal pred8x8l_horizontal_up_10, 4, 4, 6 cglobal pred8x8l_horizontal_up_10, 4, 4, 6
...@@ -985,7 +992,7 @@ PRED8x8L_HORIZONTAL_UP ...@@ -985,7 +992,7 @@ PRED8x8L_HORIZONTAL_UP
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred16x16_vertical(pixel *src, int stride) ; void ff_pred16x16_vertical_10(pixel *src, ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro MOV16 3-5 %macro MOV16 3-5
mova [%1+ 0], %2 mova [%1+ 0], %2
...@@ -1021,7 +1028,7 @@ INIT_XMM sse2 ...@@ -1021,7 +1028,7 @@ INIT_XMM sse2
PRED16x16_VERTICAL PRED16x16_VERTICAL
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred16x16_horizontal(pixel *src, int stride) ; void ff_pred16x16_horizontal_10(pixel *src, ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro PRED16x16_HORIZONTAL 0 %macro PRED16x16_HORIZONTAL 0
cglobal pred16x16_horizontal_10, 2, 3 cglobal pred16x16_horizontal_10, 2, 3
...@@ -1045,7 +1052,7 @@ INIT_XMM sse2 ...@@ -1045,7 +1052,7 @@ INIT_XMM sse2
PRED16x16_HORIZONTAL PRED16x16_HORIZONTAL
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred16x16_dc(pixel *src, int stride) ; void ff_pred16x16_dc_10(pixel *src, ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro PRED16x16_DC 0 %macro PRED16x16_DC 0
cglobal pred16x16_dc_10, 2, 6 cglobal pred16x16_dc_10, 2, 6
...@@ -1091,7 +1098,7 @@ INIT_XMM sse2 ...@@ -1091,7 +1098,7 @@ INIT_XMM sse2
PRED16x16_DC PRED16x16_DC
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred16x16_top_dc(pixel *src, int stride) ; void ff_pred16x16_top_dc_10(pixel *src, ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro PRED16x16_TOP_DC 0 %macro PRED16x16_TOP_DC 0
cglobal pred16x16_top_dc_10, 2, 3 cglobal pred16x16_top_dc_10, 2, 3
...@@ -1123,7 +1130,7 @@ INIT_XMM sse2 ...@@ -1123,7 +1130,7 @@ INIT_XMM sse2
PRED16x16_TOP_DC PRED16x16_TOP_DC
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred16x16_left_dc(pixel *src, int stride) ; void ff_pred16x16_left_dc_10(pixel *src, ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro PRED16x16_LEFT_DC 0 %macro PRED16x16_LEFT_DC 0
cglobal pred16x16_left_dc_10, 2, 6 cglobal pred16x16_left_dc_10, 2, 6
...@@ -1160,7 +1167,7 @@ INIT_XMM sse2 ...@@ -1160,7 +1167,7 @@ INIT_XMM sse2
PRED16x16_LEFT_DC PRED16x16_LEFT_DC
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void ff_pred16x16_128_dc(pixel *src, int stride) ; void ff_pred16x16_128_dc_10(pixel *src, ptrdiff_t stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro PRED16x16_128_DC 0 %macro PRED16x16_128_DC 0
cglobal pred16x16_128_dc_10, 2,3 cglobal pred16x16_128_dc_10, 2,3
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment