From: Marton Balint <cus@passwd.hu>
To: ffmpeg-devel@ffmpeg.org
Cc: Marton Balint <cus@passwd.hu>
Subject: [FFmpeg-devel] [PATCH 3/3] fftools/ffmpeg_filter: log an information message about filter graph reconfigurations
Date: Fri, 29 Dec 2023 19:50:59 +0100
Message-ID: <20231229185059.18462-3-cus@passwd.hu> (raw)
In-Reply-To: <20231229185059.18462-1-cus@passwd.hu>
Filter graph reconfigurations can cause nontrivial issues, e.g. PTS
discontinuities, so it is better to warn the user about them.
Signed-off-by: Marton Balint <cus@passwd.hu>
---
fftools/ffmpeg_filter.c | 50 ++++++++++++++++++++++++++++++++---------
1 file changed, 40 insertions(+), 10 deletions(-)
diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c
index 680fffb060..9dfc68a130 100644
--- a/fftools/ffmpeg_filter.c
+++ b/fftools/ffmpeg_filter.c
@@ -2585,41 +2585,50 @@ static int send_eof(FilterGraphThread *fgt, InputFilter *ifilter,
return 0;
}
+enum ReinitReason {
+ VIDEO_CHANGED = (1 << 0),
+ AUDIO_CHANGED = (1 << 1),
+ MATRIX_CHANGED = (1 << 2),
+ HWACCEL_CHANGED = (1 << 3)
+};
+
static int send_frame(FilterGraph *fg, FilterGraphThread *fgt,
InputFilter *ifilter, AVFrame *frame)
{
InputFilterPriv *ifp = ifp_from_ifilter(ifilter);
FrameData *fd;
AVFrameSideData *sd;
- int need_reinit, ret;
+ int need_reinit = 0, ret;
/* determine if the parameters for this input changed */
- need_reinit = ifp->format != frame->format;
-
switch (ifp->type) {
case AVMEDIA_TYPE_AUDIO:
- need_reinit |= ifp->sample_rate != frame->sample_rate ||
- av_channel_layout_compare(&ifp->ch_layout, &frame->ch_layout);
+ if (ifp->format != frame->format ||
+ ifp->sample_rate != frame->sample_rate ||
+ av_channel_layout_compare(&ifp->ch_layout, &frame->ch_layout))
+ need_reinit |= AUDIO_CHANGED;
break;
case AVMEDIA_TYPE_VIDEO:
- need_reinit |= ifp->width != frame->width ||
- ifp->height != frame->height;
+ if (ifp->format != frame->format ||
+ ifp->width != frame->width ||
+ ifp->height != frame->height)
+ need_reinit |= VIDEO_CHANGED;
break;
}
if (sd = av_frame_get_side_data(frame, AV_FRAME_DATA_DISPLAYMATRIX)) {
if (!ifp->displaymatrix_present ||
memcmp(sd->data, ifp->displaymatrix, sizeof(ifp->displaymatrix)))
- need_reinit = 1;
+ need_reinit |= MATRIX_CHANGED;
} else if (ifp->displaymatrix_present)
- need_reinit = 1;
+ need_reinit |= MATRIX_CHANGED;
if (!ifp->ist->reinit_filters && fgt->graph)
need_reinit = 0;
if (!!ifp->hw_frames_ctx != !!frame->hw_frames_ctx ||
(ifp->hw_frames_ctx && ifp->hw_frames_ctx->data != frame->hw_frames_ctx->data))
- need_reinit = 1;
+ need_reinit |= HWACCEL_CHANGED;
if (need_reinit) {
ret = ifilter_parameters_from_frame(ifilter, frame);
@@ -2649,6 +2658,27 @@ static int send_frame(FilterGraph *fg, FilterGraphThread *fgt,
if (ret < 0)
return ret;
+ if (fgt->graph) {
+ AVBPrint reason;
+ av_bprint_init(&reason, 0, AV_BPRINT_SIZE_AUTOMATIC);
+ if (need_reinit & AUDIO_CHANGED) {
+ const char *fmtname = av_get_sample_fmt_name(frame->format);
+ av_bprintf(&reason, ", audio parameters changed to %d Hz, ", frame->sample_rate);
+ av_channel_layout_describe_bprint(&frame->ch_layout, &reason);
+ av_bprintf(&reason, ", %s", fmtname ? fmtname : "?");
+ }
+ if (need_reinit & VIDEO_CHANGED) {
+ const char *fmtname = av_get_pix_fmt_name(frame->format);
+ av_bprintf(&reason, ", video parameters changed to %s, %dx%d",
+ fmtname ? fmtname : "?", frame->width, frame->height);
+ }
+ if (need_reinit & MATRIX_CHANGED)
+ av_bprintf(&reason, ", display matrix changed");
+ if (need_reinit & HWACCEL_CHANGED)
+ av_bprintf(&reason, ", hwaccel changed");
+ av_log(fg, AV_LOG_INFO, "Reconfiguring filter graph%s\n", reason.str);
+ }
+
ret = configure_filtergraph(fg, fgt);
if (ret < 0) {
av_log(fg, AV_LOG_ERROR, "Error reinitializing filters!\n");
--
2.35.3
_______________________________________________
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".
next prev parent reply other threads:[~2023-12-29 18:51 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-29 18:50 [FFmpeg-devel] [PATCH 1/3] all: use av_channel_layout_describe_bprint instead of av_channel_layout_describe in a few places Marton Balint
2023-12-29 18:50 ` [FFmpeg-devel] [PATCH 2/3] fftools/ffmpeg_filter: honor -reinit_filters 0 even on changed display matrix Marton Balint
2023-12-29 18:50 ` Marton Balint [this message]
2024-01-04 12:53 ` [FFmpeg-devel] [PATCH 3/3] fftools/ffmpeg_filter: log an information message about filter graph reconfigurations Marton Balint
2024-01-04 21:39 ` [FFmpeg-devel] [PATCH v2 " Marton Balint
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231229185059.18462-3-cus@passwd.hu \
--to=cus@passwd.hu \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git