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 09DB140846 for ; Sun, 28 May 2023 09:16:21 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 87E4E68C215; Sun, 28 May 2023 12:15:04 +0300 (EEST) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B8B4768C1F5 for ; Sun, 28 May 2023 12:14:56 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 850272404F5 for ; Sun, 28 May 2023 11:14:56 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id MH8kdfeqnbN7 for ; Sun, 28 May 2023 11:14:55 +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 BF01C240705 for ; Sun, 28 May 2023 11:14:47 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 024073A0D86 for ; Sun, 28 May 2023 11:14:42 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 May 2023 11:14:13 +0200 Message-Id: <20230528091416.17927-21-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230528091416.17927-1-anton@khirnov.net> References: <20230528091416.17927-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 21/24] fftools/ffmpeg_filter: make InputStream.filter private 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 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: It is no longer accessed outside of ffmpeg_filter. --- fftools/ffmpeg.h | 1 - fftools/ffmpeg_filter.c | 32 +++++++++++++++++--------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 398bcc58e1..655b5c7ec5 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -278,7 +278,6 @@ typedef struct OptionsContext { } OptionsContext; typedef struct InputFilter { - AVFilterContext *filter; struct FilterGraph *graph; uint8_t *name; } InputFilter; diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 9c29850a26..0bd0593724 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -57,6 +57,8 @@ static FilterGraphPriv *fgp_from_fg(FilterGraph *fg) typedef struct InputFilterPriv { InputFilter ifilter; + AVFilterContext *filter; + InputStream *ist; // used to hold submitted input @@ -181,7 +183,7 @@ static void sub2video_push_ref(InputFilterPriv *ifp, int64_t pts) av_assert1(frame->data[0]); ifp->sub2video.last_pts = frame->pts = pts; - ret = av_buffersrc_add_frame_flags(ifp->ifilter.filter, frame, + ret = av_buffersrc_add_frame_flags(ifp->filter, frame, AV_BUFFERSRC_FLAG_KEEP_REF | AV_BUFFERSRC_FLAG_PUSH); if (ret != AVERROR_EOF && ret < 0) @@ -1304,15 +1306,15 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, ist->file_index, ist->index); - if ((ret = avfilter_graph_create_filter(&ifilter->filter, buffer_filt, name, + if ((ret = avfilter_graph_create_filter(&ifp->filter, buffer_filt, name, args.str, NULL, fg->graph)) < 0) goto fail; par->hw_frames_ctx = ifp->hw_frames_ctx; - ret = av_buffersrc_parameters_set(ifilter->filter, par); + ret = av_buffersrc_parameters_set(ifp->filter, par); if (ret < 0) goto fail; av_freep(&par); - last_filter = ifilter->filter; + last_filter = ifp->filter; desc = av_pix_fmt_desc_get(ifp->format); av_assert0(desc); @@ -1410,11 +1412,11 @@ static int configure_input_audio_filter(FilterGraph *fg, InputFilter *ifilter, snprintf(name, sizeof(name), "graph_%d_in_%d_%d", fg->index, ist->file_index, ist->index); - if ((ret = avfilter_graph_create_filter(&ifilter->filter, abuffer_filt, + if ((ret = avfilter_graph_create_filter(&ifp->filter, abuffer_filt, name, args.str, NULL, fg->graph)) < 0) return ret; - last_filter = ifilter->filter; + last_filter = ifp->filter; snprintf(name, sizeof(name), "trim for input stream %d:%d", ist->file_index, ist->index); @@ -1451,7 +1453,7 @@ static void cleanup_filtergraph(FilterGraph *fg) for (i = 0; i < fg->nb_outputs; i++) fg->outputs[i]->filter = (AVFilterContext *)NULL; for (i = 0; i < fg->nb_inputs; i++) - fg->inputs[i]->filter = (AVFilterContext *)NULL; + ifp_from_ifilter(fg->inputs[i])->filter = NULL; avfilter_graph_free(&fg->graph); } @@ -1571,7 +1573,7 @@ int configure_filtergraph(FilterGraph *fg) InputFilterPriv *ifp = ifp_from_ifilter(fg->inputs[i]); AVFrame *tmp; while (av_fifo_read(ifp->frame_queue, &tmp, 1) >= 0) { - ret = av_buffersrc_add_frame(fg->inputs[i]->filter, tmp); + ret = av_buffersrc_add_frame(ifp->filter, tmp); av_frame_free(&tmp); if (ret < 0) goto fail; @@ -1582,7 +1584,7 @@ int configure_filtergraph(FilterGraph *fg) for (i = 0; i < fg->nb_inputs; i++) { InputFilterPriv *ifp = ifp_from_ifilter(fg->inputs[i]); if (ifp->eof) { - ret = av_buffersrc_add_frame(fg->inputs[i]->filter, NULL); + ret = av_buffersrc_add_frame(ifp->filter, NULL); if (ret < 0) goto fail; } @@ -1755,7 +1757,7 @@ void ifilter_sub2video_heartbeat(InputFilter *ifilter, int64_t pts, AVRational t overlayed subpicture and its start/end times */ sub2video_update(ifp, pts2 + 1, NULL); - if (av_buffersrc_get_nb_failed_requests(ifilter->filter)) + if (av_buffersrc_get_nb_failed_requests(ifp->filter)) sub2video_push_ref(ifp, pts2); } @@ -1769,7 +1771,7 @@ int ifilter_sub2video(InputFilter *ifilter, const AVSubtitle *subtitle) if (ifp->sub2video.end_pts < INT64_MAX) sub2video_update(ifp, INT64_MAX, NULL); - return av_buffersrc_add_frame(ifilter->filter, NULL); + return av_buffersrc_add_frame(ifp->filter, NULL); } sub2video_update(ifp, INT64_MIN, subtitle); @@ -1802,11 +1804,11 @@ int ifilter_send_eof(InputFilter *ifilter, int64_t pts, AVRational tb) ifp->eof = 1; - if (ifilter->filter) { + if (ifp->filter) { pts = av_rescale_q_rnd(pts, tb, ifp->time_base, AV_ROUND_NEAR_INF | AV_ROUND_PASS_MINMAX); - ret = av_buffersrc_close(ifilter->filter, pts, AV_BUFFERSRC_FLAG_PUSH); + ret = av_buffersrc_close(ifp->filter, pts, AV_BUFFERSRC_FLAG_PUSH); if (ret < 0) return ret; } else { @@ -1928,7 +1930,7 @@ int ifilter_send_frame(InputFilter *ifilter, AVFrame *frame, int keep_reference) ) #endif - ret = av_buffersrc_add_frame_flags(ifilter->filter, frame, + ret = av_buffersrc_add_frame_flags(ifp->filter, frame, AV_BUFFERSRC_FLAG_PUSH); if (ret < 0) { av_frame_unref(frame); @@ -1984,7 +1986,7 @@ int fg_transcode_step(FilterGraph *graph, InputStream **best_ist) ist = ifp->ist; if (input_files[ist->file_index]->eagain || ifp->eof) continue; - nb_requests = av_buffersrc_get_nb_failed_requests(ifilter->filter); + nb_requests = av_buffersrc_get_nb_failed_requests(ifp->filter); if (nb_requests > nb_requests_max) { nb_requests_max = nb_requests; *best_ist = ist; -- 2.40.1 _______________________________________________ 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".