1 files changed, 43 insertions, 12 deletions

diff --git a/filters/f_auto_filters.c b/filters/f_auto_filters.c
index 944fe89eab..a5394dd35a 100644
--- a/filters/f_auto_filters.c
+++ b/filters/f_auto_filters.c
@@ -1,5 +1,7 @@
 #include <math.h>
 
+#include "audio/aframe.h"
+#include "audio/format.h"
 #include "common/common.h"
 #include "common/msg.h"
 #include "options/m_config.h"
@@ -295,7 +297,8 @@ struct mp_filter *mp_autorotate_create(struct mp_filter *parent)
 
 struct aspeed_priv {
     struct mp_subfilter sub;
-    double cur_speed;
+    double cur_speed, cur_speed_drop;
+    int current_filter;
 };
 
 static void aspeed_process(struct mp_filter *f)
@@ -305,26 +308,48 @@ static void aspeed_process(struct mp_filter *f)
     if (!mp_subfilter_read(&p->sub))
         return;
 
-    if (fabs(p->cur_speed - 1.0) < 1e-8) {
+    if (!p->sub.filter)
+        p->current_filter = 0;
+
+    double speed = p->cur_speed * p->cur_speed_drop;
+
+    int req_filter = 0;
+    if (fabs(speed - 1.0) >= 1e-8) {
+        req_filter = p->cur_speed_drop == 1.0 ? 1 : 2;
+        if (p->sub.frame.type == MP_FRAME_AUDIO &&
+            !af_fmt_is_pcm(mp_aframe_get_format(p->sub.frame.data)))
+            req_filter = 2;
+    }
+
+    if (req_filter != p->current_filter) {
         if (p->sub.filter)
-            MP_VERBOSE(f, "removing scaletempo\n");
+            MP_VERBOSE(f, "removing audio speed filter\n");
         if (!mp_subfilter_drain_destroy(&p->sub))
             return;
-    } else if (!p->sub.filter) {
-        MP_VERBOSE(f, "adding scaletempo\n");
-        p->sub.filter =
-            mp_create_user_filter(f, MP_OUTPUT_CHAIN_AUDIO, "scaletempo", NULL);
-        if (!p->sub.filter) {
-            MP_ERR(f, "could not create scaletempo filter\n");
-            mp_subfilter_continue(&p->sub);
-            return;
+
+        if (req_filter) {
+            if (req_filter == 1) {
+                MP_VERBOSE(f, "adding scaletempo\n");
+                p->sub.filter = mp_create_user_filter(f, MP_OUTPUT_CHAIN_AUDIO,
+                                                      "scaletempo", NULL);
+            } else if (req_filter == 2) {
+                MP_VERBOSE(f, "adding drop\n");
+                p->sub.filter = mp_create_user_filter(f, MP_OUTPUT_CHAIN_AUDIO,
+                                                      "drop", NULL);
+            }
+            if (!p->sub.filter) {
+                MP_ERR(f, "could not create filter\n");
+                mp_subfilter_continue(&p->sub);
+                return;
+            }
+            p->current_filter = req_filter;
         }
     }
 
     if (p->sub.filter) {
         struct mp_filter_command cmd = {
             .type = MP_FILTER_COMMAND_SET_SPEED,
-            .speed = p->cur_speed,
+            .speed = speed,
         };
         mp_filter_command(p->sub.filter, &cmd);
     }
@@ -341,6 +366,11 @@ static bool aspeed_command(struct mp_filter *f, struct mp_filter_command *cmd)
         return true;
     }
 
+    if (cmd->type == MP_FILTER_COMMAND_SET_SPEED_DROP) {
+        p->cur_speed_drop = cmd->speed;
+        return true;
+    }
+
     if (cmd->type == MP_FILTER_COMMAND_IS_ACTIVE) {
         cmd->is_active = !!p->sub.filter;
         return true;
@@ -381,6 +411,7 @@ struct mp_filter *mp_autoaspeed_create(struct mp_filter *parent)
 
     struct aspeed_priv *p = f->priv;
     p->cur_speed = 1.0;
+    p->cur_speed_drop = 1.0;
 
     p->sub.in = mp_filter_add_pin(f, MP_PIN_IN, "in");
     p->sub.out = mp_filter_add_pin(f, MP_PIN_OUT, "out");