[FFmpeg-devel] [PATCH 1/3] all: use av_channel_layout_describe_bprint instead of av_channel_layout_describe in a few places

[FFmpeg-devel] [PATCH 1/3] all: use av_channel_layout_describe_bprint instead of av_channel_layout_describe in a few places

[Marton Balint]

Where an AVBPrint buffer is used later anyway.

Signed-off-by: Marton Balint <cus@passwd.hu>
---
 libavcodec/avcodec.c    | 7 +------
 libavfilter/af_amerge.c | 7 ++-----
 libavfilter/graphdump.c | 4 +---
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c
index 2dda310e91..a6c8629f6c 100644
--- a/libavcodec/avcodec.c
+++ b/libavcodec/avcodec.c
@@ -656,12 +656,7 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
         if (enc->sample_rate) {
             av_bprintf(&bprint, "%d Hz, ", enc->sample_rate);
         }
-        {
-            char buf[512];
-            int ret = av_channel_layout_describe(&enc->ch_layout, buf, sizeof(buf));
-            if (ret >= 0)
-                av_bprintf(&bprint, "%s", buf);
-        }
+        av_channel_layout_describe_bprint(&enc->ch_layout, &bprint);
         if (enc->sample_fmt != AV_SAMPLE_FMT_NONE &&
             (str = av_get_sample_fmt_name(enc->sample_fmt))) {
             av_bprintf(&bprint, ", %s", str);
diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c
index 83318f99e4..eabd3f8262 100644
--- a/libavfilter/af_amerge.c
+++ b/libavfilter/af_amerge.c
@@ -153,7 +153,6 @@ static int config_output(AVFilterLink *outlink)
     AVFilterContext *ctx = outlink->src;
     AMergeContext *s = ctx->priv;
     AVBPrint bp;
-    char buf[128];
     int i;
 
     s->bps = av_get_bytes_per_sample(outlink->format);
@@ -162,12 +161,10 @@ static int config_output(AVFilterLink *outlink)
     av_bprint_init(&bp, 0, AV_BPRINT_SIZE_AUTOMATIC);
     for (i = 0; i < s->nb_inputs; i++) {
         av_bprintf(&bp, "%sin%d:", i ? " + " : "", i);
-        av_channel_layout_describe(&ctx->inputs[i]->ch_layout, buf, sizeof(buf));
-        av_bprintf(&bp, "%s", buf);
+        av_channel_layout_describe_bprint(&ctx->inputs[i]->ch_layout, &bp);
     }
     av_bprintf(&bp, " -> out:");
-    av_channel_layout_describe(&outlink->ch_layout, buf, sizeof(buf));
-    av_bprintf(&bp, "%s", buf);
+    av_channel_layout_describe_bprint(&outlink->ch_layout, &bp);
     av_log(ctx, AV_LOG_VERBOSE, "%s\n", bp.str);
 
     return 0;
diff --git a/libavfilter/graphdump.c b/libavfilter/graphdump.c
index 80f7bf6c98..df79903c52 100644
--- a/libavfilter/graphdump.c
+++ b/libavfilter/graphdump.c
@@ -30,7 +30,6 @@
 static int print_link_prop(AVBPrint *buf, AVFilterLink *link)
 {
     const char *format;
-    char layout[128];
     AVBPrint dummy_buffer;
 
     if (!buf) {
@@ -50,8 +49,7 @@ static int print_link_prop(AVBPrint *buf, AVFilterLink *link)
             format = av_x_if_null(av_get_sample_fmt_name(link->format), "?");
             av_bprintf(buf, "[%dHz %s:",
                        (int)link->sample_rate, format);
-            av_channel_layout_describe(&link->ch_layout, layout, sizeof(layout));
-            av_bprintf(buf, "%s", layout);
+            av_channel_layout_describe_bprint(&link->ch_layout, buf);
             av_bprint_chars(buf, ']', 1);
             break;
 
-- 
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] [PATCH 2/3] fftools/ffmpeg_filter: honor -reinit_filters 0 even on changed display matrix

[Marton Balint]

Not sure about honoring it also in case of a hwaccel change, so left that as is
for now.

Signed-off-by: Marton Balint <cus@passwd.hu>
---
 fftools/ffmpeg_filter.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c
index c1c3014453..680fffb060 100644
--- a/fftools/ffmpeg_filter.c
+++ b/fftools/ffmpeg_filter.c
@@ -2607,13 +2607,6 @@ static int send_frame(FilterGraph *fg, FilterGraphThread *fgt,
         break;
     }
 
-    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;
-
     if (sd = av_frame_get_side_data(frame, AV_FRAME_DATA_DISPLAYMATRIX)) {
         if (!ifp->displaymatrix_present ||
             memcmp(sd->data, ifp->displaymatrix, sizeof(ifp->displaymatrix)))
@@ -2621,6 +2614,13 @@ static int send_frame(FilterGraph *fg, FilterGraphThread *fgt,
     } else if (ifp->displaymatrix_present)
         need_reinit = 1;
 
+    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;
+
     if (need_reinit) {
         ret = ifilter_parameters_from_frame(ifilter, frame);
         if (ret < 0)
-- 
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] [PATCH 3/3] fftools/ffmpeg_filter: log an information message about filter graph reconfigurations

[Marton Balint]

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".

Re: [FFmpeg-devel] [PATCH 3/3] fftools/ffmpeg_filter: log an information message about filter graph reconfigurations

[Marton Balint]

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 <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".
>
_______________________________________________
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] [PATCH v2 3/3] fftools/ffmpeg_filter: log an information message about filter graph reconfigurations

[Marton Balint]

Filter graph reconfigurations can cause nontrivial issues, e.g. PTS
discontinuities, so it is better to warn the user about them.

v2: A recent change extended the video parameters check with color space and
color range, so let's include that in the log, and also make the log message
more clear.

Signed-off-by: Marton Balint <cus@passwd.hu>
---
 fftools/ffmpeg_filter.c | 64 +++++++++++++++++++++++++++++++++--------
 1 file changed, 52 insertions(+), 12 deletions(-)

diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c
index 1a58ec278a..82ee4fae7d 100644
--- a/fftools/ffmpeg_filter.c
+++ b/fftools/ffmpeg_filter.c
@@ -2598,43 +2598,57 @@ 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 const char *unknown_if_null(const char *str)
+{
+    return str ? str : "unknown";
+}
+
 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 ||
-                       ifp->color_space != frame->colorspace ||
-                       ifp->color_range != frame->color_range;
+        if (ifp->format != frame->format ||
+            ifp->width  != frame->width ||
+            ifp->height != frame->height ||
+            ifp->color_space != frame->colorspace ||
+            ifp->color_range != frame->color_range)
+            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);
@@ -2664,6 +2678,32 @@ 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 *sample_format_name = 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, ", unknown_if_null(sample_format_name));
+            }
+            if (need_reinit & VIDEO_CHANGED) {
+                const char *pixel_format_name = av_get_pix_fmt_name(frame->format);
+                const char *color_space_name = av_color_space_name(frame->colorspace);
+                const char *color_range_name = av_color_range_name(frame->color_range);
+                av_bprintf(&reason, "video parameters changed to %s(%s, %s), %dx%d, ",
+                        unknown_if_null(pixel_format_name), unknown_if_null(color_range_name),
+                        unknown_if_null(color_space_name), 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, ");
+            if (reason.len > 1)
+                reason.str[reason.len - 2] = '\0'; // remove last comma
+            av_log(fg, AV_LOG_INFO, "Reconfiguring filter graph%s%s\n", reason.len ? " because " : "", 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".