mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Merge commit '5801f9ed245ca5ebb57b0b5183de7a24aaece133'
* commit '5801f9ed245ca5ebb57b0b5183de7a24aaece133':
h264_intrapred: x86: Update comments left behind in 95c89da36e
Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
commit
4bb4fa28e3
@ -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
|
|||||||
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
|
|||||||
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
|
|||||||
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
|
||||||
@ -306,7 +306,7 @@ cglobal pred16x16_tm_vp8_8, 2, 4, 5, dst, stride, stride3, iteration
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
;-----------------------------------------------------------------------------
|
;-----------------------------------------------------------------------------
|
||||||
; 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
|
||||||
@ -587,7 +587,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
|
||||||
@ -761,7 +761,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
|
||||||
@ -778,7 +778,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
|
||||||
@ -806,7 +806,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
|
||||||
@ -840,7 +840,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
|
||||||
@ -901,7 +901,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
|
||||||
@ -938,7 +938,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
|
||||||
@ -1051,7 +1051,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
|
||||||
@ -1107,7 +1107,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
|
||||||
@ -1211,7 +1211,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
|
||||||
@ -1283,7 +1283,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
|
||||||
@ -1334,7 +1334,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
|
||||||
@ -1535,7 +1535,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
|
||||||
@ -1787,7 +1787,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
|
||||||
@ -2015,7 +2015,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
|
||||||
@ -2105,7 +2105,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
|
||||||
@ -2193,7 +2193,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
|
||||||
@ -2441,7 +2441,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
|
||||||
@ -2472,7 +2473,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
|
||||||
@ -2551,7 +2552,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
|
||||||
@ -2572,7 +2573,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
|
||||||
@ -2599,7 +2600,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
|
||||||
@ -2625,7 +2626,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
|
||||||
@ -2659,7 +2660,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
|
||||||
@ -2695,7 +2697,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
|
||||||
@ -2726,7 +2729,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
|
||||||
|
@ -51,7 +51,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
|
||||||
@ -89,7 +90,8 @@ PRED4x4_DR
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
;------------------------------------------------------------------------------
|
;------------------------------------------------------------------------------
|
||||||
; 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
|
||||||
@ -128,7 +130,8 @@ PRED4x4_VR
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
;-------------------------------------------------------------------------------
|
;-------------------------------------------------------------------------------
|
||||||
; 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
|
||||||
@ -170,7 +173,7 @@ PRED4x4_HD
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
;-----------------------------------------------------------------------------
|
;-----------------------------------------------------------------------------
|
||||||
; void ff_pred4x4_dc(pixel *src, const pixel *topright, int stride)
|
; void ff_pred4x4_dc_10(pixel *src, const pixel *topright, ptrdiff_t stride)
|
||||||
;-----------------------------------------------------------------------------
|
;-----------------------------------------------------------------------------
|
||||||
|
|
||||||
INIT_MMX mmxext
|
INIT_MMX mmxext
|
||||||
@ -195,7 +198,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
|
||||||
@ -225,7 +229,8 @@ PRED4x4_DL
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
;-----------------------------------------------------------------------------
|
;-----------------------------------------------------------------------------
|
||||||
; 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
|
||||||
@ -254,7 +259,8 @@ PRED4x4_VL
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
;-----------------------------------------------------------------------------
|
;-----------------------------------------------------------------------------
|
||||||
; 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
|
||||||
@ -288,7 +294,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
|
||||||
@ -304,7 +310,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
|
||||||
@ -324,7 +330,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
|
||||||
@ -411,7 +417,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
|
||||||
@ -438,7 +444,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
|
||||||
@ -501,8 +507,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
|
||||||
@ -526,8 +532,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
|
||||||
@ -566,7 +572,8 @@ PRED8x8L_TOP_DC
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
;-------------------------------------------------------------------------------
|
;-------------------------------------------------------------------------------
|
||||||
; 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
|
||||||
@ -625,8 +632,8 @@ PRED8x8L_DC
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
;-----------------------------------------------------------------------------
|
;-----------------------------------------------------------------------------
|
||||||
; 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
|
||||||
@ -661,8 +668,8 @@ PRED8x8L_VERTICAL
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
;-----------------------------------------------------------------------------
|
;-----------------------------------------------------------------------------
|
||||||
; 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
|
||||||
@ -718,8 +725,8 @@ PRED8x8L_HORIZONTAL
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
;-----------------------------------------------------------------------------
|
;-----------------------------------------------------------------------------
|
||||||
; 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
|
||||||
@ -787,8 +794,8 @@ PRED8x8L_DOWN_LEFT
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
;-----------------------------------------------------------------------------
|
;-----------------------------------------------------------------------------
|
||||||
; 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
|
||||||
@ -862,8 +869,8 @@ PRED8x8L_DOWN_RIGHT
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
;-----------------------------------------------------------------------------
|
;-----------------------------------------------------------------------------
|
||||||
; 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
|
||||||
@ -933,8 +940,8 @@ PRED8x8L_VERTICAL_RIGHT
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
;-----------------------------------------------------------------------------
|
;-----------------------------------------------------------------------------
|
||||||
; 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
|
||||||
@ -996,7 +1003,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
|
||||||
@ -1032,7 +1039,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
|
||||||
@ -1056,7 +1063,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
|
||||||
@ -1102,7 +1109,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
|
||||||
@ -1134,7 +1141,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
|
||||||
@ -1171,7 +1178,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
|
||||||
|
Loading…
Reference in New Issue
Block a user