From patchwork Wed Jul 20 04:41:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Phlipot X-Patchwork-Id: 36853 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp2172214pzb; Tue, 19 Jul 2022 21:41:50 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tnBvrt36o4bpz0TNSMgF5deyNNRu+u3nlpyiGyDUYZKFY7LVF0M7UYPUtOS9zMSN1mCjqD X-Received: by 2002:a05:6402:1914:b0:43a:d548:8adc with SMTP id e20-20020a056402191400b0043ad5488adcmr48755413edz.214.1658292110162; Tue, 19 Jul 2022 21:41:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658292110; cv=none; d=google.com; s=arc-20160816; b=EIgkaEhRsvO4LjMGPXIv+gf0LBfLujTc6Z/QJzLhD/MrQ4KpXqV4G5YtoGYEl2Txwu i6Ii3Gz+4h33aUfhyTQpu7YMdWHnc/lwqhdah1w4S+e7lHe59YC1dppuoxPWMIlkn9dd wcKrxFdQM+12J4DaQy6dwU85oS1E2rQNXwDJYOQwgq4ZfvmS1aWGwnQ2I+SUm4uAc+Zj +qlLzImPwAv+ONfy9mT09EV1vFlH5f+ctf6oB/muHtfWHmzel7zNoAkMo4sjvCjHpwSq t9lWV5yNla0XvhT/HT/s2lOob/ukQ372j+0K/U9PHFNqkzmh0iGrE8jiy+3dR+1Wft+m XBjQ== 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:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=STz3hiAuRAEdb9R5+nYk+N1MANoHAcZ4ttB7evb7UPQ=; b=g5faI6R9D1TOS5BRs1YqtCdVScdpMHnIez2WEW1SGZ9dXZYj0JgQz1sD1lCHOB9gtT InIf59+RyXa/VdSlhdCsRF3Dyz1/wOOGRyag+RC7ZjnkNQmdJzMBiL/1qG7+7xNk53/U 2PWsNSJmloBxg7PLtvER9umV8zJ7hU+ZTXTQKy+H76ZplsTEtk+0ZJNPruq4bAAHlckg 1G0wvIthLWBkGBEfSDA+MEyHO6MEObxIiDeLsdWQHSMkamzvXd9yoMVpdzbawHbjTggb 8Wp+rnQMp8iD/LZdMrL0LAoAUV327rKhsOENbUYOaiAnnkb7mibaqbLhyGgaiUGM3ehH IhLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=nhMV3ZSV; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ji18-20020a170907981200b0072f267eeba3si11828348ejc.677.2022.07.19.21.41.49; Tue, 19 Jul 2022 21:41:50 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=nhMV3ZSV; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7D9C268B7D1; Wed, 20 Jul 2022 07:41:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 30CAD68B7D4 for ; Wed, 20 Jul 2022 07:41:25 +0300 (EEST) Received: by mail-pl1-f175.google.com with SMTP id g17so13898752plh.2 for ; Tue, 19 Jul 2022 21:41:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VT5Jq3nHG6f9ea/3i4Kb1djNuxPV6b/LWW/4zfLKLhc=; b=nhMV3ZSVJcE2YgE6AEEqdwxwvLgr5IHyNVJJhtubYifCgsxyeTM1KG3v+uFq+4iUgq w88aSCTCRp2uAiuvOnKoXwpdP2sIMYmZ9fnbc1QyAhnjUnOqa4swhrxznopsxbdbcoSa +vFb+5FUv4a+dBj5yaJ/fZdqa2r+2Ob920QW0ByPdeDJeqRVmBKzCLNjzx7FiRIPoT4j FGM+95bE/XVmycJsJ5teFaNHBiDZ9C+m1WD4ECK+Na5oCPTtdlbwfN5N+JG/Z1faLxfV ZXIPSBUSjx+szdzvq2fDl9giphMTCVfQvR6eqQ6r5XJFcB2oJts/TevePltIXjRUSx/o aVjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VT5Jq3nHG6f9ea/3i4Kb1djNuxPV6b/LWW/4zfLKLhc=; b=rHt9n6yoixvgY7qumm8Q2UVkeAhjDbcK+7SBkvuWLwcgyMQiWfI6ukHSHynC1dcwfo qiA9u7z2cTQxqc6P09OnbtlFF0oVAS3R3lKwqy3MaJ9W+4ZS2WBXgYUYHr9SYFo3JoVa +xD5S5D8WGrQLxdUXxWF4aaHtHQne3AWwYpHtlLilzSr3PYBV5Bl2avet7+dJPjRIvHz sAWEeR+4eWR8KYXl3yHKzULa9wjRC5W9ljjVloeRIq914rVt3l/mTCmGbC4hf/6eEKhQ LDHSfXvD2opO1ZmGZ9cxSXm99MAuXRq+wgTlJ9t1PDnb3jB4aARX7Vj9FQsP5jvLsBty QthA== X-Gm-Message-State: AJIora8w7xRWCq3Msp5okSUEFVzgd3uVYRQMgenKXJbEMhz1p0uRRzvP 2Al84rlvBcsS+NTZPiyyMFcW8nrWLaVFag== X-Received: by 2002:a17:903:120f:b0:15f:99f:9597 with SMTP id l15-20020a170903120f00b0015f099f9597mr36516141plh.45.1658292082955; Tue, 19 Jul 2022 21:41:22 -0700 (PDT) Received: from localhost.localdomain (23-121-159-29.lightspeed.sntcca.sbcglobal.net. [23.121.159.29]) by smtp.googlemail.com with ESMTPSA id f16-20020a635110000000b003fba1a97c49sm10855907pgb.61.2022.07.19.21.41.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jul 2022 21:41:22 -0700 (PDT) From: Chris Phlipot To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 Jul 2022 21:41:15 -0700 Message-Id: <20220720044117.1282961-3-cphlipot0@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220720044117.1282961-1-cphlipot0@gmail.com> References: <20220720044117.1282961-1-cphlipot0@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/5] avfilter/vf_yadif: reformat code to improve readability 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: Chris Phlipot Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: YQrE9MT2ohr5 Reformat some of the code to improve readability and reduce code duplication. This change is intended to be purely cosmentic and shouldn't result in any functional changes. Signed-off-by: Chris Phlipot --- libavfilter/vf_yadif.c | 11 +++++------ libavfilter/yadif.h | 3 +-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c index 42f6246330..54109566be 100644 --- a/libavfilter/vf_yadif.c +++ b/libavfilter/vf_yadif.c @@ -211,16 +211,15 @@ static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) uint8_t *cur = &s->cur ->data[td->plane][y * refs]; uint8_t *next = &s->next->data[td->plane][y * refs]; uint8_t *dst = &td->frame->data[td->plane][y * td->frame->linesize[td->plane]]; + int prefs = y + 1 < td->h ? refs : -refs; + int mrefs = y ? -refs : refs; + int parity = td->parity ^ td->tff; int mode = y == 1 || y + 2 == td->h ? 2 : s->mode; s->filter_line(dst + pix_3, prev + pix_3, cur + pix_3, next + pix_3, td->w - edge, - y + 1 < td->h ? refs : -refs, - y ? -refs : refs, - td->parity ^ td->tff, mode); + prefs, mrefs, parity, mode); s->filter_edges(dst, prev, cur, next, td->w, - y + 1 < td->h ? refs : -refs, - y ? -refs : refs, - td->parity ^ td->tff, mode, s->req_align); + prefs, mrefs, parity, mode, s->req_align); } else { memcpy(&td->frame->data[td->plane][y * td->frame->linesize[td->plane]], &s->cur->data[td->plane][y * refs], td->w * df); diff --git a/libavfilter/yadif.h b/libavfilter/yadif.h index b81f2fc1d9..f271fe8304 100644 --- a/libavfilter/yadif.h +++ b/libavfilter/yadif.h @@ -67,8 +67,7 @@ typedef struct YADIFContext { * Required alignment for filter_line */ int req_align; - void (*filter_line)(void *dst, - void *prev, void *cur, void *next, + void (*filter_line)(void *dst, void *prev, void *cur, void *next, int w, int prefs, int mrefs, int parity, int mode); void (*filter_edges)(void *dst, void *prev, void *cur, void *next, int w, int prefs, int mrefs, int parity, int mode,