mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-28 18:32:22 +00:00
Merge commit '802727b538b484e3f9d1345bfcc4ab24cfea8898'
* commit '802727b538b484e3f9d1345bfcc4ab24cfea8898':
vp8: Update some assembly comments left unchanged in bd66f073fe
Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
commit
4e4dfcac58
@ -192,7 +192,7 @@ function ff_vp8_luma_dc_wht_dc_armv6, export=1
|
||||
bx lr
|
||||
endfunc
|
||||
|
||||
@ void vp8_idct_add(uint8_t *dst, int16_t block[16], int stride)
|
||||
@ void vp8_idct_add(uint8_t *dst, int16_t block[16], ptrdiff_t stride)
|
||||
function ff_vp8_idct_add_armv6, export=1
|
||||
push {r4-r12, lr}
|
||||
sub sp, sp, #32
|
||||
@ -314,7 +314,7 @@ function ff_vp8_idct_add_armv6, export=1
|
||||
pop {r4-r12, pc}
|
||||
endfunc
|
||||
|
||||
@ void vp8_idct_dc_add(uint8_t *dst, int16_t block[16], int stride)
|
||||
@ void vp8_idct_dc_add(uint8_t *dst, int16_t block[16], ptrdiff_t stride)
|
||||
function ff_vp8_idct_dc_add_armv6, export=1
|
||||
push {r4-r6, lr}
|
||||
add r6, r0, r2, lsl #1
|
||||
@ -355,7 +355,7 @@ function ff_vp8_idct_dc_add_armv6, export=1
|
||||
pop {r4-r6, pc}
|
||||
endfunc
|
||||
|
||||
@ void vp8_idct_dc_add4uv(uint8_t *dst, int16_t block[4][16], int stride)
|
||||
@ void vp8_idct_dc_add4uv(uint8_t *dst, int16_t block[4][16], ptrdiff_t stride)
|
||||
function ff_vp8_idct_dc_add4uv_armv6, export=1
|
||||
push {r4, lr}
|
||||
|
||||
@ -371,7 +371,7 @@ function ff_vp8_idct_dc_add4uv_armv6, export=1
|
||||
pop {r4, pc}
|
||||
endfunc
|
||||
|
||||
@ void vp8_idct_dc_add4y(uint8_t *dst, int16_t block[4][16], int stride)
|
||||
@ void vp8_idct_dc_add4y(uint8_t *dst, int16_t block[4][16], ptrdiff_t stride)
|
||||
function ff_vp8_idct_dc_add4y_armv6, export=1
|
||||
push {r4, lr}
|
||||
|
||||
@ -455,7 +455,7 @@ endfunc
|
||||
eor r5, r5, r2 @ *oq0 = u ^ 0x80
|
||||
.endm
|
||||
|
||||
@ void vp8_v_loop_filter16_simple(uint8_t *dst, int stride, int flim)
|
||||
@ void vp8_v_loop_filter16_simple(uint8_t *dst, ptrdiff_t stride, int flim)
|
||||
function ff_vp8_v_loop_filter16_simple_armv6, export=1
|
||||
push {r4-r11, lr}
|
||||
|
||||
@ -866,7 +866,7 @@ function ff_vp8_v_loop_filter8uv_armv6, export=1
|
||||
b vp8_v_loop_filter_armv6
|
||||
endfunc
|
||||
|
||||
@ void vp8_h_loop_filter16_simple(uint8_t *dst, int stride, int flim)
|
||||
@ void vp8_h_loop_filter16_simple(uint8_t *dst, ptrdiff_t stride, int flim)
|
||||
function ff_vp8_h_loop_filter16_simple_armv6, export=1
|
||||
push {r4-r11, lr}
|
||||
orr r12, r2, r2, lsl #16
|
||||
@ -1113,8 +1113,8 @@ endfunc
|
||||
|
||||
@ MC
|
||||
|
||||
@ void put_vp8_pixels16(uint8_t *dst, int dststride, uint8_t *src,
|
||||
@ int srcstride, int h, int mx, int my)
|
||||
@ void put_vp8_pixels16(uint8_t *dst, ptrdiff_t dststride, uint8_t *src,
|
||||
@ ptrdiff_t srcstride, int h, int mx, int my)
|
||||
function ff_put_vp8_pixels16_armv6, export=1
|
||||
push {r4-r11}
|
||||
ldr r12, [sp, #32] @ h
|
||||
@ -1137,8 +1137,8 @@ function ff_put_vp8_pixels16_armv6, export=1
|
||||
bx lr
|
||||
endfunc
|
||||
|
||||
@ void put_vp8_pixels8(uint8_t *dst, int dststride, uint8_t *src,
|
||||
@ int srcstride, int h, int mx, int my)
|
||||
@ void put_vp8_pixels8(uint8_t *dst, ptrdiff_t dststride, uint8_t *src,
|
||||
@ ptrdiff_t srcstride, int h, int mx, int my)
|
||||
function ff_put_vp8_pixels8_armv6, export=1
|
||||
push {r4-r11}
|
||||
ldr r12, [sp, #32] @ h
|
||||
@ -1161,8 +1161,8 @@ function ff_put_vp8_pixels8_armv6, export=1
|
||||
bx lr
|
||||
endfunc
|
||||
|
||||
@ void put_vp8_pixels4(uint8_t *dst, int dststride, uint8_t *src,
|
||||
@ int srcstride, int h, int mx, int my)
|
||||
@ void put_vp8_pixels4(uint8_t *dst, ptrdiff_t dststride, uint8_t *src,
|
||||
@ ptrdiff_t srcstride, int h, int mx, int my)
|
||||
function ff_put_vp8_pixels4_armv6, export=1
|
||||
ldr r12, [sp, #0] @ h
|
||||
push {r4-r6,lr}
|
||||
|
||||
@ -156,8 +156,8 @@ SECTION .text
|
||||
;-------------------------------------------------------------------------------
|
||||
; subpel MC functions:
|
||||
;
|
||||
; void ff_put_vp8_epel<size>_h<htap>v<vtap>_<opt>(uint8_t *dst, int deststride,
|
||||
; uint8_t *src, int srcstride,
|
||||
; void ff_put_vp8_epel<size>_h<htap>v<vtap>_<opt>(uint8_t *dst, ptrdiff_t deststride,
|
||||
; uint8_t *src, ptrdiff_t srcstride,
|
||||
; int height, int mx, int my);
|
||||
;-------------------------------------------------------------------------------
|
||||
|
||||
@ -884,7 +884,7 @@ cglobal put_vp8_pixels16, 5, 5, 2, dst, dststride, src, srcstride, height
|
||||
REP_RET
|
||||
|
||||
;-----------------------------------------------------------------------------
|
||||
; void ff_vp8_idct_dc_add_<opt>(uint8_t *dst, int16_t block[16], int stride);
|
||||
; void ff_vp8_idct_dc_add_<opt>(uint8_t *dst, int16_t block[16], ptrdiff_t stride);
|
||||
;-----------------------------------------------------------------------------
|
||||
|
||||
%macro ADD_DC 4
|
||||
@ -979,7 +979,7 @@ INIT_XMM sse4
|
||||
VP8_IDCT_DC_ADD
|
||||
|
||||
;-----------------------------------------------------------------------------
|
||||
; void ff_vp8_idct_dc_add4y_<opt>(uint8_t *dst, int16_t block[4][16], int stride);
|
||||
; void ff_vp8_idct_dc_add4y_<opt>(uint8_t *dst, int16_t block[4][16], ptrdiff_t stride);
|
||||
;-----------------------------------------------------------------------------
|
||||
|
||||
%if ARCH_X86_32
|
||||
@ -1052,7 +1052,7 @@ cglobal vp8_idct_dc_add4y, 3, 3, 6, dst, block, stride
|
||||
RET
|
||||
|
||||
;-----------------------------------------------------------------------------
|
||||
; void ff_vp8_idct_dc_add4uv_<opt>(uint8_t *dst, int16_t block[4][16], int stride);
|
||||
; void ff_vp8_idct_dc_add4uv_<opt>(uint8_t *dst, int16_t block[4][16], ptrdiff_t stride);
|
||||
;-----------------------------------------------------------------------------
|
||||
|
||||
INIT_MMX mmx
|
||||
@ -1094,7 +1094,7 @@ cglobal vp8_idct_dc_add4uv, 3, 3, 0, dst, block, stride
|
||||
RET
|
||||
|
||||
;-----------------------------------------------------------------------------
|
||||
; void ff_vp8_idct_add_<opt>(uint8_t *dst, int16_t block[16], int stride);
|
||||
; void ff_vp8_idct_add_<opt>(uint8_t *dst, int16_t block[16], ptrdiff_t stride);
|
||||
;-----------------------------------------------------------------------------
|
||||
|
||||
; calculate %1=mul_35468(%1)-mul_20091(%2); %2=mul_20091(%1)+mul_35468(%2)
|
||||
|
||||
@ -43,7 +43,7 @@ cextern pb_80
|
||||
SECTION .text
|
||||
|
||||
;-----------------------------------------------------------------------------
|
||||
; void ff_vp8_h/v_loop_filter_simple_<opt>(uint8_t *dst, int stride, int flim);
|
||||
; void ff_vp8_h/v_loop_filter_simple_<opt>(uint8_t *dst, ptrdiff_t stride, int flim);
|
||||
;-----------------------------------------------------------------------------
|
||||
|
||||
; macro called with 7 mm register indexes as argument, and 4 regular registers
|
||||
@ -429,7 +429,7 @@ INIT_XMM sse4
|
||||
SIMPLE_LOOPFILTER h, 5
|
||||
|
||||
;-----------------------------------------------------------------------------
|
||||
; void ff_vp8_h/v_loop_filter<size>_inner_<opt>(uint8_t *dst, [uint8_t *v,] int stride,
|
||||
; void ff_vp8_h/v_loop_filter<size>_inner_<opt>(uint8_t *dst, [uint8_t *v,] ptrdiff_t stride,
|
||||
; int flimE, int flimI, int hev_thr);
|
||||
;-----------------------------------------------------------------------------
|
||||
|
||||
@ -921,7 +921,7 @@ INNER_LOOPFILTER v, 8
|
||||
INNER_LOOPFILTER h, 8
|
||||
|
||||
;-----------------------------------------------------------------------------
|
||||
; void ff_vp8_h/v_loop_filter<size>_mbedge_<opt>(uint8_t *dst, [uint8_t *v,] int stride,
|
||||
; void ff_vp8_h/v_loop_filter<size>_mbedge_<opt>(uint8_t *dst, [uint8_t *v,] ptrdiff_t stride,
|
||||
; int flimE, int flimI, int hev_thr);
|
||||
;-----------------------------------------------------------------------------
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user