From patchwork Fri Jun 16 09:29:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 42131 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c526:b0:117:ac03:c9de with SMTP id gm38csp1390738pzb; Fri, 16 Jun 2023 02:30:53 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4fQ3q4zN9DQoYhAu3FL7qrRoQAiPqg5yicJC1lBFRTln3h/B0i3STLIWzPIZOa5fqDth1/ X-Received: by 2002:a17:907:7e90:b0:974:6335:4239 with SMTP id qb16-20020a1709077e9000b0097463354239mr1310104ejc.34.1686907853640; Fri, 16 Jun 2023 02:30:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686907853; cv=none; d=google.com; s=arc-20160816; b=RJt1cxhNPqbeBtAPUiMR6YsqfIxviB2NwSSeb8QOf00VQNeHaOp6OzcyE+I+FkMLI7 KCtAzhloz94NVP+y8WuZiCboOWzpQtDspyL6IZL7Ol8hjVfBAjchbHC3bNywTfHkUFxN nVOyPnrX9oBI+0ykwMn1xAlfMHeZbgGVxB/HfAJ6b8sjYOqGRGpVH+4d194JT0HApTY6 fRxMeHIOW2ua9Db3v8gNSoE4WyaDMJAwQX4h3E6gPtyc08H2/QVndm94EHZWKOte/yJR OnXEY1iHVKUlcEjdmgmlxd6iE3z+G8184v/PoeHeYJlG51KEoJFu9fjNMvtQk9R61oVJ SHxA== 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=NbpXF1nT996AcsIX9hUe1f1dyELBwpTDVEc1iEXMrCc=; b=HzTgVMcAGG/nTMY/2XpjKbClWD8tnSvWr2KInOPb0e039OT86NelZQ3lIkVHIEM8ua JNhkGZF3PUYgxmrpwMZpPATlXhMRD468EB9Ei9LJSfaSKTQh/b0KBPKgJ3waCzF6HMoy ZeIVLf0GAVXl73faNbFEpQsD1WmIb4V2E7kjTf6ZGj6RjvxVYiojy1A1qicwvz7UHF9H PT1m9vAe5tDOK3WpRnT1ZYo1p1HRG+tbjWtNZTE1YJwlZ0UEhjGVWdanlonqr8gTRGKw Nm9BNJa8iyoChJrVd0qyoQtoG4nlf/JZZuCq5j9x0CdyDIwo7DFs1ZyecgpXvXobCCUt 5cgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b="P4hKzyK/"; 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 ca19-20020aa7cd73000000b005149e348be9si11009449edb.86.2023.06.16.02.30.53; Fri, 16 Jun 2023 02:30:53 -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="P4hKzyK/"; 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 1773C68C5B3; Fri, 16 Jun 2023 12:30:29 +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 8127868C59A 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 2C16941BA3; 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=kiXpPxna9a7qKPDBSSCsx5xLtsYjGOAFOlb7BNov67k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P4hKzyK/oCzxW8w51il2Ju6ubQyu7XbwIrkhkTFcGGMB99PgGWRiL0WaaGsrTFAZ9 TMNyVYkPB1MGszzKv8jUYrvt7VoGjRnhbvUXvX+qf/8jZZ/99/mLyVE8hHGENKwBwd zYxQG772C3nzmLgCij3GALm5Y8VcigaFXzcs1QeA= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 16 Jun 2023 11:29:40 +0200 Message-ID: <20230616092959.5247-3-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 03/22] lavfi/vf_libplacebo: move input handling to separate function 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: 0utzxdjpDB8b From: Niklas Haas To be re-used once we support more than one input. --- libavfilter/vf_libplacebo.c | 45 ++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c index 10fd432745..879a3a0508 100644 --- a/libavfilter/vf_libplacebo.c +++ b/libavfilter/vf_libplacebo.c @@ -896,23 +896,19 @@ static void discard_frame(const struct pl_source_frame *src) av_frame_free(&avframe); } -static int libplacebo_activate(AVFilterContext *ctx) +static int handle_input(AVFilterContext *ctx, LibplaceboInput *input) { int ret, status; LibplaceboContext *s = ctx->priv; - AVFilterLink *inlink = ctx->inputs[0]; AVFilterLink *outlink = ctx->outputs[0]; AVFrame *in; int64_t pts; - FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink); - pl_log_level_update(s->log, get_log_level()); - - while ((ret = ff_inlink_consume_frame(inlink, &in)) > 0) { + while ((ret = ff_inlink_consume_frame(input->link, &in)) > 0) { in->opaque = s; - pl_queue_push(s->input.queue, &(struct pl_source_frame) { - .pts = in->pts * av_q2d(inlink->time_base), - .duration = in->duration * av_q2d(inlink->time_base), + pl_queue_push(input->queue, &(struct pl_source_frame) { + .pts = in->pts * av_q2d(input->link->time_base), + .duration = in->duration * av_q2d(input->link->time_base), .first_field = pl_field_from_avframe(in), .frame_data = in, .map = map_frame, @@ -922,22 +918,39 @@ static int libplacebo_activate(AVFilterContext *ctx) if (!s->fps.num) { /* Internally queue an output frame for the same PTS */ - av_assert1(!av_cmp_q(inlink->time_base, outlink->time_base)); - av_fifo_write(s->input.out_pts, &in->pts, 1); + pts = av_rescale_q(in->pts, input->link->time_base, outlink->time_base); + av_fifo_write(input->out_pts, &pts, 1); } } if (ret < 0) return ret; - if (!s->input.status && ff_inlink_acknowledge_status(inlink, &status, &pts)) { - pts = av_rescale_q_rnd(pts, inlink->time_base, outlink->time_base, + if (!input->status && ff_inlink_acknowledge_status(input->link, &status, &pts)) { + pts = av_rescale_q_rnd(pts, input->link->time_base, outlink->time_base, AV_ROUND_UP); - pl_queue_push(s->input.queue, NULL); /* Signal EOF to pl_queue */ - s->input.status = status; - s->input.status_pts = pts; + pl_queue_push(input->queue, NULL); /* Signal EOF to pl_queue */ + input->status = status; + input->status_pts = pts; } + return 0; +} + +static int libplacebo_activate(AVFilterContext *ctx) +{ + int ret; + LibplaceboContext *s = ctx->priv; + AVFilterLink *inlink = ctx->inputs[0]; + AVFilterLink *outlink = ctx->outputs[0]; + int64_t pts; + + FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink); + pl_log_level_update(s->log, get_log_level()); + + if ((ret = handle_input(ctx, &s->input)) < 0) + return ret; + if (ff_outlink_frame_wanted(outlink)) { struct pl_frame_mix mix; enum pl_queue_status ret;