diff mbox series

[FFmpeg-devel,v2,1/3] avfilter/avfilter: Don't use AVFrame.channel_layout

Message ID AS8P250MB0744D403B53AE037FB556D358F449@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM
State Accepted
Commit f4af504a1ff2561c9980a61ec2394841f35911df
Headers show
Series [FFmpeg-devel,v2,1/3] avfilter/avfilter: Don't use AVFrame.channel_layout | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Andreas Rheinhardt Sept. 12, 2022, 4:05 p.m. UTC 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavfilter/avfilter.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

Comments

Nicolas George Sept. 13, 2022, 8:46 a.m. UTC | #1 
Andreas Rheinhardt (12022-09-12):
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  libavfilter/avfilter.c | 12 ++++++++++--
>  1 file changed, 10 insertions(+), 2 deletions(-)

Series should be ok.

Regards,
Andreas Rheinhardt Sept. 14, 2022, 12:34 p.m. UTC | #2 
Nicolas George:
> Andreas Rheinhardt (12022-09-12):
>> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
>> ---
>>  libavfilter/avfilter.c | 12 ++++++++++--
>>  1 file changed, 10 insertions(+), 2 deletions(-)
> 
> Series should be ok.
> 
> Regards,
> 

Thanks for the review. Will apply this tonight unless there are objections.

- Andreas
diff mbox series

Patch

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 965f5d0f63..bde41637dd 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -21,6 +21,7 @@ 
 
 #include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
+#include "libavutil/bprint.h"
 #include "libavutil/buffer.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
@@ -45,6 +46,7 @@ 
 
 static void tlog_ref(void *ctx, AVFrame *ref, int end)
 {
+#ifdef TRACE
     ff_tlog(ctx,
             "ref[%p buf:%p data:%p linesize[%d, %d, %d, %d] pts:%"PRId64" pos:%"PRId64,
             ref, ref->buf, ref->data[0],
@@ -61,13 +63,19 @@  static void tlog_ref(void *ctx, AVFrame *ref, int end)
                 av_get_picture_type_char(ref->pict_type));
     }
     if (ref->nb_samples) {
-        ff_tlog(ctx, " cl:%"PRId64"d n:%d r:%d",
-                ref->channel_layout,
+        AVBPrint bprint;
+
+        av_bprint_init(&bprint, 1, AV_BPRINT_SIZE_UNLIMITED);
+        av_channel_layout_describe_bprint(&ref->ch_layout, &bprint);
+        ff_tlog(ctx, " cl:%s n:%d r:%d",
+                bprint.str,
                 ref->nb_samples,
                 ref->sample_rate);
+        av_bprint_finalize(&bprint, NULL);
     }
 
     ff_tlog(ctx, "]%s", end ? "\n" : "");
+#endif
 }
 
 void ff_command_queue_pop(AVFilterContext *filter)