From patchwork Mon May 31 07:55:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 27996 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2657148iof; Mon, 31 May 2021 00:58:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwuWAKQ2WYhNxVUUCPQSZCBV2tNIx362z6LqBQsIvA6l4ClKVIT9OwzrQQgVcYugwAYjhcx X-Received: by 2002:a17:906:c833:: with SMTP id dd19mr9597748ejb.255.1622447880034; Mon, 31 May 2021 00:58:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622447880; cv=none; d=google.com; s=arc-20160816; b=SAL7J6Wmc+CfQcTEzndqpzvAfSvJOOgnYn+XSPvwe6+hKVLncRDN39EV5Fy/rn3cNp ipgGpT1H3R+siwamd8QX9UvNLptFDVq4xlQ3xMuzFWC8D8hS43PnX59auSARWZQAecKf d6wcLi4+jVvn8+c4a278IzRXoxh3oEj6rYXIfyYkKCg9/B2Xv4i8Ih9DPlmh/BXlRsBv 5DOyM1IN27rhqvS3PSqsWDxxnuG50shi233m7HN2qKnfcjfT/hQimFxD/l3qQGgJdMjz Imna54iaFQXEdbuVqnUS0Qo3Nvo1v7c3XQktD4KRMpagle2h94Wk8EzRK6EKpkAmkwif FPLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=1PFvVLMYlxteqU6wVUt2VlyLE8c4jlFoel0e9nS2vbM=; b=upSo2W4HEks8qPDZvNUqHSoQ7tQ3rvRrofzo8VnxQTbPsNYaT8oOiWz5JCxH/wLmsJ rOqK83UzNxfzaJqrUnK0xxH93pMtKlhT6wCVNfJtlAGULN/zW+vcwgSW+GBej2NqW8Vv //tqxWw8VqZqSR93wH0sUm4yBLKi/cDnnom+ozB+aKQh2v+akINBUOuIfWjeR5DW1G4I 5n5ZyNlcDjOssBwsAGq6RjEzMZsC4f66QwGlrRvRYpoEQICf76geRra2jg5bu1rIPkpi L8LbiFbVOi777wEmiPXbzdXVR51G8oACdt8vjIUn8Gm/n2K9SftQ4AqN8uM3n2B6FOkR pjXw== ARC-Authentication-Results: i=1; mx.google.com; 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 w12si11852477edd.352.2021.05.31.00.57.59; Mon, 31 May 2021 00:58:00 -0700 (PDT) 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; 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 96206689969; Mon, 31 May 2021 10:55:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3654F687FE1 for ; Mon, 31 May 2021 10:55:29 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id B4B822406A4 for ; Mon, 31 May 2021 09:55:27 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id Jg0QBgZRP-_f for ; Mon, 31 May 2021 09:55:27 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 4FECD2406A1 for ; Mon, 31 May 2021 09:55:22 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 21E1F3A1844; Mon, 31 May 2021 09:55:21 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 31 May 2021 09:55:09 +0200 Message-Id: <20210531075515.19544-18-anton@khirnov.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210531075515.19544-1-anton@khirnov.net> References: <20210531075515.19544-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 18/24] sws: move initializing dither_error higher up 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: MlJgYpy0rahR It does not interact in any way with the code setting up the image pointers/strides, so it should not be intermixed with it. --- libswscale/swscale.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 2d6ed95cfb..b9b2826911 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -907,6 +907,10 @@ int attribute_align_arg sws_scale(struct SwsContext *c, if (c->cascaded_context[0] && srcSliceY == 0 && srcSliceH == c->cascaded_context[0]->srcH) return scale_cascaded(c, srcSlice, srcStride, srcSliceY, srcSliceH, dst, dstStride); + if (!srcSliceY && (c->flags & SWS_BITEXACT) && c->dither == SWS_DITHER_ED && c->dither_error[0]) + for (i = 0; i < 4; i++) + memset(c->dither_error[i], 0, sizeof(c->dither_error[0][0]) * (c->dstW+2)); + memcpy(src2, srcSlice, sizeof(src2)); memcpy(dst2, dst, sizeof(dst2)); memcpy(srcStride2, srcStride, sizeof(srcStride2)); @@ -959,10 +963,6 @@ int attribute_align_arg sws_scale(struct SwsContext *c, src2[0] = base; } - if (!srcSliceY && (c->flags & SWS_BITEXACT) && c->dither == SWS_DITHER_ED && c->dither_error[0]) - for (i = 0; i < 4; i++) - memset(c->dither_error[i], 0, sizeof(c->dither_error[0][0]) * (c->dstW+2)); - if (c->sliceDir != 1) { // slices go from bottom to top => we flip the image internally for (i=0; i<4; i++) {