diff mbox series

[FFmpeg-devel] asetnsamples: add commands and timeline support

Message ID CAPYw7P70pEvToFqcXC5dLu5rqTxX12cO8XJ8p8eZENLZ3gRjtw@mail.gmail.com
State New
Headers show
Series [FFmpeg-devel] asetnsamples: add commands and timeline support | expand

Checks

Context Check Description
yinshiyou/configure_loongarch64 warning Failed to apply patch
andriy/configure_x86 warning Failed to apply patch

Commit Message

Paul B Mahol May 5, 2023, 6:56 p.m. UTC 
Attached.
diff mbox series

Patch

From 462bbdc3cb8516da9f0f752fa43254413666a425 Mon Sep 17 00:00:00 2001
From: Paul B Mahol <onemda@gmail.com>
Date: Fri, 5 May 2023 20:53:39 +0200
Subject: [PATCH 2/2] avfilter/af_asetnsamples: add timeline support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
---
 libavfilter/af_asetnsamples.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/libavfilter/af_asetnsamples.c b/libavfilter/af_asetnsamples.c
index fe6d40f9ca..20cc70ce4a 100644
--- a/libavfilter/af_asetnsamples.c
+++ b/libavfilter/af_asetnsamples.c
@@ -61,12 +61,15 @@  static int activate(AVFilterContext *ctx)
 
     FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink);
 
-    ret = ff_inlink_consume_samples(inlink, s->nb_out_samples, s->nb_out_samples, &frame);
+    if (ctx->is_disabled)
+        ret = ff_inlink_consume_frame(inlink, &frame);
+    else
+        ret = ff_inlink_consume_samples(inlink, s->nb_out_samples, s->nb_out_samples, &frame);
     if (ret < 0)
         return ret;
 
     if (ret > 0) {
-        if (!s->pad || frame->nb_samples == s->nb_out_samples)
+        if (!s->pad || ctx->is_disabled || frame->nb_samples == s->nb_out_samples)
             return ff_filter_frame(outlink, frame);
 
         pad_frame = ff_get_audio_buffer(outlink, s->nb_out_samples);
@@ -123,5 +126,6 @@  const AVFilter ff_af_asetnsamples = {
     FILTER_INPUTS(asetnsamples_inputs),
     FILTER_OUTPUTS(asetnsamples_outputs),
     .activate    = activate,
+    .flags       = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL,
     .process_command = ff_filter_process_command,
 };
-- 
2.39.1