From patchwork Thu Dec 16 16:05:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Kelly X-Patchwork-Id: 32661 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp587179iog; Thu, 16 Dec 2021 08:06:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJzN/8srBlmzuJLIEIc4BZQo8mNJDoI/rzhOD1/JibJ3gf5qW6NJmvfqeFmg5Jb18qUQXgAv X-Received: by 2002:a17:907:9488:: with SMTP id dm8mr16321148ejc.571.1639670764589; Thu, 16 Dec 2021 08:06:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639670764; cv=none; d=google.com; s=arc-20160816; b=nXOZbkq1pLkpjRtL1pA3IKFlWnyViFXHwD9zVqyFvYWoE1v8S2YCdqVTKvSAS3Uwcc oPiaRnP/5w5rDIZlArWcrqVDQivLTNs0/2ZN1l/mpT7uhwmXaMtB9rgvbUIcisOltNdA 8svlgGa/6zuBhUvwnV4siQhWUYaRLJ7MP1yiLcjprMd/PqQ5bv75E5YxMbnD3+/oEM+C wYkel78Fx9RDfdzJu0/IqCS98oMir7/0L7tT3MOiYR1G0fS0IBKZoPOEUtK/Uwa91PJF mP6+LdlZZ74U9Ke/lFWgZIuzIER8MHJOjGIxp2grfA7yRwp3UrQU3wWiFIwoypnBaSkL /boA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:from:mime-version:message-id:date :dkim-signature:delivered-to; bh=Mp8WvmwTrszU3eFAk54pX2PI6aivpwRRZlxEqUwqMWY=; b=yOJupjSxh9ZX52ejsqSD67BN7Eyaqimm8JW4gpW146+SHvJMlg85LCL442FMLPPrks 2e22ffhmYcE/GEOHDyAQLy2tgnaig87ztFZuRi2huplK2o3sq7j21T933fsNc6B+UX4m exWTA52+y3BfYmLZHyiZixh0uys+/6Nq5mQfoC29P1zF8uzNfExAKXiiJnReVAbYxZgF ca+VKngMQrg/MAzhLwPj1uXxA+wArT1m0oywv3hlkYQ7Tqw9jv4q+iX3PmNktdIoHZSQ 11MoBRUMyrw9DrZHBqgkQ5b964/eI2lIM2KwxwVGPC9opBP8IR90tMxEWByVaO6xOE0T xPng== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20210112 header.b=JQeUAtQP; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dn17si5161436ejc.791.2021.12.16.08.06.03; Thu, 16 Dec 2021 08:06:04 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20210112 header.b=JQeUAtQP; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 385ED68AED4; Thu, 16 Dec 2021 18:05:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A361E68A56A for ; Thu, 16 Dec 2021 18:05:52 +0200 (EET) Received: by mail-wm1-f73.google.com with SMTP id j71-20020a1c234a000000b00342f418ae7cso1484917wmj.1 for ; Thu, 16 Dec 2021 08:05:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:message-id:mime-version:subject:from:to:cc; bh=cb3S4xAgHo2SY5E+RDYK07or9R3C36yBphr6M5jXvyk=; b=JQeUAtQPFrx8Yf32Bytp4rJTEpPDpT88qPwWc08LL1w8q5EYPjWSkOvFWjXmQQAKua D9VyDP1HBX/fbpvXokaxBcQt1brl56fAmkPJi3/hZIINdWqAPHnvicsbE/7ctxDGQlFD Kr/zAUoOSEewkrrVtKOA1eXgDu+hklwI5ty7Kv6K21H0LDtgF9qTLttS7aG5CnRK3ym1 m+iGFBqLvTDMej0LvodNML98LgPxRWg7kCgLFDXj+B6u57xbbF5xlN2fPcp860J0WKuw eArvqiLq4GAB1CVqsKljnhZzwaiHN+vO+HCRf1b9vizh8m4mUmrHigW/mmykAGz6TAL4 Jj/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=cb3S4xAgHo2SY5E+RDYK07or9R3C36yBphr6M5jXvyk=; b=17l5oZYdr6K7u0bNGhduoh26FRTtQf2xqhDy+ZLuymj4Kd3zci3v9PW0GDR/iLESsw 9JzL7iisxzzJRrcqPDpdT4nW1g+YejlLmYUFjNw3C+1+wwrwNwrOry0s+o/1Xr/CSx/G BT6gX7MHhZKz5LBvTC8NbCLLUuHOaD9g8bLI41zomaPaW3CCo7RLi1bTf3rmonj1R9rb Kz0zqNzQqg9Wi3KfgEnurSfeJsrFEHoA5KVZ4pifFXqVE2pSm+SIxvdd32GOBey+DWoE Ogd+dpu99ICK/5IAZIesxR+ChxKf8IpcbMULUANLSK8j49riCFOo/D3qQ9jxRlcMSoFt exaw== X-Gm-Message-State: AOAM533BdRXPc//x/CHwEcANqE0JmBUK0bgLjZFXZw8iWV1Pq2BkLGzX KqHdVdxT49e7vdK1qGuECgnfNpUrbYhy6o8VpSkZayYyRJZTdnwveUMK1/MwIWt64PQIk9rvz8r jlHsx3Kxh9g4Y/ReCrTVFToQfCsFdSALv6B2LbETTG/51bYTawNmgZX1bWBkydeMhF29aCOo= X-Received: from alankelly0.zrh.corp.google.com ([2a00:79e0:61:301:d309:ede:58fa:3ff6]) (user=alankelly job=sendgmr) by 2002:a1c:440a:: with SMTP id r10mr5753966wma.4.1639670751763; Thu, 16 Dec 2021 08:05:51 -0800 (PST) Date: Thu, 16 Dec 2021 17:05:48 +0100 Message-Id: <20211216160548.2035835-1-alankelly@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.34.1.173.g76aa8bc2d0-goog From: Alan Kelly To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] x86/swscale: fix minor coding style issues X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Alan Kelly Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: rfKrt0venBBh --- libswscale/x86/swscale.c | 14 +++++++------- tests/checkasm/sw_scale.c | 3 +-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c index 164b06d6ba..c49a05c37b 100644 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@ -578,13 +578,13 @@ switch(c->dstBpc){ \ break; \ } - if (EXTERNAL_AVX2_FAST(cpu_flags)){ - if ((c->srcBpc == 8) && (c->dstBpc <= 14)){ - if(c->chrDstW % 16 == 0) - ASSIGN_AVX2_SCALE_FUNC(c->hcScale, c->hChrFilterSize); - if(c->dstW % 16 == 0) - ASSIGN_AVX2_SCALE_FUNC(c->hyScale, c->hLumFilterSize); - } + if (EXTERNAL_AVX2_FAST(cpu_flags)) { + if ((c->srcBpc == 8) && (c->dstBpc <= 14)) { + if (c->chrDstW % 16 == 0) + ASSIGN_AVX2_SCALE_FUNC(c->hcScale, c->hChrFilterSize); + if (c->dstW % 16 == 0) + ASSIGN_AVX2_SCALE_FUNC(c->hyScale, c->hLumFilterSize); + } } if (EXTERNAL_AVX2_FAST(cpu_flags)) { diff --git a/tests/checkasm/sw_scale.c b/tests/checkasm/sw_scale.c index 011cb46428..f4912e6c2c 100644 --- a/tests/checkasm/sw_scale.c +++ b/tests/checkasm/sw_scale.c @@ -217,9 +217,8 @@ static void check_hscale(void) } ff_sws_init_scale(ctx); memcpy(filterAvx2, filter, sizeof(uint16_t) * (SRC_PIXELS * MAX_FILTER_WIDTH + MAX_FILTER_WIDTH)); - if (cpu_flags & AV_CPU_FLAG_AVX2){ + if (cpu_flags & AV_CPU_FLAG_AVX2) ff_shuffle_filter_coefficients(ctx, filterPosAvx, width, filterAvx2, SRC_PIXELS); - } if (check_func(ctx->hcScale, "hscale_%d_to_%d_width%d", ctx->srcBpc, ctx->dstBpc + 1, width)) { memset(dst0, 0, SRC_PIXELS * sizeof(dst0[0]));