Changeset 6952 for trunk/src/quartz/ifgraph.c

Timestamp:

Oct 6, 2001, 10:56:18 AM (24 years ago)

Author:

sandervl

Message:

Wine 20011004 resync

File:

• trunk/src/quartz/ifgraph.c (modified) (22 diffs)

trunk/src/quartz/ifgraph.c

@@ -2 +2 @@
  * Implementation of IFilterGraph.
  *
- * FIXME - stub.
- * FIXME - implement IGraphBuilder / IFilterGraph2.
+ * FIXME - create a thread to process some methods correctly.
+ *
+ * FIXME - ReconnectEx
+ * FIXME - process Pause/Stop asynchronously and notify when completed.
+ *
  *
  * hidenori@a2.ctktv.ne.jp
@@ -13 +16 @@
 #include "winbase.h"
 #include "wingdi.h"
+#include "winuser.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
@@ -21 +25 @@
 #include "vfwmsgs.h"
 #include "wine/unicode.h"
+#include "evcode.h"
 
 #include "debugtools.h"
@@ -28 +33 @@
 #include "fgraph.h"
 #include "enumunk.h"
+#include "sysclock.h"
 
 
@@ -75 +81 @@
 
 
+static HRESULT CFilterGraph_GraphChanged( CFilterGraph* This )
+{
+        /* IDistributorNotify_NotifyGraphChange() */
+
+        IMediaEventSink_Notify(CFilterGraph_IMediaEventSink(This),
+                        EC_GRAPH_CHANGED, 0, 0);
+        EnterCriticalSection( &This->m_csGraphVersion );
+        This->m_lGraphVersion ++;
+        LeaveCriticalSection( &This->m_csGraphVersion );
+
+        return NOERROR;
+}
+
+
 /****************************************************************************/
 
@@ -111 +131 @@
 {
         CFilterGraph_THIS(iface,fgraph);
+        FILTER_STATE fs;
         FILTER_INFO     info;
         HRESULT hr;
@@ -120 +141 @@
 
         QUARTZ_CompList_Lock( This->m_pFilterList );
+
+        hr = IMediaFilter_GetState(CFilterGraph_IMediaFilter(This),0,&fs);
+        if ( hr == VFW_S_STATE_INTERMEDIATE )
+                hr = VFW_E_STATE_CHANGED;
+        if ( fs != State_Stopped )
+                hr = VFW_E_NOT_STOPPED;
+        if ( FAILED(hr) )
+                goto end;
+
+        TRACE( "(%p) search the specified name.\n",This );
 
         if ( pName != NULL )
@@ -180 +211 @@
 
 name_ok:
+        TRACE( "(%p) add this filter.\n",This );
+
         /* register this filter. */
         hr = QUARTZ_CompList_AddComp(
@@ -188 +221 @@
 
         hr = IBaseFilter_JoinFilterGraph(pFilter,(IFilterGraph*)iface,pName);
-        if ( FAILED(hr) )
-        {
+        if ( SUCCEEDED(hr) )
+        {
+                EnterCriticalSection( &This->m_csClock );
+                hr = IBaseFilter_SetSyncSource( pFilter, This->m_pClock );
+                LeaveCriticalSection( &This->m_csClock );
+        }
+        if ( FAILED(hr) )
+        {
+                IBaseFilter_JoinFilterGraph(pFilter,NULL,pName);
                 QUARTZ_CompList_RemoveComp(
                         This->m_pFilterList,(IUnknown*)pFilter);
@@ -195 +235 @@
         }
 
-        EnterCriticalSection( &This->m_csGraphVersion );
-        This->m_lGraphVersion ++;
-        LeaveCriticalSection( &This->m_csGraphVersion );
+        hr = CFilterGraph_GraphChanged(This);
+        if ( FAILED(hr) )
+                goto end;
 
         hr = hrSucceeded;
@@ -203 +243 @@
         QUARTZ_CompList_Unlock( This->m_pFilterList );
 
+        TRACE( "(%p) return %08lx\n", This, hr );
+
         return hr;
 }
@@ -211 +253 @@
         CFilterGraph_THIS(iface,fgraph);
         QUARTZ_CompListItem*    pItem;
+        FILTER_STATE fs;
         HRESULT hr = NOERROR;
 
@@ -217 +260 @@
         QUARTZ_CompList_Lock( This->m_pFilterList );
 
+        hr = IMediaFilter_GetState(CFilterGraph_IMediaFilter(This),0,&fs);
+        if ( hr == VFW_S_STATE_INTERMEDIATE )
+                hr = VFW_E_STATE_CHANGED;
+        if ( fs != State_Stopped )
+                hr = VFW_E_NOT_STOPPED;
+        if ( FAILED(hr) )
+                goto end;
+
+        hr = S_FALSE; /* FIXME? */
         pItem = QUARTZ_CompList_SearchComp(
                 This->m_pFilterList, (IUnknown*)pFilter );
@@ -222 +274 @@
         {
                 CFilterGraph_DisconnectAllPins(pFilter);
+                IBaseFilter_SetSyncSource( pFilter, NULL );
                 hr = IBaseFilter_JoinFilterGraph(
                         pFilter, NULL, QUARTZ_CompList_GetDataPtr(pItem) );
@@ -228 +281 @@
         }
 
-        EnterCriticalSection( &This->m_csGraphVersion );
-        This->m_lGraphVersion ++;
-        LeaveCriticalSection( &This->m_csGraphVersion );
-
+        hr = CFilterGraph_GraphChanged(This);
+        if ( FAILED(hr) )
+                goto end;
+
+end:;
         QUARTZ_CompList_Unlock( This->m_pFilterList );
 
@@ -332 +386 @@
         pConnTo = NULL;
         hr = IPin_ConnectedTo(pIn,&pConnTo);
-        if ( FAILED(hr) )
-                goto end;
-        if ( pConnTo != NULL )
+        if ( hr == NOERROR && pConnTo != NULL )
         {
                 IPin_Release(pConnTo);
+                hr = VFW_E_ALREADY_CONNECTED;
                 goto end;
         }
@@ -342 +395 @@
         pConnTo = NULL;
         hr = IPin_ConnectedTo(pOut,&pConnTo);
-        if ( FAILED(hr) )
-                goto end;
-        if ( pConnTo != NULL )
+        if ( hr == NOERROR && pConnTo != NULL )
         {
                 IPin_Release(pConnTo);
-                goto end;
-        }
-
-        hr = IPin_Connect(pIn,pOut,pmt);
-        if ( FAILED(hr) )
-                goto end;
+                hr = VFW_E_ALREADY_CONNECTED;
+                goto end;
+        }
+
+        TRACE("(%p) try to connect %p<->%p\n",This,pIn,pOut);
         hr = IPin_Connect(pOut,pIn,pmt);
         if ( FAILED(hr) )
         {
+                TRACE("(%p)->Connect(%p,%p) hr = %08lx\n",pOut,pIn,pmt,hr);
+                IPin_Disconnect(pOut);
                 IPin_Disconnect(pIn);
                 goto end;
         }
 
-        EnterCriticalSection( &This->m_csGraphVersion );
-        This->m_lGraphVersion ++;
-        LeaveCriticalSection( &This->m_csGraphVersion );
+        hr = CFilterGraph_GraphChanged(This);
+        if ( FAILED(hr) )
+                goto end;
 
 end:
@@ -384 +436 @@
         CFilterGraph_THIS(iface,fgraph);
 
-        FIXME( "(%p)->(%p) stub!\n",This,pPin );
-
-        EnterCriticalSection( &This->m_csGraphVersion );
-        This->m_lGraphVersion ++;
-        LeaveCriticalSection( &This->m_csGraphVersion );
-
-        return E_NOTIMPL;
+        TRACE( "(%p)->(%p)\n",This,pPin );
+
+        return IFilterGraph2_ReconnectEx(iface,pPin,NULL);
 }
 
