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 C657E48484 for ; Thu, 4 Jan 2024 12:53:39 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2BCEF68CC0F; Thu, 4 Jan 2024 14:53:36 +0200 (EET) Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8B23668C5FF for ; Thu, 4 Jan 2024 14:53:30 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 232E8E7C20 for ; Thu, 4 Jan 2024 13:53:30 +0100 (CET) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0NODYTdxRPVl for ; Thu, 4 Jan 2024 13:53:26 +0100 (CET) Received: from iq (iq [217.27.212.140]) by iq.passwd.hu (Postfix) with ESMTPS id CF076E7B93 for ; Thu, 4 Jan 2024 13:53:26 +0100 (CET) Date: Thu, 4 Jan 2024 13:53:26 +0100 (CET) From: Marton Balint To: FFmpeg development discussions and patches In-Reply-To: <20231229185059.18462-3-cus@passwd.hu> Message-ID: References: <20231229185059.18462-1-cus@passwd.hu> <20231229185059.18462-3-cus@passwd.hu> MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH 3/3] fftools/ffmpeg_filter: log an information message about filter graph reconfigurations 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Fri, 29 Dec 2023, Marton Balint wrote: > Filter graph reconfigurations can cause nontrivial issues, e.g. PTS > discontinuities, so it is better to warn the user about them. > Will apply soon. Regards, Marton > Signed-off-by: Marton Balint > --- > 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". > _______________________________________________ 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".