TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove dependency on ATL, and add the fugliest, most horrible hack to keep using the interfaces from the defunct qedit.h header.

Browse Source
This commit is contained in:
rdb 2013-08-26 14:33:01 +00:00
parent 3edcc13ac3
commit 7346306437
1 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
panda/src/vision/webcamVideoDS.cxx
View File

@ -29,7 +29,7 @@
// //
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
#ifdef HAVE_DIRECTCAM #if defined(HAVE_DIRECTCAM) && !defined(CPPPARSER)
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
@ -61,19 +61,28 @@
#include <string.h> #include <string.h>
#include <windows.h> #include <windows.h>
// NOTE: there is a problem with dxtrans.h missing from newer Microsoft DirectX SDKs (including March 2009) // This used to work back when qedit.h still existed. The hacks
// See "dxtrans.h missing in Microsoft DirectX SDK" at // served to prevent it from including the defunct dxtrans.h.
// http://social.msdn.microsoft.com/forums/en-US/windowssdk/thread/ed097d2c-3d68-448-8448-277eaaf68252/ for example. //#pragma include_alias( "dxtrans.h", "qedit.h" )
// This header file is referenced only by qedit.h and not needed. //#define __IDxtCompositor_INTERFACE_DEFINED__
// Solution: add this pragma and these defines before the qedit.h inclusion: //#define __IDxtAlphaSetter_INTERFACE_DEFINED__
#pragma include_alias( "dxtrans.h", "qedit.h" ) //#define __IDxtJpeg_INTERFACE_DEFINED_
#define __IDxtCompositor_INTERFACE_DEFINED__ //#define __IDxtKey_INTERFACE_DEFINED__
#define __IDxtAlphaSetter_INTERFACE_DEFINED__ //#define IDXEffect IUnknown
#define __IDxtJpeg_INTERFACE_DEFINED_ //#include <qedit.h>
#define __IDxtKey_INTERFACE_DEFINED__
#define IDXEffect IUnknown // We can use this fugly hack to still access the qedit.h interfaces.
#include <qedit.h> // When this stops working, we'll have to just copy the relevant
#include <atlbase.h> // definitions to this file.
#import "libid:78530B68-61F9-11D2-8CAD-00A024580902" \
no_namespace named_guids raw_interfaces_only no_implementation \
exclude("_AMMediaType", "_FilterState", "IReferenceClock", "IMediaFilter", \
"_PinDirection", "IEnumMediaTypes", "IFilterGraph", "_FilterInfo", \
"IGraphBuilder", "IBaseFilter", "_PinInfo", "IPin", "IEnumPins", \
"IEnumFilters", "IEnumMediaTypes", "IAMSetErrorLog","IAMTimelineObj", \
"IMediaDet", "IMediaSample", "IPersistStream", "IPersist", "IStream", \
"ISequentialStream", "_LARGE_INTEGER", "_ULARGE_INTEGER", \
"tagSTATSTG", "_FILETIME", "IPropertyBag", "IErrorLog")
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Class : WebcamVideoDS // Class : WebcamVideoDS
@ -161,7 +170,7 @@ public:
ICaptureGraphBuilder2 *_pCaptureBuilder; ICaptureGraphBuilder2 *_pCaptureBuilder;
IBaseFilter *_pSrcFilter; IBaseFilter *_pSrcFilter;
IAMStreamConfig *_pStreamConfig; IAMStreamConfig *_pStreamConfig;
CComPtr<ISampleGrabber> _pSampleGrabber; ISampleGrabber *_pSampleGrabber;
IBaseFilter *_pStreamRenderer; IBaseFilter *_pStreamRenderer;
IMediaControl *_pMediaCtrl; IMediaControl *_pMediaCtrl;
// IMemAllocator *_pAllocator; // IMemAllocator *_pAllocator;
@ -500,13 +509,16 @@ WebcamVideoCursorDS(WebcamVideoDS *src) :
cleanup(); return; cleanup(); return;
} }
_pSampleGrabber.CoCreateInstance(CLSID_SampleGrabber); hResult = CoCreateInstance(CLSID_SampleGrabber, NULL, CLSCTX_INPROC, IID_PPV_ARGS(&_pSampleGrabber));
if(!_pSampleGrabber) if(hResult != S_OK)
{ cerr << " Can not create the sample grabber, maybe qedit.dll is not registered?"; { cerr << " Can not create the sample grabber, maybe qedit.dll is not registered?";
cleanup(); return; } cleanup(); return; }
CComQIPtr< IBaseFilter, &IID_IBaseFilter > pGrabberFilter(_pSampleGrabber); //hResult = CoCreateInstance(CLSID_SampleGrabber,)
//CComQIPtr< IBaseFilter, &IID_IBaseFilter > pGrabberFilter(_pSampleGrabber);
IBaseFilter *pGrabberFilter = NULL;
hResult = _pSampleGrabber->QueryInterface(IID_PPV_ARGS(&pGrabberFilter));
cerr << " IID_IBaseFilter of CLSID_SampleGrabber is acquired.\n"; cerr << " IID_IBaseFilter of CLSID_SampleGrabber is acquired.\n";
ZeroMemory(&mediaType, sizeof(AM_MEDIA_TYPE)); ZeroMemory(&mediaType, sizeof(AM_MEDIA_TYPE));
@ -604,6 +616,11 @@ WebcamVideoCursorDS(WebcamVideoDS *src) :
mediaType.pUnk=NULL; mediaType.pUnk=NULL;
} }
if(pGrabberFilter != NULL) {
pGrabberFilter->Release();
pGrabberFilter=NULL;
}
_pSampleGrabber->SetBufferSamples(FALSE); _pSampleGrabber->SetBufferSamples(FALSE);
_pSampleGrabber->SetOneShot(FALSE); _pSampleGrabber->SetOneShot(FALSE);
@ -635,7 +652,7 @@ cleanup() {
if(_pMediaCtrl) { _pMediaCtrl->Release(); _pMediaCtrl=NULL; } if(_pMediaCtrl) { _pMediaCtrl->Release(); _pMediaCtrl=NULL; }
if(_pCaptureBuilder) { _pCaptureBuilder->Release(); _pCaptureBuilder=NULL; } if(_pCaptureBuilder) { _pCaptureBuilder->Release(); _pCaptureBuilder=NULL; }
if(_pGraphBuilder) { _pGraphBuilder->Release(); _pGraphBuilder=NULL; } if(_pGraphBuilder) { _pGraphBuilder->Release(); _pGraphBuilder=NULL; }
if(_pSampleGrabber.p) { _pSampleGrabber.Release(); } if(_pSampleGrabber) { _pSampleGrabber->Release(); _pSampleGrabber=NULL; }
if(_pStreamRenderer) { _pStreamRenderer->Release(); _pStreamRenderer=NULL; } if(_pStreamRenderer) { _pStreamRenderer->Release(); _pStreamRenderer=NULL; }
if(_pSrcFilter) { _pSrcFilter->Release(); _pSrcFilter=NULL; } if(_pSrcFilter) { _pSrcFilter->Release(); _pSrcFilter=NULL; }
if(_pStreamConfig) { _pStreamConfig->Release(); _pStreamConfig=NULL; } if(_pStreamConfig) { _pStreamConfig->Release(); _pStreamConfig=NULL; }