From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id D45AF45AEC for ; Fri, 16 Jun 2023 09:30:50 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D8EA068C5AD; Fri, 16 Jun 2023 12:30:28 +0300 (EEST) 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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; -- 2.41.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".