diff options
| -rw-r--r-- | lib/native/windows-64/jdirectshow.dll | bin | 95744 -> 95744 bytes | |||
| -rw-r--r-- | lib/native/windows/jdirectshow.dll | bin | 81920 -> 71680 bytes | |||
| -rw-r--r-- | src/native/windows/directshow/ds_manager.cpp | 234 | ||||
| -rw-r--r-- | src/native/windows/directshow/ds_manager.h | 5 |
4 files changed, 139 insertions, 100 deletions
diff --git a/lib/native/windows-64/jdirectshow.dll b/lib/native/windows-64/jdirectshow.dll Binary files differindex d548eb3..56e0842 100644 --- a/lib/native/windows-64/jdirectshow.dll +++ b/lib/native/windows-64/jdirectshow.dll diff --git a/lib/native/windows/jdirectshow.dll b/lib/native/windows/jdirectshow.dll Binary files differindex 7b920e4..955b502 100644 --- a/lib/native/windows/jdirectshow.dll +++ b/lib/native/windows/jdirectshow.dll diff --git a/src/native/windows/directshow/ds_manager.cpp b/src/native/windows/directshow/ds_manager.cpp index 4dca223..23d7684 100644 --- a/src/native/windows/directshow/ds_manager.cpp +++ b/src/native/windows/directshow/ds_manager.cpp @@ -23,134 +23,168 @@ DSManager* DSManager::m_instance = NULL; DSManager* DSManager::getInstance()
{
- return m_instance;
+ return m_instance;
}
DSManager::DSManager()
{
- CoInitialize(NULL);
- initCaptureDevices();
+ DWORD ret = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
+ if(ret != S_OK && ret != S_FALSE)
+ {
+ //seems to be a problem with COM initialization
+ /*
+ printf("problem\n");fflush(stdout);
+ if(ret == RPC_E_CHANGED_MODE)
+ {
+ printf("rpc\n");fflush(stdout);
+ }
+ else if(ret == E_INVALIDARG)
+ {
+ printf("invalid arg\n");fflush(stdout);
+ }
+ else if(ret == E_OUTOFMEMORY)
+ {
+ printf("outofmemory\n");fflush(stdout);
+ }
+ else if(ret == E_UNEXPECTED)
+ {
+ printf("unexpected\n");fflush(stdout);
+ }
+ */
+
+ comInited = false;
+ return;
+ }
+
+ comInited = true;
+ initCaptureDevices();
}
DSManager::~DSManager()
{
- for(std::list<DSCaptureDevice*>::iterator it = m_devices.begin() ; it != m_devices.end() ; ++it)
- {
- delete *it;
- }
- m_devices.clear();
-
- /* one CoUninitialize per CoInitialize */
- CoUninitialize();
+ for(std::list<DSCaptureDevice*>::iterator it = m_devices.begin() ; it != m_devices.end() ; ++it)
+ {
+ delete *it;
+ }
+ m_devices.clear();
+
+ /* one CoUninitialize per CoInitialize */
+ if(comInited)
+ {
+ CoUninitialize();
+ }
}
bool DSManager::initialize()
{
- if(!m_instance)
- {
- m_instance = new DSManager();
- }
+ if(!m_instance)
+ {
+ m_instance = new DSManager();
+ }
- return m_instance != NULL;
+ return m_instance != NULL;
}
void DSManager::destroy()
{
- if(m_instance)
- {
- delete m_instance;
+ if(m_instance)
+ {
+ delete m_instance;
m_instance = NULL;
- }
+ }
}
std::list<DSCaptureDevice*> DSManager::getDevices() const
{
- return m_devices;
+ return m_devices;
}
size_t DSManager::getDevicesCount()
{
- return m_devices.size();
+ return m_devices.size();
}
void DSManager::initCaptureDevices()
{
- HRESULT ret = 0;
- VARIANT name;
- ICreateDevEnum* devEnum = NULL;
- IEnumMoniker* monikerEnum = NULL;
- IMoniker* moniker = NULL;
-
- /* clean up our list in case of reinitialization */
- for(std::list<DSCaptureDevice*>::iterator it = m_devices.begin() ; it != m_devices.end() ; ++it)
- {
- delete *it;
- }
- m_devices.clear();
-
- /* get the available devices list */
- ret = CoCreateInstance(CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC_SERVER,
- IID_ICreateDevEnum, (void**)&devEnum);
-
- if(FAILED(ret))
- {
- return;
- }
-
- ret = devEnum->CreateClassEnumerator(CLSID_VideoInputDeviceCategory,
- &monikerEnum, NULL);
-
- /* error or no devices */
- if(FAILED(ret) || ret == S_FALSE)
- {
- devEnum->Release();
- return;
- }
-
- /* loop and initialize all available capture devices */
- while(monikerEnum->Next(1, &moniker, 0) == S_OK)
- {
- DSCaptureDevice* captureDevice = NULL;
- IPropertyBag* propertyBag = NULL;
-
- /* get properties of the device */
- ret = moniker->BindToStorage(0, 0, IID_IPropertyBag, (void**)&propertyBag);
- if(!FAILED(ret))
- {
- VariantInit(&name);
-
- ret = propertyBag->Read(L"FriendlyName", &name, 0);
- if(FAILED(ret))
- {
- VariantClear(&name);
- propertyBag->Release();
- moniker->Release();
- continue;
- }
-
- /* create a new capture device */
- captureDevice = new DSCaptureDevice(name.bstrVal);
- /* wprintf(L"%ws\n", name.bstrVal); */
-
- if(captureDevice->initDevice(moniker))
- {
- /* initialization success, add to the list */
- m_devices.push_back(captureDevice);
- }
- else
- {
- printf("failed to initialize device\n");
- delete captureDevice;
- }
-
- /* clean up */
- VariantClear(&name);
- propertyBag->Release();
- }
- moniker->Release();
- }
-
- /* cleanup */
- devEnum->Release();
- monikerEnum->Release();
+ HRESULT ret = 0;
+ VARIANT name;
+ ICreateDevEnum* devEnum = NULL;
+ IEnumMoniker* monikerEnum = NULL;
+ IMoniker* moniker = NULL;
+
+ if(m_devices.size() > 0)
+ {
+ /* clean up our list in case of reinitialization */
+ for(std::list<DSCaptureDevice*>::iterator it = m_devices.begin() ; it != m_devices.end() ; ++it)
+ {
+ delete *it;
+ }
+ m_devices.clear();
+ }
+
+ /* get the available devices list */
+ ret = CoCreateInstance(CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC_SERVER,
+ IID_ICreateDevEnum, (void**)&devEnum);
+
+ if(FAILED(ret))
+ {
+ return;
+ }
+
+ ret = devEnum->CreateClassEnumerator(CLSID_VideoInputDeviceCategory,
+ &monikerEnum, NULL);
+
+ /* error or no devices */
+ if(FAILED(ret) || ret == S_FALSE)
+ {
+ devEnum->Release();
+ return;
+ }
+
+ /* loop and initialize all available capture devices */
+ while(monikerEnum->Next(1, &moniker, 0) == S_OK)
+ {
+ DSCaptureDevice* captureDevice = NULL;
+ IPropertyBag* propertyBag = NULL;
+
+ /* get properties of the device */
+ ret = moniker->BindToStorage(0, 0, IID_IPropertyBag, (void**)&propertyBag);
+ if(!FAILED(ret))
+ {
+ VariantInit(&name);
+
+ ret = propertyBag->Read(L"FriendlyName", &name, 0);
+ if(FAILED(ret))
+ {
+ VariantClear(&name);
+ propertyBag->Release();
+ moniker->Release();
+ continue;
+ }
+
+ /* create a new capture device */
+ captureDevice = new DSCaptureDevice(name.bstrVal);
+ /* wprintf(L"%ws\n", name.bstrVal); */
+
+ if(captureDevice->initDevice(moniker))
+ {
+ /* initialization success, add to the list */
+ m_devices.push_back(captureDevice);
+ }
+ else
+ {
+ printf("failed to initialize device\n");
+ delete captureDevice;
+ }
+
+ /* clean up */
+ VariantClear(&name);
+ propertyBag->Release();
+ }
+ moniker->Release();
+ }
+
+ /* cleanup */
+ devEnum->Release();
+ monikerEnum->Release();
}
diff --git a/src/native/windows/directshow/ds_manager.h b/src/native/windows/directshow/ds_manager.h index 4c6ee08..a50d9ba 100644 --- a/src/native/windows/directshow/ds_manager.h +++ b/src/native/windows/directshow/ds_manager.h @@ -99,6 +99,11 @@ private: * \brief Easy use of template-based list iterator.
*/
typedef std::list<DSCaptureDevice*>::iterator DeviceListIterator;
+
+ /**
+ * If COM backend is initialized.
+ */
+ bool comInited;
};
#endif /* DS_MANAGER_H */
|