Changeset 359

Timestamp:

Jan 30, 2015, 5:12:31 AM (9 years ago)

Author:

roman

Message:

Suppress exceptions on missing property pages in property frame helper; Suppress exceptions on reading non-implemented properties via IQualProp

Location:

trunk/DirectShowSpy

Files:

• FilterGraphHelper.h (modified) (1 diff)
• Module.rc (modified) (previous)
• RunPropertyBag.h (modified) (1 diff)
• _Bin/DirectShowSpy-Win32.dll (modified) (previous)
• _Bin/DirectShowSpy-x64.dll (modified) (previous)

trunk/DirectShowSpy/FilterGraphHelper.h

@@ -1885 +1885 @@
                                                 const CLSID& ClassIdentifier = pClassIdentifiers[nPageIndex];
                                                 if(ClassIdentifier == CLSID_NULL)
-                                                        continue;
+                                                        continue; // Fake
                                                 _ATLTRY
                                                 {
                                                         CComPtr<IPropertyPage> pPropertyPage;
-                                                        __C(pPropertyPage.CoCreateInstance(ClassIdentifier));
+                                                        const HRESULT nCoCreateInstanceResult = pPropertyPage.CoCreateInstance(ClassIdentifier);
+                                                        _A(SUCCEEDED(nCoCreateInstanceResult) || nCoCreateInstanceResult == REGDB_E_CLASSNOTREG);
+                                                        if(nCoCreateInstanceResult == REGDB_E_CLASSNOTREG)
+                                                                continue; // Missing [Optional] Page
+                                                        __C(nCoCreateInstanceResult);
                                                         CData Data(pBaseFilter, ClassIdentifier, pPropertyPage);
                                                         Data.m_pSite.Construct()->Initialize(this, pBaseFilter, pPropertyPage);

trunk/DirectShowSpy/RunPropertyBag.h

@@ -66 +66 @@
                                 {
                                         INT nFramesDroppedInRenderer, nFramesDrawn, nAvgFrameRate, nJitter, nAvgSyncOffset, nDevSyncOffset;
-                                        __C(pQualProp->get_FramesDroppedInRenderer(&nFramesDroppedInRenderer));
-                                        __C(pQualProp->get_FramesDrawn(&nFramesDrawn));
-                                        __C(pQualProp->get_AvgFrameRate(&nAvgFrameRate));
-                                        __C(pQualProp->get_Jitter(&nJitter));
-                                        __C(pQualProp->get_AvgSyncOffset(&nAvgSyncOffset));
-                                        __C(pQualProp->get_DevSyncOffset(&nDevSyncOffset));
-                                        PropertyBagNeeded(pPropertyBag);
-                                        pPropertyBag->WriteValue(_T("FramesDroppedInRenderer"), CComVariant((LONG) nFramesDroppedInRenderer));
-                                        pPropertyBag->WriteValue(_T("FramesDrawn"), CComVariant((LONG) nFramesDrawn));
-                                        pPropertyBag->WriteValue(_T("AvgFrameRate"), CComVariant((DOUBLE) nAvgFrameRate / 100));
-                                        pPropertyBag->WriteValue(_T("Jitter"), CComVariant((LONG) nJitter));
-                                        pPropertyBag->WriteValue(_T("AvgSyncOffset"), CComVariant((LONG) nAvgSyncOffset));
-                                        pPropertyBag->WriteValue(_T("DevSyncOffset"), CComVariant((LONG) nDevSyncOffset));
+                                        // NOTE: IQualProp methods are not implemented on EVR even though the interface itself is exposed
+                                        const HRESULT nGetAvgFrameRateResult = pQualProp->get_AvgFrameRate(&nAvgFrameRate);
+                                        if(SUCCEEDED(nGetAvgFrameRateResult))
+                                        {
+                                                __C(pQualProp->get_FramesDroppedInRenderer(&nFramesDroppedInRenderer));
+                                                __C(pQualProp->get_FramesDrawn(&nFramesDrawn));
+                                                //__C(pQualProp->get_AvgFrameRate(&nAvgFrameRate));
+                                                __C(pQualProp->get_Jitter(&nJitter));
+                                                __C(pQualProp->get_AvgSyncOffset(&nAvgSyncOffset));
+                                                __C(pQualProp->get_DevSyncOffset(&nDevSyncOffset));
+                                                PropertyBagNeeded(pPropertyBag);
+                                                pPropertyBag->WriteValue(_T("FramesDroppedInRenderer"), CComVariant((LONG) nFramesDroppedInRenderer));
+                                                pPropertyBag->WriteValue(_T("FramesDrawn"), CComVariant((LONG) nFramesDrawn));
+                                                pPropertyBag->WriteValue(_T("AvgFrameRate"), CComVariant((DOUBLE) nAvgFrameRate / 100));
+                                                pPropertyBag->WriteValue(_T("Jitter"), CComVariant((LONG) nJitter));
+                                                pPropertyBag->WriteValue(_T("AvgSyncOffset"), CComVariant((LONG) nAvgSyncOffset));
+                                                pPropertyBag->WriteValue(_T("DevSyncOffset"), CComVariant((LONG) nDevSyncOffset));
+                                        }
                                 }
                                 _ATLCATCHALL()