From 010732b73a0869d222cb281431a9a4aae89355e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Sat, 19 Apr 2014 17:23:46 +0200 Subject: [PATCH] vp9/x86: simplify FILTER_INIT. In the 2 FILTER_INIT usages, the source is already preloaded so that extra complexity taken from FILTER_UPDATE is not necessary. Also add forgotten "mask" argument in FILTER_{INIT,UPDATE} comments. --- libavcodec/x86/vp9lpf.asm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavcodec/x86/vp9lpf.asm b/libavcodec/x86/vp9lpf.asm index 1309ee4f23..5f4e67cf18 100644 --- a/libavcodec/x86/vp9lpf.asm +++ b/libavcodec/x86/vp9lpf.asm @@ -93,19 +93,15 @@ SECTION .text psraw %1, %8 %endmacro -%macro FILTER_INIT 7-8 ; tmp1, tmp2, cacheL, cacheH, dstp, filterid, [source] +%macro FILTER_INIT 8 ; tmp1, tmp2, cacheL, cacheH, dstp, filterid, mask, source FILTER%6_INIT %1, l, %3 FILTER%6_INIT %2, h, %4 packuswb %1, %2 -%if %0 == 8 MASK_APPLY %1, %8, %7, %2 -%else - MASK_APPLY %1, %5, %7, %2 -%endif mova %5, %1 %endmacro -%macro FILTER_UPDATE 11-14 ; tmp1, tmp2, cacheL, cacheH, dstp, -, -, +, +, rshift, [source], [preload reg + value] +%macro FILTER_UPDATE 11-14 ; tmp1, tmp2, cacheL, cacheH, dstp, -, -, +, +, rshift, mask, [source], [preload reg + value] %if %0 == 13 ; no source + preload mova %12, %13 %elif %0 == 14 ; source + preload