diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-27 00:19:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-27 00:20:48 +0200 |
| commit | 706f81a2c27552fdc9d216834eedd36f5804c080 (patch) | |
| tree | 46931fd1a7d52b2d6c815adc2a24dec1429893b3 /libavcodec/x86/hevc_deblock.asm | |
| parent | 226b290f9f73d691ef1423d5c105f0bb0577d588 (diff) | |
| parent | 1a880b2fb8456ce68eefe5902bac95fea1e6a72d (diff) | |
Merge commit '1a880b2fb8456ce68eefe5902bac95fea1e6a72d'
* commit '1a880b2fb8456ce68eefe5902bac95fea1e6a72d':
hevc: SSE2 and SSSE3 loop filters
Conflicts:
libavcodec/hevcdsp.c
libavcodec/hevcdsp.h
libavcodec/x86/Makefile
libavcodec/x86/hevc_deblock.asm
libavcodec/x86/hevcdsp_init.c
See: de7b89fd43f850d77cf24ad6ae50185dfe391e91 and several others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/hevc_deblock.asm')
| -rw-r--r-- | libavcodec/x86/hevc_deblock.asm | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libavcodec/x86/hevc_deblock.asm b/libavcodec/x86/hevc_deblock.asm index 7874e3318f..f7cd031493 100644 --- a/libavcodec/x86/hevc_deblock.asm +++ b/libavcodec/x86/hevc_deblock.asm @@ -660,7 +660,8 @@ ALIGN 16 INIT_XMM sse2 ;----------------------------------------------------------------------------- -; void ff_hevc_v_loop_filter_chroma(uint8_t *_pix, ptrdiff_t _stride, int *_tc, uint8_t *_no_p, uint8_t *_no_q) +; void ff_hevc_v_loop_filter_chroma(uint8_t *_pix, ptrdiff_t _stride, int *_tc, +; uint8_t *_no_p, uint8_t *_no_q); ;----------------------------------------------------------------------------- cglobal hevc_v_loop_filter_chroma_8, 3, 5, 7, pix, stride, tc, pix0, r3stride sub pixq, 2 @@ -693,7 +694,8 @@ cglobal hevc_v_loop_filter_chroma_12, 3, 5, 7, pix, stride, tc, pix0, r3stride RET ;----------------------------------------------------------------------------- -; void ff_hevc_h_loop_filter_chroma(uint8_t *_pix, ptrdiff_t _stride, int *_tc, uint8_t *_no_p, uint8_t *_no_q +; void ff_hevc_h_loop_filter_chroma(uint8_t *_pix, ptrdiff_t _stride, int *_tc, +; uint8_t *_no_p, uint8_t *_no_q); ;----------------------------------------------------------------------------- cglobal hevc_h_loop_filter_chroma_8, 3, 4, 7, pix, stride, tc, pix0 mov pix0q, pixq @@ -749,7 +751,8 @@ cglobal hevc_h_loop_filter_chroma_12, 3, 4, 7, pix, stride, tc, pix0 %if ARCH_X86_64 %macro LOOP_FILTER_LUMA 0 ;----------------------------------------------------------------------------- -; 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); +; 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); ;----------------------------------------------------------------------------- cglobal hevc_v_loop_filter_luma_8, 4, 15, 16, pix, stride, beta, tc sub r0, 4 @@ -788,7 +791,8 @@ cglobal hevc_v_loop_filter_luma_12, 4, 15, 16, pix, stride, beta, tc RET ;----------------------------------------------------------------------------- -; 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); +; 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); ;----------------------------------------------------------------------------- cglobal hevc_h_loop_filter_luma_8, 4, 15, 16, pix, stride, beta, tc, count, pix0, src3stride lea src3strideq, [3 * strideq] |