From f69312e329b3c5060f85898f8e88312eb963d91a Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 20 Apr 2014 23:53:59 +0200 Subject: vf: add function to remove a filter from the chain --- video/filter/vf.c | 13 +++++++++++++ video/filter/vf.h | 1 + 2 files changed, 14 insertions(+) diff --git a/video/filter/vf.c b/video/filter/vf.c index 9928b8a37e..ef34b8242d 100644 --- a/video/filter/vf.c +++ b/video/filter/vf.c @@ -119,6 +119,8 @@ static const vf_info_t *const filter_list[] = { NULL }; +static void vf_uninit_filter(vf_instance_t *vf); + static bool get_desc(struct m_obj_desc *dst, int index) { if (index >= MP_ARRAY_SIZE(filter_list) - 1) @@ -282,6 +284,17 @@ static vf_instance_t *vf_open_filter(struct vf_chain *c, const char *name, return vf_open(c, name, args); } +void vf_remove_filter(struct vf_chain *c, struct vf_instance *vf) +{ + assert(vf != c->first && vf != c->last); // these are sentinels + struct vf_instance *prev = c->first; + while (prev && prev->next != vf) + prev = prev->next; + assert(prev); // not inserted + prev->next = vf->next; + vf_uninit_filter(vf); +} + struct vf_instance *vf_append_filter(struct vf_chain *c, const char *name, char **args) { diff --git a/video/filter/vf.h b/video/filter/vf.h index 968e6da225..e186add4d0 100644 --- a/video/filter/vf.h +++ b/video/filter/vf.h @@ -136,6 +136,7 @@ struct mp_image *vf_output_queued_frame(struct vf_chain *c); void vf_seek_reset(struct vf_chain *c); struct vf_instance *vf_append_filter(struct vf_chain *c, const char *name, char **args); +void vf_remove_filter(struct vf_chain *c, struct vf_instance *vf); int vf_append_filter_list(struct vf_chain *c, struct m_obj_settings *list); struct vf_instance *vf_find_by_label(struct vf_chain *c, const char *label); void vf_print_filter_chain(struct vf_chain *c, int msglevel); -- cgit v1.2.3