@@ -397 +445 @@
 {
         CFilterGraph_THIS(iface,fgraph);
-
-        FIXME( "(%p)->(%p) stub!\n",This,pPin );
-
-        EnterCriticalSection( &This->m_csGraphVersion );
-        This->m_lGraphVersion ++;
-        LeaveCriticalSection( &This->m_csGraphVersion );
-
-        return E_NOTIMPL;
+        IPin* pConnTo;
+        HRESULT hr;
+
+        TRACE( "(%p)->(%p)\n",This,pPin );
+
+        QUARTZ_CompList_Lock( This->m_pFilterList );
+
+        pConnTo = NULL;
+        hr = IPin_ConnectedTo(pPin,&pConnTo);
+        if ( hr == NOERROR && pConnTo != NULL )
+        {
+                IPin_Disconnect(pConnTo);
+                IPin_Release(pConnTo);
+        }
+        hr = IPin_Disconnect(pPin);
+        if ( FAILED(hr) )
+                goto end;
+
+        hr = CFilterGraph_GraphChanged(This);
+        if ( FAILED(hr) )
+                goto end;
+
+end:
+        QUARTZ_CompList_Unlock( This->m_pFilterList );
+
+        return hr;
 }
 
@@ -411 +477 @@
 {
         CFilterGraph_THIS(iface,fgraph);
+        IUnknown* punk;
+        IReferenceClock* pClock;
+        HRESULT hr;
 
         FIXME( "(%p)->() stub!\n", This );
-        return E_NOTIMPL;
+
+        /* FIXME - search all filters. */
+
+        hr = QUARTZ_CreateSystemClock( NULL, (void**)&punk );
+        if ( FAILED(hr) )
+                return hr;
+        hr = IUnknown_QueryInterface( punk, &IID_IReferenceClock, (void**)&pClock );    IUnknown_Release( punk );
+        if ( FAILED(hr) )
+                return hr;
+
+        hr = IMediaFilter_SetSyncSource(
+                CFilterGraph_IMediaFilter(This), pClock );
+        IReferenceClock_Release( pClock );
+
+        return hr;
 }
 
@@ -580 +663 @@
 {
         CFilterGraph_THIS(iface,fgraph);
+        HRESULT hr;
 
         FIXME( "(%p)->(%p,%p) stub!\n",This,pPin,pmt );
 
-        EnterCriticalSection( &This->m_csGraphVersion );
-        This->m_lGraphVersion ++;
-        LeaveCriticalSection( &This->m_csGraphVersion );
+        /* reconnect asynchronously. */
+
+        hr = CFilterGraph_GraphChanged(This);
 
         return E_NOTIMPL;
@@ -657 +741 @@
                 if ( pItem == NULL )
                         break;
-                IFilterGraph2_fnRemoveFilter(
+                IFilterGraph2_RemoveFilter(
                         (IFilterGraph2*)(&pfg->fgraph),
                         (IBaseFilter*)QUARTZ_CompList_GetItemPtr(pItem) );