From patchwork Thu Jul 9 14:53:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 20914 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 8457644A4D8 for ; Thu, 9 Jul 2020 17:53:59 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6DEF568B5EE; Thu, 9 Jul 2020 17:53:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f181.google.com (mail-qt1-f181.google.com [209.85.160.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 83F3468B5C3 for ; Thu, 9 Jul 2020 17:53:53 +0300 (EEST) Received: by mail-qt1-f181.google.com with SMTP id u12so1820642qth.12 for ; Thu, 09 Jul 2020 07:53:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Rllx8fHKZT4Mx/5fBSyucTKmi+Feu7z2i4nIldAfjDM=; b=MTHt3vHiYFikG56a//pFtJXYzRYN2cR8Gz59H3yn6pL6WfseyWPKxvBiO1Dtu5fhvk pWwOkQAqEp8fP/h0GiGvHaiwZ5iSx4y24zeJP2NzN6ic8l0q6k9mgjTV2SgTyFloZwie GPD+A/KJsVhqL5RB7oW3l+Ebt60p3aRVz/Ug96cLzXp7fx1MQ/39yk+Z7IwggEtPGBse aSWRyA6ZRqIYsx2GYdR/AlMZjehgBvYJ3bNU3QX5qZkyebaYOMl5J7QQm3ux9CSNKBM/ DpYRLddwCGcD8dC6pRJPcO3eJlYZFH0AwLUXQlsxW9VV847iouUPfJk61XcvJDc5mQzT /Daw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Rllx8fHKZT4Mx/5fBSyucTKmi+Feu7z2i4nIldAfjDM=; b=kRgk1HJfehTO6KfhGfC7Qo3WI/HlTEmixL58A9PEiIMvVdFsbCYysx6xpVA499sWGs nNf9bdcNcUXt7njmuPAkKEfA2+yZ10Lma4UiQtxOnX680BKsMYWQnz9iTj7StHfG9uHN WelV4mxeOIfOR/POyVfXduyku3tb4SF04+pZ1Jvx3yNBUGWKqkfo5DSePxdyq/fdy3EO WwV0244vFkz5Ha+Z7Q8NsySxGbECAB0PJLuX0In+vREWds063K9g3HrEUfdAMIQRl9hY 1ByM6/3Og8YU4SSNeOtpQUR33hKbiAbaFkwrylQc8sJ4nKaytKrArWdDuqA6yt2y+FCJ erbQ== X-Gm-Message-State: AOAM5330cN20CmSr7tO1EG/j+bn9RnHsV98NZRue4C51b/JWbBPe4Wo1 AHeB2UPyVLt0dNgptCckkKZZd9vL X-Google-Smtp-Source: ABdhPJzGfhUEzkN1rl7OPJxQ+aHP3zQrDdRY8ixlFgdSjvIipxTJ3dG/vURpQ7n/frUeb8zQ7l7xXQ== X-Received: by 2002:ac8:409c:: with SMTP id p28mr41511404qtl.103.1594306431398; Thu, 09 Jul 2020 07:53:51 -0700 (PDT) Received: from localhost.localdomain ([191.84.244.216]) by smtp.gmail.com with ESMTPSA id x13sm3697927qkx.10.2020.07.09.07.53.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2020 07:53:50 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Jul 2020 11:53:25 -0300 Message-Id: <20200709145325.7812-3-jamrial@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200709145325.7812-1-jamrial@gmail.com> References: <20200709145325.7812-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] x86/vf_blend: fix warnings about trailing empty parameters X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- libavfilter/x86/vf_blend.asm | 90 ++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/libavfilter/x86/vf_blend.asm b/libavfilter/x86/vf_blend.asm index 251bbb5a12..77a6ed04c7 100644 --- a/libavfilter/x86/vf_blend.asm +++ b/libavfilter/x86/vf_blend.asm @@ -38,7 +38,7 @@ pb_255: times 16 db 255 SECTION .text -%macro BLEND_INIT 2-3 +%macro BLEND_INIT 2 %if ARCH_X86_64 cglobal blend_%1, 6, 9, %2, top, top_linesize, bottom, bottom_linesize, dst, dst_linesize, width, end, x mov widthd, dword widthm @@ -66,8 +66,8 @@ cglobal blend_%1, 5, 7, %2, top, top_linesize, bottom, bottom_linesize, dst, end REP_RET %endmacro -%macro BLEND_SIMPLE 2-3 -BLEND_INIT %1, 2, %3 +%macro BLEND_SIMPLE 2 +BLEND_INIT %1, 2 .nextrow: mov xq, widthq @@ -82,8 +82,8 @@ BLEND_END %endmacro ; %1 name , %2 src (b or w), %3 inter (w or d), %4 (1 if 16bit, not set if 8 bit) -%macro GRAINEXTRACT 3-4 -BLEND_INIT %1, 6, %4 +%macro GRAINEXTRACT 3 +BLEND_INIT %1, 6 pxor m4, m4 %if %0 == 4 ; 16 bit VBROADCASTI128 m5, [pd_32768] @@ -182,8 +182,8 @@ BLEND_END %endmacro ;%1 name, %2 (b or w), %3 (set if 16 bit) -%macro AVERAGE 2-3 -BLEND_INIT %1, 3, %3 +%macro AVERAGE 2 +BLEND_INIT %1, 3 pcmpeqb m2, m2 .nextrow: @@ -203,8 +203,8 @@ BLEND_END %endmacro ; %1 name , %2 src (b or w), %3 inter (w or d), %4 (1 if 16bit, not set if 8 bit) -%macro GRAINMERGE 3-4 -BLEND_INIT %1, 6, %4 +%macro GRAINMERGE 3 +BLEND_INIT %1, 6 pxor m4, m4 %if %0 == 4 ; 16 bit VBROADCASTI128 m5, [pd_32768] @@ -288,9 +288,9 @@ BLEND_INIT divide, 4 BLEND_END %endmacro -%macro PHOENIX 2-3 +%macro PHOENIX 2 ; %1 name, %2 b or w, %3 (opt) 1 if 16 bit -BLEND_INIT %1, 4, %3 +BLEND_INIT %1, 4 VBROADCASTI128 m3, [pb_255] .nextrow: mov xq, widthq @@ -311,8 +311,8 @@ BLEND_END %endmacro ; %1 name , %2 src (b or w), %3 inter (w or d), %4 (1 if 16bit, not set if 8 bit) -%macro DIFFERENCE 3-4 -BLEND_INIT %1, 5, %4 +%macro DIFFERENCE 3 +BLEND_INIT %1, 5 pxor m2, m2 .nextrow: mov xq, widthq @@ -340,8 +340,8 @@ BLEND_END %endmacro ; %1 name , %2 src (b or w), %3 inter (w or d), %4 (1 if 16bit, not set if 8 bit) -%macro EXTREMITY 3-4 -BLEND_INIT %1, 8, %4 +%macro EXTREMITY 3 +BLEND_INIT %1, 8 pxor m2, m2 %if %0 == 4; 16 bit VBROADCASTI128 m4, [pd_65535] @@ -375,8 +375,8 @@ BLEND_INIT %1, 8, %4 BLEND_END %endmacro -%macro NEGATION 3-4 -BLEND_INIT %1, 8, %4 +%macro NEGATION 3 +BLEND_INIT %1, 8 pxor m2, m2 %if %0 == 4; 16 bit VBROADCASTI128 m4, [pd_65535] @@ -433,12 +433,12 @@ EXTREMITY extremity, b, w NEGATION negation, b, w %if ARCH_X86_64 -BLEND_SIMPLE addition_16, addusw, 1 -BLEND_SIMPLE and_16, and, 1 -BLEND_SIMPLE or_16, or, 1 -BLEND_SIMPLE subtract_16, subusw, 1 -BLEND_SIMPLE xor_16, xor, 1 -AVERAGE average_16, w, 1 +BLEND_SIMPLE addition_16, addusw +BLEND_SIMPLE and_16, and +BLEND_SIMPLE or_16, or +BLEND_SIMPLE subtract_16, subusw +BLEND_SIMPLE xor_16, xor +AVERAGE average_16, w %endif INIT_XMM ssse3 @@ -448,14 +448,14 @@ NEGATION negation, b, w INIT_XMM sse4 %if ARCH_X86_64 -BLEND_SIMPLE darken_16, minuw, 1 -BLEND_SIMPLE lighten_16, maxuw, 1 -GRAINEXTRACT grainextract_16, w, d, 1 -GRAINMERGE grainmerge_16, w, d, 1 -PHOENIX phoenix_16, w, 1 -DIFFERENCE difference_16, w, d, 1 -EXTREMITY extremity_16, w, d, 1 -NEGATION negation_16, w, d, 1 +BLEND_SIMPLE darken_16, minuw +BLEND_SIMPLE lighten_16, maxuw +GRAINEXTRACT grainextract_16, w, d +GRAINMERGE grainmerge_16, w, d +PHOENIX phoenix_16, w +DIFFERENCE difference_16, w, d +EXTREMITY extremity_16, w, d +NEGATION negation_16, w, d %endif %if HAVE_AVX2_EXTERNAL @@ -480,19 +480,19 @@ EXTREMITY extremity, b, w NEGATION negation, b, w %if ARCH_X86_64 -BLEND_SIMPLE addition_16, addusw, 1 -BLEND_SIMPLE and_16, and, 1 -BLEND_SIMPLE darken_16, minuw, 1 -BLEND_SIMPLE lighten_16, maxuw, 1 -BLEND_SIMPLE or_16, or, 1 -BLEND_SIMPLE subtract_16, subusw, 1 -BLEND_SIMPLE xor_16, xor, 1 -GRAINEXTRACT grainextract_16, w, d, 1 -AVERAGE average_16, w, 1 -GRAINMERGE grainmerge_16, w, d, 1 -PHOENIX phoenix_16, w, 1 -DIFFERENCE difference_16, w, d, 1 -EXTREMITY extremity_16, w, d, 1 -NEGATION negation_16, w, d, 1 +BLEND_SIMPLE addition_16, addusw +BLEND_SIMPLE and_16, and +BLEND_SIMPLE darken_16, minuw +BLEND_SIMPLE lighten_16, maxuw +BLEND_SIMPLE or_16, or +BLEND_SIMPLE subtract_16, subusw +BLEND_SIMPLE xor_16, xor +GRAINEXTRACT grainextract_16, w, d +AVERAGE average_16, w +GRAINMERGE grainmerge_16, w, d +PHOENIX phoenix_16, w +DIFFERENCE difference_16, w, d +EXTREMITY extremity_16, w, d +NEGATION negation_16, w, d %endif %endif