From f176104ed5c7be37f4f0756b7244cbb90c4fe1fe Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 22 Jan 2016 20:36:54 +0100 Subject: command: add af-command command Similar to vf-command. Requested. Untested. --- audio/filter/af.c | 11 +++++++++++ audio/filter/af.h | 2 ++ audio/filter/af_lavfi.c | 8 ++++++++ 3 files changed, 21 insertions(+) (limited to 'audio') diff --git a/audio/filter/af.c b/audio/filter/af.c index 475016d2ea..18019d8930 100644 --- a/audio/filter/af.c +++ b/audio/filter/af.c @@ -696,6 +696,17 @@ int af_control_by_label(struct af_stream *s, int cmd, void *arg, bstr label) } } +int af_send_command(struct af_stream *s, char *label, char *cmd, char *arg) +{ + char *args[2] = {cmd, arg}; + if (strcmp(label, "all") == 0) { + af_control_all(s, AF_CONTROL_COMMAND, args); + return 0; + } else { + return af_control_by_label(s, AF_CONTROL_COMMAND, args, bstr0(label)); + } +} + // Used by filters to add a filtered frame to the output queue. // Ownership of frame is transferred from caller to the filter chain. void af_add_output_frame(struct af_instance *af, struct mp_audio *frame) diff --git a/audio/filter/af.h b/audio/filter/af.h index 0e73693ac9..9c49081f66 100644 --- a/audio/filter/af.h +++ b/audio/filter/af.h @@ -124,6 +124,7 @@ enum af_control { AF_CONTROL_SET_PLAYBACK_SPEED, AF_CONTROL_SET_PLAYBACK_SPEED_RESAMPLE, AF_CONTROL_GET_METADATA, + AF_CONTROL_COMMAND, }; // Argument for AF_CONTROL_SET_PAN_LEVEL @@ -144,6 +145,7 @@ struct af_instance *af_control_any_rev(struct af_stream *s, int cmd, void *arg); void af_control_all(struct af_stream *s, int cmd, void *arg); int af_control_by_label(struct af_stream *s, int cmd, void *arg, bstr label); void af_seek_reset(struct af_stream *s); +int af_send_command(struct af_stream *s, char *label, char *cmd, char *arg); void af_add_output_frame(struct af_instance *af, struct mp_audio *frame); int af_filter_frame(struct af_stream *s, struct mp_audio *frame); diff --git a/audio/filter/af_lavfi.c b/audio/filter/af_lavfi.c index 1960ddc247..616c5425e1 100644 --- a/audio/filter/af_lavfi.c +++ b/audio/filter/af_lavfi.c @@ -222,6 +222,14 @@ static int control(struct af_instance *af, int cmd, void *arg) return mp_audio_config_equals(in, &orig_in) ? AF_OK : AF_FALSE; } + case AF_CONTROL_COMMAND: { + if (!p->graph) + break; + char **args = arg; + return avfilter_graph_send_command(p->graph, "all", + args[0], args[1], &(char){0}, 0, 0) + >= 0 ? CONTROL_OK : CONTROL_ERROR; + } case AF_CONTROL_GET_METADATA: if (p->metadata) { *(struct mp_tags *)arg = *p->metadata; -- cgit v1.2.3