[FFmpeg-cvslog] dshow: properly disconnect and remove filters from graph

[Ramiro Polla]

ffmpeg | branch: master | Ramiro Polla <ramiro.polla at gmail.com> | Fri Sep  2 01:35:47 2011 -0300| [ff5e1b0b7a975fc84137381dd15dcc5a5ff21a78] | committer: Michael Niedermayer

dshow: properly disconnect and remove filters from graph

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ff5e1b0b7a975fc84137381dd15dcc5a5ff21a78
---

 libavdevice/dshow.c |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c
index 9913569..10e3d4f 100644
--- a/libavdevice/dshow.c
+++ b/libavdevice/dshow.c
@@ -92,11 +92,7 @@ dshow_read_close(AVFormatContext *s)
         IMediaControl_Stop(ctx->control);
         IMediaControl_Release(ctx->control);
     }
-    if (ctx->graph)
-        IGraphBuilder_Release(ctx->graph);
 
-    /* FIXME remove filters from graph */
-    /* FIXME disconnect pins */
     if (ctx->capture_pin[VideoDevice])
         libAVPin_Release(ctx->capture_pin[VideoDevice]);
     if (ctx->capture_pin[AudioDevice])
@@ -115,6 +111,20 @@ dshow_read_close(AVFormatContext *s)
     if (ctx->device_filter[AudioDevice])
         IBaseFilter_Release(ctx->device_filter[AudioDevice]);
 
+    if (ctx->graph) {
+        IEnumFilters *fenum;
+        int r;
+        r = IGraphBuilder_EnumFilters(ctx->graph, &fenum);
+        if (r == S_OK) {
+            IBaseFilter *f;
+            IEnumFilters_Reset(fenum);
+            while (IEnumFilters_Next(fenum, 1, &f, NULL) == S_OK)
+                IGraphBuilder_RemoveFilter(ctx->graph, f);
+            IEnumFilters_Release(fenum);
+        }
+        IGraphBuilder_Release(ctx->graph);
+    }
+
     if (ctx->device_name[0])
         av_free(ctx->device_name[0]);
     if (ctx->device_name[1])