2967bf355e
This commit bring all up-to-date changes from master that are applicable to nextgenv2. Due to the remove VP10 code in master, we had to cherry pick the following commits to get those changes: Add default flags for arm64/armv8 builds Allows building simple targets with sane default flags. For example, using the Android arm64 toolchain from the NDK: https://developer.android.com/ndk/guides/standalone_toolchain.html ./build/tools/make-standalone-toolchain.sh --arch=arm64 \ --platform=android-24 --install-dir=/tmp/arm64 CROSS=/tmp/arm64/bin/aarch64-linux-android- \ ~/libvpx/configure --target=arm64-linux-gcc --disable-multithread BUG=webm:1143 vpx_lpf_horizontal_4_sse2: Remove dead load. Change-Id: I51026c52baa1f0881fcd5b68e1fdf08a2dc0916e Fail early when android target does not include --sdk-path Change-Id: I07e7e63476a2e32e3aae123abdee8b7bbbdc6a8c configure: clean up var style and set_all usage Use quotes whenever possible and {} always for variables. Replace multiple set_all calls with *able_feature(). Conflicts: build/make/configure.sh vp9-svc: Remove some unneeded code/comment. datarate_test,DatarateTestLarge: normalize bits type quiets a msvc warning: conversion from 'const int64_t' to 'size_t', possible loss of data mips added p6600 cpu support Removed -funroll-loops psnr.c: use int64_t for sum of differences Since the values can be negative. *.asm: normalize label format add a trailing ':', though it's optional with the tools we support, it's more common to use it to mark a label. this also quiets the orphan-labels warning with nasm/yasm. BUG=b/29583530 Prevent negative variance Due to rounding, hbd variance may become negative. This commit put in check and clamp of negative values to 0. configure: remove old visual studio support (<2010) BUG=b/29583530 Conflicts: configure configure: restore vs_version variable inadvertently lost in the final patchset of: 078dff7 configure: remove old visual studio support (<2010) this prevents an empty CONFIG_VS_VERSION and avoids make failure Require x86inc.asm Force enable x86inc.asm when building for x86. Previously there were compatibility issues so a flag was added to simplify disabling this code. The known issues have been resolved and x86inc.asm is the preferred abstraction layer (over x86_abi_support.asm). BUG=b:29583530 convolve_test: fix byte offsets in hbd build CONVERT_TO_BYTEPTR(x) was corrected in: 003a9d2 Port metric computation changes from nextgenv2 to use the more common (x) within the expansion. offsets should occur after converting the pointer to the desired type. + factorized some common expressions Conflicts: test/convolve_test.cc vpx_dsp: remove x86inc.asm distinction BUG=b:29583530 Conflicts: vpx_dsp/vpx_dsp.mk vpx_dsp/vpx_dsp_rtcd_defs.pl vpx_dsp/x86/highbd_variance_sse2.c vpx_dsp/x86/variance_sse2.c test: remove x86inc.asm distinction BUG=b:29583530 Conflicts: test/vp9_subtract_test.cc configure: remove x86inc.asm distinction BUG=b:29583530 Change-Id: I59a1192142e89a6a36b906f65a491a734e603617 Update vpx subpixel 1d filter ssse3 asm Speed test shows the new vertical filters have degradation on Celeron Chromebook. Added "X86_SUBPIX_VFILTER_PREFER_SLOW_CELERON" to control the vertical filters activated code. Now just simply active the code without degradation on Celeron. Later there should be 2 set of vertical filters ssse3 functions, and let jump table to choose based on CPU type. improve vpx_filter_block1d* based on replace paddsw+psrlw to pmulhrsw Make set_reference control API work in VP9 Moved the API patch from NextGenv2. An example was included. To try it, for example, run the following command: $ examples/vpx_cx_set_ref vp9 352 288 in.yuv out.ivf 4 30 Conflicts: examples.mk examples/vpx_cx_set_ref.c test/cx_set_ref.sh vp9/decoder/vp9_decoder.c deblock filter : moved from vp8 code branch The deblocking filters used in vp8 have been moved to vpx_dsp for use by both vp8 and vp9. vpx_thread.[hc]: update webp source reference + drop the blob hash, the updated reference will be updated in the commit message BUG=b/29583578 vpx_thread: use native windows cond var if available BUG=b/29583578 original webp change: commit 110ad5835ecd66995d0e7f66dca1b90dea595f5a Author: James Zern <jzern@google.com> Date: Mon Nov 23 19:49:58 2015 -0800 thread: use native windows cond var if available Vista / Server 2008 and up. no speed difference observed. 100644 blob 4fc372b7bc6980a9ed3618c8cce5b67ed7b0f412 src/utils/thread.c 100644 blob 840831185502d42a3246e4b7ff870121c8064791 src/utils/thread.h vpx_thread: use InitializeCriticalSectionEx if available BUG=b/29583578 original webp change: commit 63fadc9ffacc77d4617526a50c696d21d558a70b Author: James Zern <jzern@google.com> Date: Mon Nov 23 20:38:46 2015 -0800 thread: use InitializeCriticalSectionEx if available Windows Vista / Server 2008 and up 100644 blob f84207d89b3a6bb98bfe8f3fa55cad72dfd061ff src/utils/thread.c 100644 blob 840831185502d42a3246e4b7ff870121c8064791 src/utils/thread.h vpx_thread: use WaitForSingleObjectEx if available BUG=b/29583578 original webp change: commit 0fd0e12bfe83f16ce4f1c038b251ccbc13c62ac2 Author: James Zern <jzern@google.com> Date: Mon Nov 23 20:40:26 2015 -0800 thread: use WaitForSingleObjectEx if available Windows XP and up 100644 blob d58f74e5523dbc985fc531cf5f0833f1e9157cf0 src/utils/thread.c 100644 blob 840831185502d42a3246e4b7ff870121c8064791 src/utils/thread.h vpx_thread: use CreateThread for windows phone BUG=b/29583578 original webp change: commit d2afe974f9d751de144ef09d31255aea13b442c0 Author: James Zern <jzern@google.com> Date: Mon Nov 23 20:41:26 2015 -0800 thread: use CreateThread for windows phone _beginthreadex is unavailable for winrt/uwp Change-Id: Ie7412a568278ac67f0047f1764e2521193d74d4d 100644 blob 93f7622797f05f6acc1126e8296c481d276e4047 src/utils/thread.c 100644 blob 840831185502d42a3246e4b7ff870121c8064791 src/utils/thread.h vp9_postproc.c missing extern. BUG=webm:1256 deblock: missing const on extern const. postproc - move filling of noise buffer to vpx_dsp. Fix encoder crashes for odd size input clean-up vp9_intrapred_test remove tuple and overkill VP9IntraPredBase class. postproc: noise style fixes. gtest-all.cc: quiet an unused variable warning under windows / mingw builds vp9_intrapred_test: follow-up cleanup address few comments from ce050afaf3e288895c3bee4160336e2d2133b6ea Change-Id: I3eece7efa9335f4210303993ef6c1857ad5c29c8
419 lines
9.1 KiB
NASM
419 lines
9.1 KiB
NASM
;
|
|
; Copyright (c) 2014 The WebM project authors. All Rights Reserved.
|
|
;
|
|
; Use of this source code is governed by a BSD-style license
|
|
; that can be found in the LICENSE file in the root of the source
|
|
; tree. An additional intellectual property rights grant can be found
|
|
; in the file PATENTS. All contributing project authors may
|
|
; be found in the AUTHORS file in the root of the source tree.
|
|
;
|
|
|
|
%include "vpx_ports/x86_abi_support.asm"
|
|
|
|
%macro GET_PARAM_4 0
|
|
mov rdx, arg(5) ;filter ptr
|
|
mov rsi, arg(0) ;src_ptr
|
|
mov rdi, arg(2) ;output_ptr
|
|
mov ecx, 0x01000100
|
|
|
|
movdqa xmm3, [rdx] ;load filters
|
|
psrldq xmm3, 6
|
|
packsswb xmm3, xmm3
|
|
pshuflw xmm3, xmm3, 0b ;k3_k4
|
|
|
|
movd xmm2, ecx ;rounding_shift
|
|
pshufd xmm2, xmm2, 0
|
|
|
|
movsxd rax, DWORD PTR arg(1) ;pixels_per_line
|
|
movsxd rdx, DWORD PTR arg(3) ;out_pitch
|
|
movsxd rcx, DWORD PTR arg(4) ;output_height
|
|
%endm
|
|
|
|
%macro APPLY_FILTER_4 1
|
|
punpcklbw xmm0, xmm1
|
|
pmaddubsw xmm0, xmm3
|
|
|
|
pmulhrsw xmm0, xmm2 ;rounding(+64)+shift(>>7)
|
|
packuswb xmm0, xmm0 ;pack to byte
|
|
|
|
%if %1
|
|
movd xmm1, [rdi]
|
|
pavgb xmm0, xmm1
|
|
%endif
|
|
movd [rdi], xmm0
|
|
lea rsi, [rsi + rax]
|
|
lea rdi, [rdi + rdx]
|
|
dec rcx
|
|
%endm
|
|
|
|
%macro GET_PARAM 0
|
|
mov rdx, arg(5) ;filter ptr
|
|
mov rsi, arg(0) ;src_ptr
|
|
mov rdi, arg(2) ;output_ptr
|
|
mov ecx, 0x01000100
|
|
|
|
movdqa xmm7, [rdx] ;load filters
|
|
psrldq xmm7, 6
|
|
packsswb xmm7, xmm7
|
|
pshuflw xmm7, xmm7, 0b ;k3_k4
|
|
punpcklwd xmm7, xmm7
|
|
|
|
movd xmm6, ecx ;rounding_shift
|
|
pshufd xmm6, xmm6, 0
|
|
|
|
movsxd rax, DWORD PTR arg(1) ;pixels_per_line
|
|
movsxd rdx, DWORD PTR arg(3) ;out_pitch
|
|
movsxd rcx, DWORD PTR arg(4) ;output_height
|
|
%endm
|
|
|
|
%macro APPLY_FILTER_8 1
|
|
punpcklbw xmm0, xmm1
|
|
pmaddubsw xmm0, xmm7
|
|
|
|
pmulhrsw xmm0, xmm6 ;rounding(+64)+shift(>>7)
|
|
packuswb xmm0, xmm0 ;pack back to byte
|
|
|
|
%if %1
|
|
movq xmm1, [rdi]
|
|
pavgb xmm0, xmm1
|
|
%endif
|
|
movq [rdi], xmm0 ;store the result
|
|
|
|
lea rsi, [rsi + rax]
|
|
lea rdi, [rdi + rdx]
|
|
dec rcx
|
|
%endm
|
|
|
|
%macro APPLY_FILTER_16 1
|
|
punpcklbw xmm0, xmm1
|
|
punpckhbw xmm2, xmm1
|
|
pmaddubsw xmm0, xmm7
|
|
pmaddubsw xmm2, xmm7
|
|
|
|
pmulhrsw xmm0, xmm6 ;rounding(+64)+shift(>>7)
|
|
pmulhrsw xmm2, xmm6
|
|
packuswb xmm0, xmm2 ;pack back to byte
|
|
|
|
%if %1
|
|
movdqu xmm1, [rdi]
|
|
pavgb xmm0, xmm1
|
|
%endif
|
|
movdqu [rdi], xmm0 ;store the result
|
|
|
|
lea rsi, [rsi + rax]
|
|
lea rdi, [rdi + rdx]
|
|
dec rcx
|
|
%endm
|
|
|
|
global sym(vpx_filter_block1d4_v2_ssse3) PRIVATE
|
|
sym(vpx_filter_block1d4_v2_ssse3):
|
|
push rbp
|
|
mov rbp, rsp
|
|
SHADOW_ARGS_TO_STACK 6
|
|
push rsi
|
|
push rdi
|
|
; end prolog
|
|
|
|
GET_PARAM_4
|
|
.loop:
|
|
movd xmm0, [rsi] ;load src
|
|
movd xmm1, [rsi + rax]
|
|
|
|
APPLY_FILTER_4 0
|
|
jnz .loop
|
|
|
|
; begin epilog
|
|
pop rdi
|
|
pop rsi
|
|
UNSHADOW_ARGS
|
|
pop rbp
|
|
ret
|
|
|
|
global sym(vpx_filter_block1d8_v2_ssse3) PRIVATE
|
|
sym(vpx_filter_block1d8_v2_ssse3):
|
|
push rbp
|
|
mov rbp, rsp
|
|
SHADOW_ARGS_TO_STACK 6
|
|
SAVE_XMM 7
|
|
push rsi
|
|
push rdi
|
|
; end prolog
|
|
|
|
GET_PARAM
|
|
.loop:
|
|
movq xmm0, [rsi] ;0
|
|
movq xmm1, [rsi + rax] ;1
|
|
|
|
APPLY_FILTER_8 0
|
|
jnz .loop
|
|
|
|
; begin epilog
|
|
pop rdi
|
|
pop rsi
|
|
RESTORE_XMM
|
|
UNSHADOW_ARGS
|
|
pop rbp
|
|
ret
|
|
|
|
global sym(vpx_filter_block1d16_v2_ssse3) PRIVATE
|
|
sym(vpx_filter_block1d16_v2_ssse3):
|
|
push rbp
|
|
mov rbp, rsp
|
|
SHADOW_ARGS_TO_STACK 6
|
|
SAVE_XMM 7
|
|
push rsi
|
|
push rdi
|
|
; end prolog
|
|
|
|
GET_PARAM
|
|
.loop:
|
|
movdqu xmm0, [rsi] ;0
|
|
movdqu xmm1, [rsi + rax] ;1
|
|
movdqa xmm2, xmm0
|
|
|
|
APPLY_FILTER_16 0
|
|
jnz .loop
|
|
|
|
; begin epilog
|
|
pop rdi
|
|
pop rsi
|
|
RESTORE_XMM
|
|
UNSHADOW_ARGS
|
|
pop rbp
|
|
ret
|
|
|
|
global sym(vpx_filter_block1d4_v2_avg_ssse3) PRIVATE
|
|
sym(vpx_filter_block1d4_v2_avg_ssse3):
|
|
push rbp
|
|
mov rbp, rsp
|
|
SHADOW_ARGS_TO_STACK 6
|
|
push rsi
|
|
push rdi
|
|
; end prolog
|
|
|
|
GET_PARAM_4
|
|
.loop:
|
|
movd xmm0, [rsi] ;load src
|
|
movd xmm1, [rsi + rax]
|
|
|
|
APPLY_FILTER_4 1
|
|
jnz .loop
|
|
|
|
; begin epilog
|
|
pop rdi
|
|
pop rsi
|
|
UNSHADOW_ARGS
|
|
pop rbp
|
|
ret
|
|
|
|
global sym(vpx_filter_block1d8_v2_avg_ssse3) PRIVATE
|
|
sym(vpx_filter_block1d8_v2_avg_ssse3):
|
|
push rbp
|
|
mov rbp, rsp
|
|
SHADOW_ARGS_TO_STACK 6
|
|
SAVE_XMM 7
|
|
push rsi
|
|
push rdi
|
|
; end prolog
|
|
|
|
GET_PARAM
|
|
.loop:
|
|
movq xmm0, [rsi] ;0
|
|
movq xmm1, [rsi + rax] ;1
|
|
|
|
APPLY_FILTER_8 1
|
|
jnz .loop
|
|
|
|
; begin epilog
|
|
pop rdi
|
|
pop rsi
|
|
RESTORE_XMM
|
|
UNSHADOW_ARGS
|
|
pop rbp
|
|
ret
|
|
|
|
global sym(vpx_filter_block1d16_v2_avg_ssse3) PRIVATE
|
|
sym(vpx_filter_block1d16_v2_avg_ssse3):
|
|
push rbp
|
|
mov rbp, rsp
|
|
SHADOW_ARGS_TO_STACK 6
|
|
SAVE_XMM 7
|
|
push rsi
|
|
push rdi
|
|
; end prolog
|
|
|
|
GET_PARAM
|
|
.loop:
|
|
movdqu xmm0, [rsi] ;0
|
|
movdqu xmm1, [rsi + rax] ;1
|
|
movdqa xmm2, xmm0
|
|
|
|
APPLY_FILTER_16 1
|
|
jnz .loop
|
|
|
|
; begin epilog
|
|
pop rdi
|
|
pop rsi
|
|
RESTORE_XMM
|
|
UNSHADOW_ARGS
|
|
pop rbp
|
|
ret
|
|
|
|
global sym(vpx_filter_block1d4_h2_ssse3) PRIVATE
|
|
sym(vpx_filter_block1d4_h2_ssse3):
|
|
push rbp
|
|
mov rbp, rsp
|
|
SHADOW_ARGS_TO_STACK 6
|
|
push rsi
|
|
push rdi
|
|
; end prolog
|
|
|
|
GET_PARAM_4
|
|
.loop:
|
|
movdqu xmm0, [rsi] ;load src
|
|
movdqa xmm1, xmm0
|
|
psrldq xmm1, 1
|
|
|
|
APPLY_FILTER_4 0
|
|
jnz .loop
|
|
|
|
; begin epilog
|
|
pop rdi
|
|
pop rsi
|
|
UNSHADOW_ARGS
|
|
pop rbp
|
|
ret
|
|
|
|
global sym(vpx_filter_block1d8_h2_ssse3) PRIVATE
|
|
sym(vpx_filter_block1d8_h2_ssse3):
|
|
push rbp
|
|
mov rbp, rsp
|
|
SHADOW_ARGS_TO_STACK 6
|
|
SAVE_XMM 7
|
|
push rsi
|
|
push rdi
|
|
; end prolog
|
|
|
|
GET_PARAM
|
|
.loop:
|
|
movdqu xmm0, [rsi] ;load src
|
|
movdqa xmm1, xmm0
|
|
psrldq xmm1, 1
|
|
|
|
APPLY_FILTER_8 0
|
|
jnz .loop
|
|
|
|
; begin epilog
|
|
pop rdi
|
|
pop rsi
|
|
RESTORE_XMM
|
|
UNSHADOW_ARGS
|
|
pop rbp
|
|
ret
|
|
|
|
global sym(vpx_filter_block1d16_h2_ssse3) PRIVATE
|
|
sym(vpx_filter_block1d16_h2_ssse3):
|
|
push rbp
|
|
mov rbp, rsp
|
|
SHADOW_ARGS_TO_STACK 6
|
|
SAVE_XMM 7
|
|
push rsi
|
|
push rdi
|
|
; end prolog
|
|
|
|
GET_PARAM
|
|
.loop:
|
|
movdqu xmm0, [rsi] ;load src
|
|
movdqu xmm1, [rsi + 1]
|
|
movdqa xmm2, xmm0
|
|
|
|
APPLY_FILTER_16 0
|
|
jnz .loop
|
|
|
|
; begin epilog
|
|
pop rdi
|
|
pop rsi
|
|
RESTORE_XMM
|
|
UNSHADOW_ARGS
|
|
pop rbp
|
|
ret
|
|
|
|
global sym(vpx_filter_block1d4_h2_avg_ssse3) PRIVATE
|
|
sym(vpx_filter_block1d4_h2_avg_ssse3):
|
|
push rbp
|
|
mov rbp, rsp
|
|
SHADOW_ARGS_TO_STACK 6
|
|
push rsi
|
|
push rdi
|
|
; end prolog
|
|
|
|
GET_PARAM_4
|
|
.loop:
|
|
movdqu xmm0, [rsi] ;load src
|
|
movdqa xmm1, xmm0
|
|
psrldq xmm1, 1
|
|
|
|
APPLY_FILTER_4 1
|
|
jnz .loop
|
|
|
|
; begin epilog
|
|
pop rdi
|
|
pop rsi
|
|
UNSHADOW_ARGS
|
|
pop rbp
|
|
ret
|
|
|
|
global sym(vpx_filter_block1d8_h2_avg_ssse3) PRIVATE
|
|
sym(vpx_filter_block1d8_h2_avg_ssse3):
|
|
push rbp
|
|
mov rbp, rsp
|
|
SHADOW_ARGS_TO_STACK 6
|
|
SAVE_XMM 7
|
|
push rsi
|
|
push rdi
|
|
; end prolog
|
|
|
|
GET_PARAM
|
|
.loop:
|
|
movdqu xmm0, [rsi] ;load src
|
|
movdqa xmm1, xmm0
|
|
psrldq xmm1, 1
|
|
|
|
APPLY_FILTER_8 1
|
|
jnz .loop
|
|
|
|
; begin epilog
|
|
pop rdi
|
|
pop rsi
|
|
RESTORE_XMM
|
|
UNSHADOW_ARGS
|
|
pop rbp
|
|
ret
|
|
|
|
global sym(vpx_filter_block1d16_h2_avg_ssse3) PRIVATE
|
|
sym(vpx_filter_block1d16_h2_avg_ssse3):
|
|
push rbp
|
|
mov rbp, rsp
|
|
SHADOW_ARGS_TO_STACK 6
|
|
SAVE_XMM 7
|
|
push rsi
|
|
push rdi
|
|
; end prolog
|
|
|
|
GET_PARAM
|
|
.loop:
|
|
movdqu xmm0, [rsi] ;load src
|
|
movdqu xmm1, [rsi + 1]
|
|
movdqa xmm2, xmm0
|
|
|
|
APPLY_FILTER_16 1
|
|
jnz .loop
|
|
|
|
; begin epilog
|
|
pop rdi
|
|
pop rsi
|
|
RESTORE_XMM
|
|
UNSHADOW_ARGS
|
|
pop rbp
|
|
ret
|