diff mbox series

[FFmpeg-devel] avfilter/avfilter: Don't use AVFrame.channel_layout

Message ID AS8P250MB074497EA6BCEE5C930035ECB8F7C9@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM
State Superseded
Headers show
Series [FFmpeg-devel] avfilter/avfilter: Don't use AVFrame.channel_layout | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Andreas Rheinhardt Sept. 4, 2022, 11:30 p.m. UTC 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavfilter/avfilter.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

James Almer Sept. 5, 2022, 12:32 p.m. UTC | #1 
On 9/4/2022 8:30 PM, Andreas Rheinhardt wrote:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>   libavfilter/avfilter.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
> index 965f5d0f63..6740339808 100644
> --- a/libavfilter/avfilter.c
> +++ b/libavfilter/avfilter.c
> @@ -62,7 +62,7 @@ static void tlog_ref(void *ctx, AVFrame *ref, int end)
>       }
>       if (ref->nb_samples) {
>           ff_tlog(ctx, " cl:%"PRId64"d n:%d r:%d",
> -                ref->channel_layout,
> +                ref->ch_layout.order == AV_CHANNEL_ORDER_NATIVE ? ref->ch_layout.u.mask : 0,

Should be ok, but i expect that eventually filters will support and 
start propagating custom layouts (after the old API is gone), so maybe 
using the layout name helpers is a better idea.

>                   ref->nb_samples,
>                   ref->sample_rate);
>       }
diff mbox series

Patch

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 965f5d0f63..6740339808 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -62,7 +62,7 @@  static void tlog_ref(void *ctx, AVFrame *ref, int end)
     }
     if (ref->nb_samples) {
         ff_tlog(ctx, " cl:%"PRId64"d n:%d r:%d",
-                ref->channel_layout,
+                ref->ch_layout.order == AV_CHANNEL_ORDER_NATIVE ? ref->ch_layout.u.mask : 0,
                 ref->nb_samples,
                 ref->sample_rate);
     }