From patchwork Fri Feb 19 07:50:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25801 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 A7134447DFA for ; Fri, 19 Feb 2021 09:51:11 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8888868A6EB; Fri, 19 Feb 2021 09:51:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5F55968A552 for ; Fri, 19 Feb 2021 09:50:57 +0200 (EET) Received: by mail-wr1-f54.google.com with SMTP id u14so6621404wri.3 for ; Thu, 18 Feb 2021 23:50:57 -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=84XvOgodt+/+VZZa14itWpR5osCKPZhCnUT4ujbuSAU=; b=NkZsjNPV/yRyhUtYbsXlRXCSKPH09P2F8FrpzlqF8rx7L5tl46SAWYFdLFP/0zdU03 rmeQS/uGK7EsO3xyYg1uz20rkm4kckpZ99jHI9wAB1Eu3nJywZlxEkKVshNGg3K9Ocur NJS9QW0aAnB0UQA6+i9VnRiLZid62cmWqkNXOb9olqs8aZfIC7t14hjvQK8Fy/Piu+Oq vt2TB/y9NCOTR7jWirmTTWZTb0mP0w066MbIHpL8+MQr2JrutWV6wbNAod2ZYwa845VB IVxauZXX85/SSFUK/bRvgC7n+1ifpPiabB8WJm6V3d4d9h6eaC/evSeJNxbPKBHWezU7 ZqFw== 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=84XvOgodt+/+VZZa14itWpR5osCKPZhCnUT4ujbuSAU=; b=XR5d8sdnOi4QZfM8sQE+O7VOOGBnM3PWTp5IpX5eqPEDmXa2V2dYaoD7NTO2O2ImaC y4eojQmTun7gS33c26VZ2s+ckRJnJrIvygs05i6DczQwkLHL/Z7Fs51sDcOqbBEkUR/j 2KFdBu793xLhit6rAzVxK1/v+f/lT6VSL2tEtkql3lU88Q41VbC0lrKXI+6KzuPOZehr xaX6ikx42YmgNLOcAkS1ImFOeH3jjLLVGK0NYPZaDHazyEJORRee+P4+XkPyD2UItAr1 kQLDcieSNXhlEnMwy4pVIosTXk9NZefxgw93nskzahkb0PgI11lq+n62XET2njUtaBND uMNQ== X-Gm-Message-State: AOAM533N6A0+g9AvBgWIAJfDPWrvje1aH54wFFqU1YJvCs3dh+h1/uXK YOM5jTM6vPYKxCpvZiOE/rFbStiXpK8= X-Google-Smtp-Source: ABdhPJynUB0aUjVEIT3yoYF6+iTgpLati4RHqKKQl5ivTjreotGnlGOlMPysssjtxowEd8BupsuUjQ== X-Received: by 2002:a5d:44d2:: with SMTP id z18mr7853478wrr.26.1613721056744; 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.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Feb 2021 23:50:56 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Feb 2021 08:50:17 +0100 Message-Id: <20210219075022.2445161-10-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 10/15] avcodec/x86/diracdsp_init: Reuse 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 | 38 ++-------------------------------- 1 file changed, 2 insertions(+), 36 deletions(-) diff --git a/libavcodec/x86/diracdsp_init.c b/libavcodec/x86/diracdsp_init.c index 8633c66743..8baacf3129 100644 --- a/libavcodec/x86/diracdsp_init.c +++ b/libavcodec/x86/diracdsp_init.c @@ -91,42 +91,8 @@ 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) -{ - if (h&3) - ff_put_dirac_pixels16_c(dst, src, stride, h); - else - ff_put_pixels16_sse2(dst, src[0], stride, h); -} -static void avg_dirac_pixels16_sse2(uint8_t *dst, const uint8_t *src[5], - int stride, int h) -{ - if (h&3) - ff_avg_dirac_pixels16_c(dst, src, stride, h); - else - ff_avg_pixels16_sse2(dst, src[0], stride, h); -} -static void put_dirac_pixels32_sse2(uint8_t *dst, const uint8_t *src[5], - int stride, int h) -{ - if (h&3) { - ff_put_dirac_pixels32_c(dst, src, stride, h); - } else { - ff_put_pixels16_sse2(dst , src[0] , stride, h); - ff_put_pixels16_sse2(dst+16, src[0]+16, stride, h); - } -} -static void avg_dirac_pixels32_sse2(uint8_t *dst, const uint8_t *src[5], - int stride, int h) -{ - if (h&3) { - ff_avg_dirac_pixels32_c(dst, src, stride, h); - } else { - ff_avg_pixels16_sse2(dst , src[0] , stride, h); - ff_avg_pixels16_sse2(dst+16, src[0]+16, stride, h); - } -} +DIRAC_PIXOP(put, sse2) +DIRAC_PIXOP(avg, sse2) #if !ARCH_X86_64 HPEL_FILTER(8, mmx)