]> git.sesse.net Git - vlc/blobdiff - modules/access/dshow/filter.cpp
* modules/access/dshow/*: fixed a problem when we would sometimes get stuck trying...
[vlc] / modules / access / dshow / filter.cpp
index fcfb55d0ed1a01856448b004597a7fbf629b5a48..174cc5859c48e5c54898dc38014e02d5395d58fd 100644 (file)
@@ -2,7 +2,7 @@
  * filter.c : DirectShow access module for vlc
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: filter.cpp,v 1.1 2003/08/24 11:17:39 gbazin Exp $
+ * $Id: filter.cpp,v 1.10 2003/12/15 00:47:18 gbazin Exp $
  *
  * Author: Gildas Bazin <gbazin@netcourrier.com>
  *
 #include <vlc/input.h>
 #include <vlc/vout.h>
 
-#ifndef _MSC_VER
-#   include <wtypes.h>
-#   include <unknwn.h>
-#   include <ole2.h>
-#   include <limits.h>
-#   define _WINGDI_ 1
-#   define AM_NOVTABLE
-#   define _OBJBASE_H_
-#   undef _X86_
-#   define _I64_MAX LONG_LONG_MAX
-#   define LONGLONG long long
-#endif
-
-#include <dshow.h>
-
 #include "filter.h"
 
 #define DEBUG_DSHOW 1
 
+struct access_sys_t
+{
+    vlc_mutex_t lock;
+    vlc_cond_t  wait;
+};
+
 /*****************************************************************************
  * DirectShow GUIDs.
  * Easier to define them hear as mingw doesn't provide them all.
  *****************************************************************************/
 const GUID CLSID_SystemDeviceEnum = {0x62be5d10, 0x60eb, 0x11d0, {0xbd, 0x3b, 0x00, 0xa0, 0xc9, 0x11, 0xce, 0x86}};
 const GUID CLSID_VideoInputDeviceCategory = {0x860BB310,0x5D01,0x11d0,{0xBD,0x3B,0x00,0xA0,0xC9,0x11,0xCE,0x86}};
+const GUID CLSID_AudioInputDeviceCategory = {0x33d9a762, 0x90c8, 0x11d0, {0xbd, 0x43, 0x00, 0xa0, 0xc9, 0x11, 0xce, 0x86}};
 const GUID IID_IPropertyBag = {0x55272A00, 0x42CB, 0x11CE, {0x81, 0x35, 0x00, 0xAA, 0x00, 0x4B, 0xB8, 0x51}};
 const GUID IID_ICreateDevEnum = {0x29840822, 0x5b84, 0x11d0, {0xbd, 0x3b, 0x00, 0xa0, 0xc9, 0x11, 0xce, 0x86}};
 const GUID IID_IFilterGraph = {0x56a8689f, 0x0ad4, 0x11ce, {0xb0, 0x3a, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}};
@@ -73,11 +65,20 @@ const GUID IID_IMemInputPin = {0x56a8689d, 0x0ad4, 0x11ce, {0xb0,0x3a, 0x00,0x20
 const GUID IID_IEnumPins = {0x56a86892, 0x0ad4, 0x11ce, {0xb0,0x3a, 0x00,0x20,0xaf,0x0b,0xa7,0x70}};
 const GUID IID_IEnumMediaTypes = {0x89c31040, 0x846b, 0x11ce, {0x97,0xd3, 0x00,0xaa,0x00,0x55,0x59,0x5a}};
 
+const GUID IID_IAMBufferNegotiation = {0x56ed71a0, 0xaf5f, 0x11d0, {0xb3, 0xf0, 0x00, 0xaa, 0x00, 0x37, 0x61, 0xc5}};
+
+const GUID IID_ISpecifyPropertyPages = {0xb196b28b, 0xbab4, 0x101a, {0xb6, 0x9c, 0x00, 0xaa, 0x00, 0x34, 0x1d, 0x07}};
+
 /*
  * MEDIATYPEs and MEDIASUBTYPEs
  */
 const GUID MEDIATYPE_Video = {0x73646976, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
+const GUID MEDIASUBTYPE_PREVIEW_VIDEO = {0x2859e1da, 0xb81f, 0x4fbd, {0x94, 0x3b, 0xe2, 0x37, 0x24, 0xa1, 0xab, 0xb3}};
+const GUID MEDIATYPE_Stream = {0xe436eb83, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}};
 
+/* Packed RGB formats */
+const GUID MEDIASUBTYPE_RGB1 = {0xe436eb78, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}};
+const GUID MEDIASUBTYPE_RGB4 = {0xe436eb79, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}};
 const GUID MEDIASUBTYPE_RGB8 = {0xe436eb7a, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}};
 const GUID MEDIASUBTYPE_RGB565 = {0xe436eb7b, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}};
 const GUID MEDIASUBTYPE_RGB555 = {0xe436eb7c, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}};
