From patchwork Fri Jun 16 09:29:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 42135 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c526:b0:117:ac03:c9de with SMTP id gm38csp1390831pzb; Fri, 16 Jun 2023 02:31:03 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7XqL7HOOJ8QZxn0k2UA02BtO8FbcjF0LUS3AlcgNOhTFoEPzpL+dImRkx+6KJJfY6HcYqP X-Received: by 2002:a17:907:7213:b0:982:4325:ce51 with SMTP id dr19-20020a170907721300b009824325ce51mr1330032ejc.47.1686907862742; Fri, 16 Jun 2023 02:31:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686907862; cv=none; d=google.com; s=arc-20160816; b=Sf8yk+WWffKmzs+VglOoIU/UmJ2BpciZhh2HTdG7hd7P/lIW4hI60zQDY8ugBu2Sc7 vv7qTiCEQZI0Aw3mZGMA4VEUgwIMD/Q9ig8ymzi3WuvhxqhR8X+5OYZkGe7iGwUsNFR1 DnO5dLxSBgSuueCNLqmRqNLXGW8L8JfWO7IKNPRfPN2X3ZGl2n6x7PLkrWXOq70v6bSz k3p2fUy+sHDln1XW07z6SmP/FbyDSHic53twBSusFvCvs2LicAFbEXhI+NvodhHO5g0w 7eeCRPgqhG8dPnB+jUK/lEPehfqPcDblkuQfkR41F8JD+OnTM19/s3OEzJnS4Wyf+VNI ACOg== 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=kyijRUQUgUcCHCJX0w56MhkSHG28zznLuXa54ZukLso=; b=dt3m11GvVYhyC1OpTa2gBt7ACb8mxuK6o9VsE4AX6sjLoNDBzcVMMPQH+fb/kDShss rNc21OePXxCRNW+ZIrDMjjTOMhDW9Lf2pAARSAD4diftYs7KqYhz/nu62JMHLdEtwaA5 oty9jv3NmJ/MV447jPQNXV+ExUj/N2PBnjYNnyvIvE3yxmmC8tX6eMjB7dl5AHPuOhYP TL7jNjUwlaWLQ//+oFl9HRJHR1ophuiBx6Oz30lIDSl7LWMWovrgwaleNLy59mVtGyEG gT22MHAfI+i6I8X9YIynl9lP+vS1SIspw3c0Bqt/CMaBKSjiISr7zSaijl2iiZ5WQoTM wjLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=aU6MmsX+; 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 p22-20020a170906499600b00977cb7af75asi10112919eju.719.2023.06.16.02.31.02; Fri, 16 Jun 2023 02:31:02 -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=@haasn.xyz header.s=mail header.b=aU6MmsX+; 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 3355768C59C; Fri, 16 Jun 2023 12:30:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F3EC868C59E for ; Fri, 16 Jun 2023 12:30:21 +0300 (EEST) Received: from localhost (217-74-0-168.hsi.r-kom.net [217.74.0.168]) by haasn.dev (Postfix) with ESMTPSA id ACE8A424F2; Fri, 16 Jun 2023 11:30:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1686907821; bh=gJ/W9Tf0955IBFUSlhWzHWpj/yErSA7ZMFW4m21R7qw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aU6MmsX++msy6lSkERrH9VJMaT30V6VmMfs+YF/CSqtpcyzr2D3+zMuM++3yPHMul 2R04yeVzOznyNWWVe1tlBqyxGzq4lB4tfcS90aAIh92jE1MUMoXb/E+x3TPOaqKBrR jAdRtuBE3w5dKEVFOUdudI3PhqtVQxd29STiClQU= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 16 Jun 2023 11:29:41 +0200 Message-ID: <20230616092959.5247-4-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230616092959.5247-1-ffmpeg@haasn.xyz> References: <20230616092959.5247-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/22] lavfi/vf_libplacebo: cosmetic 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: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: UUzc33aedUZC From: Niklas Haas Assign local variable 'in' for 's->input' and replace 'inlink' by 'in->link' to avoid hard-coding ID 0 in more than one place. --- libavfilter/vf_libplacebo.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c index 879a3a0508..beddd2f796 100644 --- a/libavfilter/vf_libplacebo.c +++ b/libavfilter/vf_libplacebo.c @@ -941,14 +941,14 @@ static int libplacebo_activate(AVFilterContext *ctx) { int ret; LibplaceboContext *s = ctx->priv; - AVFilterLink *inlink = ctx->inputs[0]; + LibplaceboInput *in = &s->input; AVFilterLink *outlink = ctx->outputs[0]; int64_t pts; - FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink); + FF_FILTER_FORWARD_STATUS_BACK(outlink, in->link); pl_log_level_update(s->log, get_log_level()); - if ((ret = handle_input(ctx, &s->input)) < 0) + if ((ret = handle_input(ctx, in)) < 0) return ret; if (ff_outlink_frame_wanted(outlink)) { @@ -957,22 +957,22 @@ static int libplacebo_activate(AVFilterContext *ctx) if (s->fps.num) { pts = outlink->frame_count_out; - } else if (av_fifo_peek(s->input.out_pts, &pts, 1, 0) < 0) { + } else if (av_fifo_peek(in->out_pts, &pts, 1, 0) < 0) { /* No frames queued */ - if (s->input.status) { - pts = s->input.status_pts; + if (in->status) { + pts = in->status_pts; } else { - ff_inlink_request_frame(inlink); + ff_inlink_request_frame(in->link); return 0; } } - if (s->input.status && pts >= s->input.status_pts) { - ff_outlink_set_status(outlink, s->input.status, s->input.status_pts); + if (in->status && pts >= in->status_pts) { + ff_outlink_set_status(outlink, in->status, in->status_pts); return 0; } - ret = pl_queue_update(s->input.queue, &mix, pl_queue_params( + ret = pl_queue_update(in->queue, &mix, pl_queue_params( .pts = pts * av_q2d(outlink->time_base), .radius = pl_frame_mix_radius(&s->params), .vsync_duration = av_q2d(av_inv_q(outlink->frame_rate)), @@ -980,11 +980,11 @@ static int libplacebo_activate(AVFilterContext *ctx) switch (ret) { case PL_QUEUE_MORE: - ff_inlink_request_frame(inlink); + ff_inlink_request_frame(in->link); return 0; case PL_QUEUE_OK: if (!s->fps.num) - av_fifo_drain2(s->input.out_pts, 1); + av_fifo_drain2(in->out_pts, 1); return output_frame_mix(ctx, &mix, pts); case PL_QUEUE_ERR: return AVERROR_EXTERNAL;