From patchwork Fri Feb 19 07:50:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25800 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 A460D447DFA for ; Fri, 19 Feb 2021 09:51:10 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7D89A68A6E7; Fri, 19 Feb 2021 09:51:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A56D568A27A for ; Fri, 19 Feb 2021 09:50:56 +0200 (EET) Received: by mail-wr1-f46.google.com with SMTP id u14so6621320wri.3 for ; Thu, 18 Feb 2021 23:50:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=5iL9i7FNFjtMYmMXMvbkOYuNNbpcxlVN3zOlVAYPaBk=; b=oaLVJVa/7Wb6kpSKhaS4dtBgaQYTUqphYwANdJz3HwjITh5HfNOoGYCuDwLLTUGC7T RX0mRaM+7QsajrqGreWcwxuwOKxVOkWng54WEv+2jXHNl74vQ1Vd7pAInshGneG1EweP +/1EPNMh4N4RqnAtcnMRUEzL5Si90J6m4OYG/N2AhogZhxVi//hUEu8D7gLItamg8OUy PIkgNhKsV+zqfPRS22Vq9vTgnhlod23PXyjBtDfkFv3WWejpR52q6Sun7cCDZJzvZpw+ ugmFsLxuXpYfvKtRXQaHlaPwLTcFVkRkqGrLUOMk5xgHPFqMeoWYYcLOjKrLu10fDw1c 0ybw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=5iL9i7FNFjtMYmMXMvbkOYuNNbpcxlVN3zOlVAYPaBk=; b=o37EVxluSp66ZeGKDddzV7MDs+v3zsJt6+7o6KNqj+kOF2Zoy48ycbe3cYtSJub29t BXNnS+2PuyONZv3jAW5FvHPoOb7308oMiLjMaH8gbVYDrw2h/F7svlOt2DgodAJ+BMeS 8HBTEVgbBt4OhLFN1NgYLLtWQfoMp/JRV5D1p9giiLFeKbISz1R5dD/yOovKXFLfJy1H hl4xicSc8By/LoZSaTQlgFVeghdak0jHrxCNKWpt9GFHPN1Jqz6G0JZ5n/oq499nc01U 9IBg1hWOlCJEC++w1k6xW25r0Zc0r/WoehUpr5NxgWtlcbaq7prknZGtqfehw0S5JUX3 sB5Q== X-Gm-Message-State: AOAM530I3v4Lw/Wl3tmGLcRE/vWknkqhtq/fWa9yA1+5ImtDmpCa3sC8 yJJWcUAnttCCS+aIWYbpWlhg44+L1e4= X-Google-Smtp-Source: ABdhPJzllpBU92NnXkOlDPBGCZijvsbSVr897KMdbyIalIN0uApIsF49Fln1LKNUXSTtKts7X40ryw== X-Received: by 2002:adf:a196:: with SMTP id u22mr7767363wru.416.1613721056061; Thu, 18 Feb 2021 23:50:56 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id z190sm6130795wme.15.2021.02.18.23.50.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Feb 2021 23:50:55 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Feb 2021 08:50:16 +0100 Message-Id: <20210219075022.2445161-9-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210219075022.2445161-1-andreas.rheinhardt@gmail.com> References: <20210219075022.2445161-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/15] avcodec/x86/diracdsp_init: Simplify macro 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavcodec/x86/diracdsp_init.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/libavcodec/x86/diracdsp_init.c b/libavcodec/x86/diracdsp_init.c index cd663f2d23..8633c66743 100644 --- a/libavcodec/x86/diracdsp_init.c +++ b/libavcodec/x86/diracdsp_init.c @@ -67,29 +67,29 @@ void ff_dequant_subband_32_sse4(uint8_t *src, uint8_t *dst, ptrdiff_t stride, co c->PFX ## _dirac_pixels_tab[1][IDX] = PFX ## _dirac_pixels16_ ## EXT; \ c->PFX ## _dirac_pixels_tab[2][IDX] = PFX ## _dirac_pixels32_ ## EXT -#define DIRAC_PIXOP(OPNAME2, OPNAME, EXT)\ -static void OPNAME2 ## _dirac_pixels16_ ## EXT(uint8_t *dst, const uint8_t *src[5], \ - int stride, int h) \ +#define DIRAC_PIXOP(OPNAME, EXT)\ +static void OPNAME ## _dirac_pixels16_ ## EXT(uint8_t *dst, const uint8_t *src[5], \ + int stride, int h) \ {\ if (h&3)\ - ff_ ## OPNAME2 ## _dirac_pixels16_c(dst, src, stride, h);\ + ff_ ## OPNAME ## _dirac_pixels16_c(dst, src, stride, h);\ else\ - OPNAME ## _pixels16_ ## EXT(dst, src[0], stride, h);\ + ff_ ## OPNAME ## _pixels16_ ## EXT(dst, src[0], stride, h);\ }\ -static void OPNAME2 ## _dirac_pixels32_ ## EXT(uint8_t *dst, const uint8_t *src[5], \ - int stride, int h) \ +static void OPNAME ## _dirac_pixels32_ ## EXT(uint8_t *dst, const uint8_t *src[5], \ + int stride, int h) \ {\ if (h&3) {\ - ff_ ## OPNAME2 ## _dirac_pixels32_c(dst, src, stride, h);\ + ff_ ## OPNAME ## _dirac_pixels32_c(dst, src, stride, h);\ } else {\ - OPNAME ## _pixels16_ ## EXT(dst , src[0] , stride, h);\ - OPNAME ## _pixels16_ ## EXT(dst+16, src[0]+16, stride, h);\ + ff_ ## OPNAME ## _pixels16_ ## EXT(dst , src[0] , stride, h);\ + ff_ ## OPNAME ## _pixels16_ ## EXT(dst+16, src[0]+16, stride, h);\ }\ } -DIRAC_PIXOP(put, ff_put, mmx) -DIRAC_PIXOP(avg, ff_avg, mmx) -DIRAC_PIXOP(avg, ff_avg, mmxext) +DIRAC_PIXOP(put, mmx) +DIRAC_PIXOP(avg, mmx) +DIRAC_PIXOP(avg, mmxext) static void put_dirac_pixels16_sse2(uint8_t *dst, const uint8_t *src[5], int stride, int h)