@@ -85,14 +86,38 @@ const GUID MEDIASUBTYPE_RGB24 = {0xe436eb7d, 0x524f, 0x11ce, {0x9f, 0x53, 0x00,
 const GUID MEDIASUBTYPE_RGB32 = {0xe436eb7e, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}};
 const GUID MEDIASUBTYPE_ARGB32 = {0x773c9ac0, 0x3274, 0x11d0, {0xb7, 0x24, 0x0, 0xaa, 0x0, 0x6c, 0x1a, 0x1}};
 
+/* Packed YUV formats */
 const GUID MEDIASUBTYPE_YUYV = {0x56595559, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
 const GUID MEDIASUBTYPE_Y411 = {0x31313459, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
-const GUID MEDIASUBTYPE_Y41P = {0x50313459, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
+const GUID MEDIASUBTYPE_Y211 = {0x31313259, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
 const GUID MEDIASUBTYPE_YUY2 = {0x32595559, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
 const GUID MEDIASUBTYPE_YVYU = {0x55595659, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
 const GUID MEDIASUBTYPE_UYVY = {0x59565955, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
-const GUID MEDIASUBTYPE_Y211 = {0x31313259, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
+
+/* Planar YUV formats */
+const GUID MEDIASUBTYPE_YVU9 = {0x39555659, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
 const GUID MEDIASUBTYPE_YV12 = {0x32315659, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
+const GUID MEDIASUBTYPE_IYUV = {0x56555949, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; /* identical to YV12 */
+const GUID MEDIASUBTYPE_Y41P = {0x50313459, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
+const GUID MEDIASUBTYPE_I420 = {0x30323449, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
+
+const GUID MEDIATYPE_Audio = {0x73647561, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
+const GUID FORMAT_WaveFormatEx = {0x05589f81, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}};
+const GUID MEDIASUBTYPE_PCM = {0x00000001, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
+const GUID MEDIASUBTYPE_IEEE_FLOAT = {0x00000003, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
+
+/* DV formats */
+const GUID MEDIASUBTYPE_dvsd = {0x64737664, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
+const GUID MEDIASUBTYPE_dvhd = {0x64687664, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
+const GUID MEDIASUBTYPE_dvsl = {0x6c737664, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
+
+/* MPEG2 formats */
+const GUID MEDIASUBTYPE_MPEG2_VIDEO = {0xe06d8026, 0xdb46, 0x11cf, {0xb4, 0xd1, 0x00, 0x80, 0x5f, 0x6c, 0xbb, 0xea}};
+const GUID MEDIASUBTYPE_MPEG2_PROGRAM = {0xe06d8022, 0xdb46, 0x11cf, {0xb4, 0xd1, 0x00, 0x80, 0x5f, 0x6c, 0xbb, 0xea}};
+const GUID MEDIASUBTYPE_MPEG2_TRANSPORT = {0xe06d8023, 0xdb46, 0x11cf, {0xb4, 0xd1, 0x00, 0x80, 0x5f, 0x6c, 0xbb, 0xea}};
+const GUID FORMAT_MPEG2Video = {0xe06d80e3, 0xdb46, 0x11cf, {0xb4, 0xd1, 0x00, 0x80, 0x5f, 0x6c, 0xbb, 0xea}};
+
+const GUID GUID_NULL = {0x0000, 0x0000, 0x0000, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}};
 
 void WINAPI FreeMediaType( AM_MEDIA_TYPE& mt )
 {
@@ -139,24 +164,36 @@ HRESULT WINAPI CopyMediaType( AM_MEDIA_TYPE *pmtTarget,
  * Implementation of our dummy directshow filter pin class
  ****************************************************************************/
 
-CapturePin::CapturePin( input_thread_t * _p_input, CaptureFilter *_p_filter )
+CapturePin::CapturePin( input_thread_t * _p_input, CaptureFilter *_p_filter,
+                        AM_MEDIA_TYPE mt )
   : p_input( _p_input ), p_filter( _p_filter ), p_connected_pin( NULL ),
-    i_ref( 1 )
+    media_type( mt ), i_ref( 1 )
 {
 }
 
 CapturePin::~CapturePin()
 {
+#ifdef DEBUG_DSHOW
+    msg_Dbg( p_input, "CapturePin::~CapturePin" );
+#endif
 }
 
 HRESULT CapturePin::CustomGetSample( VLCMediaSample *vlc_sample )
 {
+#if 0 //def DEBUG_DSHOW
+    msg_Dbg( p_input, "CapturePin::CustomGetSample" );
+#endif
+
+    access_sys_t *p_sys = p_input->p_access_data;
+    vlc_mutex_lock( &p_sys->lock );
     if( samples_queue.size() )
     {
         *vlc_sample = samples_queue.back();
         samples_queue.pop_back();
+        vlc_mutex_unlock( &p_sys->lock );
         return S_OK;
     }
+    vlc_mutex_unlock( &p_sys->lock );
     return S_FALSE;
 }
 
@@ -175,11 +212,13 @@ STDMETHODIMP CapturePin::QueryInterface(REFIID riid, void **ppv)
     if( riid == IID_IUnknown ||
         riid == IID_IPin )
     {
+        AddRef();
         *ppv = (IPin *)this;
         return NOERROR;
     }
     if( riid == IID_IMemInputPin )
     {
+        AddRef();
         *ppv = (IMemInputPin *)this;
         return NOERROR;
     }
@@ -192,22 +231,20 @@ STDMETHODIMP CapturePin::QueryInterface(REFIID riid, void **ppv)
 STDMETHODIMP_(ULONG) CapturePin::AddRef()
 {
 #ifdef DEBUG_DSHOW
-    msg_Dbg( p_input, "CapturePin::AddRef" );
+    msg_Dbg( p_input, "CapturePin::AddRef (ref: %i)", i_ref );
 #endif
 
-    i_ref++;
-    return NOERROR;
+    return i_ref++;
 };
 STDMETHODIMP_(ULONG) CapturePin::Release()
 {
 #ifdef DEBUG_DSHOW
-    msg_Dbg( p_input, "CapturePin::Release" );
+    msg_Dbg( p_input, "CapturePin::Release (ref: %i)", i_ref );
 #endif
 
-    i_ref--;
-    if( !i_ref ) delete this;
+    if( !InterlockedDecrement(&i_ref) ) delete this;
 
-    return NOERROR;
+    return 0;
 };
 
 /* IPin methods */
@@ -226,8 +263,29 @@ STDMETHODIMP CapturePin::ReceiveConnection( IPin * pConnector,
     msg_Dbg( p_input, "CapturePin::ReceiveConnection" );
 #endif
 
+    if( pmt->majortype == MEDIATYPE_Video )
+    {
+        if( media_type.subtype != GUID_NULL &&
+            media_type.subtype != pmt->subtype )
+            return VFW_E_TYPE_NOT_ACCEPTED;
+
+        if( media_type.pbFormat &&
+            ((VIDEOINFOHEADER *)media_type.pbFormat)->bmiHeader.biHeight &&
+            ((VIDEOINFOHEADER *)media_type.pbFormat)->bmiHeader.biHeight !=
+            ((VIDEOINFOHEADER *)pmt->pbFormat)->bmiHeader.biHeight )
+            return VFW_E_TYPE_NOT_ACCEPTED;
+
+        if( media_type.pbFormat &&
+            ((VIDEOINFOHEADER *)media_type.pbFormat)->bmiHeader.biWidth &&
+            ((VIDEOINFOHEADER *)media_type.pbFormat)->bmiHeader.biWidth !=
+            ((VIDEOINFOHEADER *)pmt->pbFormat)->bmiHeader.biWidth )
+            return VFW_E_TYPE_NOT_ACCEPTED;
+    }
+
     p_connected_pin = pConnector;
     p_connected_pin->AddRef();
+
+    FreeMediaType( media_type );
     return CopyMediaType( &media_type, pmt );
 }
 STDMETHODIMP CapturePin::Disconnect()
@@ -236,7 +294,21 @@ STDMETHODIMP CapturePin::Disconnect()
     msg_Dbg( p_input, "CapturePin::Disconnect" );
 #endif
 
-    p_connected_pin->Release();
+    VLCMediaSample vlc_sample;
+    access_sys_t *p_sys = p_input->p_access_data;
+
+#if 0 // FIXME: This does seem to create crashes sometimes
+    vlc_mutex_lock( &p_sys->lock );
+    while( samples_queue.size() )
+    {
+        vlc_sample = samples_queue.back();
+        samples_queue.pop_back();
+        vlc_sample.p_sample->Release();
+    }
+    vlc_mutex_unlock( &p_sys->lock );
+#endif
+
+    if( p_connected_pin ) p_connected_pin->Release();
     p_connected_pin = NULL;
     FreeMediaType( media_type );
     return S_OK;
@@ -247,6 +319,8 @@ STDMETHODIMP CapturePin::ConnectedTo( IPin **pPin )
     msg_Dbg( p_input, "CapturePin::ConnectedTo" );
 #endif
 
+    if( !p_connected_pin ) return VFW_E_NOT_CONNECTED;
+
     p_connected_pin->AddRef();
     *pPin = p_connected_pin;
 
@@ -371,17 +445,21 @@ STDMETHODIMP CapturePin::GetAllocatorRequirements( ALLOCATOR_PROPERTIES *pProps
 #ifdef DEBUG_DSHOW
     msg_Dbg( p_input, "CapturePin::GetAllocatorRequirements" );
 #endif
+
     return E_NOTIMPL;
 }
 STDMETHODIMP CapturePin::Receive( IMediaSample *pSample )
 {
-#ifdef DEBUG_DSHOW
+#if 0 //def DEBUG_DSHOW
     msg_Dbg( p_input, "CapturePin::Receive" );
 #endif
 
-    //pSample->AddRef();
+    pSample->AddRef();
     mtime_t i_timestamp = mdate() * 10;
     VLCMediaSample vlc_sample = {pSample, i_timestamp};
+
+    access_sys_t *p_sys = p_input->p_access_data;
+    vlc_mutex_lock( &p_sys->lock );
     samples_queue.push_front( vlc_sample );
 
     /* Make sure we don't cache too many samples */
@@ -390,9 +468,12 @@ STDMETHODIMP CapturePin::Receive( IMediaSample *pSample )
         vlc_sample = samples_queue.back();
         samples_queue.pop_back();
         msg_Dbg( p_input, "CapturePin::Receive trashing late input sample" );
-        // vlc_sample.p_sample->Release();
+        vlc_sample.p_sample->Release();
     }
 
+    vlc_cond_signal( &p_sys->wait );
+    vlc_mutex_unlock( &p_sys->lock );
+
     return S_OK;
 }
 STDMETHODIMP CapturePin::ReceiveMultiple( IMediaSample **pSamples,
@@ -427,14 +508,17 @@ STDMETHODIMP CapturePin::ReceiveCanBlock( void )
  * Implementation of our dummy directshow filter class
  ****************************************************************************/
 
-CaptureFilter::CaptureFilter( input_thread_t * _p_input )
-  : p_input( _p_input ), p_pin( new CapturePin( _p_input, this ) ),
-    i_ref( 1 )
+CaptureFilter::CaptureFilter( input_thread_t * _p_input, AM_MEDIA_TYPE mt )
+  : p_input( _p_input ), p_pin( new CapturePin( _p_input, this, mt ) ),
+    media_type( mt ), i_ref( 1 )
 {
 }
 
 CaptureFilter::~CaptureFilter()
 {
+#ifdef DEBUG_DSHOW
+    msg_Dbg( p_input, "CaptureFilter::~CaptureFilter" );
+#endif
     p_pin->Release();
 }
 
@@ -447,21 +531,25 @@ STDMETHODIMP CaptureFilter::QueryInterface( REFIID riid, void **ppv )
 
     if( riid == IID_IUnknown )
     {
+        AddRef();
         *ppv = (IUnknown *)this;
         return NOERROR;
     }
     if( riid == IID_IPersist )
     {
+        AddRef();
         *ppv = (IPersist *)this;
         return NOERROR;
     }
     if( riid == IID_IMediaFilter )
     {
+        AddRef();
         *ppv = (IMediaFilter *)this;
         return NOERROR;
     }
     if( riid == IID_IBaseFilter )
     {
+        AddRef();
         *ppv = (IBaseFilter *)this;
         return NOERROR;
     }
@@ -474,22 +562,20 @@ STDMETHODIMP CaptureFilter::QueryInterface( REFIID riid, void **ppv )
 STDMETHODIMP_(ULONG) CaptureFilter::AddRef()
 {
 #ifdef DEBUG_DSHOW
-    msg_Dbg( p_input, "CaptureFilter::AddRef" );
+    msg_Dbg( p_input, "CaptureFilter::AddRef (ref: %i)", i_ref );
 #endif
 
-    i_ref++;
-    return NOERROR;
+    return i_ref++;
 };
 STDMETHODIMP_(ULONG) CaptureFilter::Release()
 {
 #ifdef DEBUG_DSHOW
-    msg_Dbg( p_input, "CaptureFilter::Release" );
+    msg_Dbg( p_input, "CaptureFilter::Release (ref: %i)", i_ref );
 #endif
 
-    i_ref--;
-    if( !i_ref ) delete this;
+    if( !InterlockedDecrement(&i_ref) ) delete this;
 
-    return NOERROR;
+    return 0;
 };
 
 /* IPersist method */
@@ -505,7 +591,7 @@ STDMETHODIMP CaptureFilter::GetClassID(CLSID *pClsID)
 STDMETHODIMP CaptureFilter::GetState(DWORD dwMSecs, FILTER_STATE *State)
 {
 #ifdef DEBUG_DSHOW
-    msg_Dbg( p_input, "CaptureFilter::GetStat" );
+    msg_Dbg( p_input, "CaptureFilter::GetState" );
 #endif
     return E_NOTIMPL;
 };
@@ -522,28 +608,30 @@ STDMETHODIMP CaptureFilter::GetSyncSource(IReferenceClock **pClock)
 #ifdef DEBUG_DSHOW
     msg_Dbg( p_input, "CaptureFilter::GetSyncSource" );
 #endif
-    return E_NOTIMPL;
+
+    *pClock = NULL;
+    return NOERROR;
 };
 STDMETHODIMP CaptureFilter::Stop()
 {
 #ifdef DEBUG_DSHOW
     msg_Dbg( p_input, "CaptureFilter::Stop" );
 #endif
-    return E_NOTIMPL;
+    return S_OK;
 };
 STDMETHODIMP CaptureFilter::Pause()
 {
 #ifdef DEBUG_DSHOW
     msg_Dbg( p_input, "CaptureFilter::Pause" );
 #endif
-    return E_NOTIMPL;
+    return S_OK;
 };
 STDMETHODIMP CaptureFilter::Run(REFERENCE_TIME tStart)
 {
 #ifdef DEBUG_DSHOW
     msg_Dbg( p_input, "CaptureFilter::Run" );
 #endif
-    return E_NOTIMPL;
+    return S_OK;
 };
 
 /* IBaseFilter methods */
@@ -628,6 +716,9 @@ CaptureEnumPins::CaptureEnumPins( input_thread_t * _p_input,
 
 CaptureEnumPins::~CaptureEnumPins()
 {
+#ifdef DEBUG_DSHOW
+    msg_Dbg( p_input, "CaptureEnumPins::~CaptureEnumPins" );
+#endif
     p_filter->Release();
 }
 
@@ -641,6 +732,7 @@ STDMETHODIMP CaptureEnumPins::QueryInterface( REFIID riid, void **ppv )
     if( riid == IID_IUnknown ||
         riid == IID_IEnumPins )
     {
+        AddRef();
         *ppv = (IEnumPins *)this;
         return NOERROR;
     }
@@ -653,22 +745,20 @@ STDMETHODIMP CaptureEnumPins::QueryInterface( REFIID riid, void **ppv )
 STDMETHODIMP_(ULONG) CaptureEnumPins::AddRef()
 {
 #ifdef DEBUG_DSHOW
-    msg_Dbg( p_input, "CaptureEnumPins::AddRef" );
+    msg_Dbg( p_input, "CaptureEnumPins::AddRef (ref: %i)", i_ref );
 #endif
 
-    i_ref++;
-    return NOERROR;
+    return i_ref++;
 };
 STDMETHODIMP_(ULONG) CaptureEnumPins::Release()
 {
 #ifdef DEBUG_DSHOW
-    msg_Dbg( p_input, "CaptureEnumPins::Release" );
+    msg_Dbg( p_input, "CaptureEnumPins::Release (ref: %i)", i_ref );
 #endif
 
-    i_ref--;
-    if( !i_ref ) delete this;
+    if( !InterlockedDecrement(&i_ref) ) delete this;
 
-    return NOERROR;
+    return 0;
 };
 
 /* IEnumPins */
@@ -688,10 +778,9 @@ STDMETHODIMP CaptureEnumPins::Next( ULONG cPins, IPin ** ppPins,
         pPin->AddRef();
         *pcFetched = 1;
         i_position++;
-        return NOERROR;
     }
 
-    return S_FALSE;
+    return *pcFetched == cPins ? NOERROR : S_FALSE;
 };
 STDMETHODIMP CaptureEnumPins::Skip( ULONG cPins )
 {
@@ -741,7 +830,6 @@ CaptureEnumMediaTypes::CaptureEnumMediaTypes( input_thread_t * _p_input,
     p_pin->AddRef();
 
     /* Are we creating a new enumerator */
-
     if( pEnumMediaTypes == NULL )
     {
         i_position = 0;
@@ -754,6 +842,9 @@ CaptureEnumMediaTypes::CaptureEnumMediaTypes( input_thread_t * _p_input,
 
 CaptureEnumMediaTypes::~CaptureEnumMediaTypes()
 {
+#ifdef DEBUG_DSHOW
+    msg_Dbg( p_input, "CaptureEnumMediaTypes::~CaptureEnumMediaTypes" );
+#endif
     p_pin->Release();
 }
 
@@ -767,6 +858,7 @@ STDMETHODIMP CaptureEnumMediaTypes::QueryInterface( REFIID riid, void **ppv )
     if( riid == IID_IUnknown ||
         riid == IID_IEnumMediaTypes )
     {
+        AddRef();
         *ppv = (IEnumMediaTypes *)this;
         return NOERROR;
     }
@@ -779,22 +871,20 @@ STDMETHODIMP CaptureEnumMediaTypes::QueryInterface( REFIID riid, void **ppv )
 STDMETHODIMP_(ULONG) CaptureEnumMediaTypes::AddRef()
 {
 #ifdef DEBUG_DSHOW
-    msg_Dbg( p_input, "CaptureEnumMediaTypes::AddRef" );
+    msg_Dbg( p_input, "CaptureEnumMediaTypes::AddRef (ref: %i)", i_ref );
 #endif
 
-    i_ref++;
-    return NOERROR;
+    return i_ref++;
 };
 STDMETHODIMP_(ULONG) CaptureEnumMediaTypes::Release()
 {
 #ifdef DEBUG_DSHOW
-    msg_Dbg( p_input, "CaptureEnumMediaTypes::Release" );
+    msg_Dbg( p_input, "CaptureEnumMediaTypes::Release (ref: %i)", i_ref );
 #endif
 
-    i_ref--;
-    if( !i_ref ) delete this;
+    if( !InterlockedDecrement(&i_ref) ) delete this;
 
-    return NOERROR;
+    return 0;
 };
 
 /* IEnumMediaTypes */
@@ -806,20 +896,7 @@ STDMETHODIMP CaptureEnumMediaTypes::Next( ULONG cMediaTypes,
     msg_Dbg( p_input, "CaptureEnumMediaTypes::Next" );
 #endif
 
-    *pcFetched = 0;
-
-#if 0
-    if( i_position < 1 && cMediaTypes > 0 )
-    {
-        IPin *pPin = p_pin->CustomGetPin();
-        *ppMediaTypes = pPin;
-        pPin->AddRef();
-        *pcFetched = 1;
-        i_position++;
-        return NOERROR;
-    }
-#endif
-
+    if( pcFetched ) *pcFetched = 0;
     return S_FALSE;
 };
 STDMETHODIMP CaptureEnumMediaTypes::Skip( ULONG cMediaTypes )
@@ -828,13 +905,7 @@ STDMETHODIMP CaptureEnumMediaTypes::Skip( ULONG cMediaTypes )
     msg_Dbg( p_input, "CaptureEnumMediaTypes::Skip" );
 #endif
 
-    if( cMediaTypes > 1 )
-    {
-        return S_FALSE;
-    }
-
-    i_position += cMediaTypes;
-    return NOERROR;
+    return S_FALSE;
 };
 STDMETHODIMP CaptureEnumMediaTypes::Reset()
 {