Changeset 48600 in vbox

Timestamp:

Sep 20, 2013 2:30:46 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

89166

Message:

VBoxManage,Main: IHost::VideoCaptureDevices. Windows host implementation.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageList.cpp (modified) (5 diffs)
• Main/Makefile.kmk (modified) (1 diff)
• Main/include/HostVideoCaptureDeviceImpl.h (modified) (1 diff)
• Main/src-server/HostVideoCaptureDeviceImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp

@@ -733 +733 @@
 
 /**
+ * List video capture devices.
+ *
+ * @returns See produceList.
+ * @param   pVirtualBox         Reference to the IVirtualBox pointer.
+ */
+static HRESULT listVideoCaptureDevices(const ComPtr<IVirtualBox> pVirtualBox)
+{
+    HRESULT rc;
+    ComPtr<IHost> host;
+    CHECK_ERROR(pVirtualBox, COMGETTER(Host)(host.asOutParam()));
+    com::SafeIfaceArray<IHostVideoCaptureDevice> hostVideoCaptureDevices;
+    CHECK_ERROR(host, COMGETTER(VideoCaptureDevices)(ComSafeArrayAsOutParam(hostVideoCaptureDevices)));
+    RTPrintf("Video Capture Devices: %u\n", hostVideoCaptureDevices.size());
+    for (size_t i = 0; i < hostVideoCaptureDevices.size(); ++i)
+    {
+        ComPtr<IHostVideoCaptureDevice> p = hostVideoCaptureDevices[i];
+        Bstr name;
+        p->COMGETTER(Name)(name.asOutParam());
+        Bstr path;
+        p->COMGETTER(Path)(path.asOutParam());
+        Bstr alias;
+        p->COMGETTER(Alias)(alias.asOutParam());
+        RTPrintf("%ls \"%ls\"\n%ls\n", alias.raw(), name.raw(), path.raw());
+    }
+    return rc;
+}
+
+
+/**
  * The type of lists we can produce.
  */
@@ -760 +789 @@
     kListExtPacks,
     kListGroups,
-    kListNatNetworks
+    kListNatNetworks,
+    kListVideoCaptureDevices
 };
 
@@ -1094 +1124 @@
         }
 
+        case kListVideoCaptureDevices:
+            rc = listVideoCaptureDevices(pVirtualBox);
+            break;
+
         /* No default here, want gcc warnings. */
 
@@ -1142 +1176 @@
         { "extpacks",           kListExtPacks,           RTGETOPT_REQ_NOTHING },
         { "groups",             kListGroups,             RTGETOPT_REQ_NOTHING },
+        { "webcams",            kListVideoCaptureDevices, RTGETOPT_REQ_NOTHING },
     };
 
@@ -1187 +1222 @@
             case kListGroups:
             case kListNatNetworks:
+            case kListVideoCaptureDevices:
                 enmOptCommand = (enum enmListType)ch;
                 if (fOptMultiple)

trunk/src/VBox/Main/Makefile.kmk

@@ -304 +304 @@
         $(PATH_STAGE_LIB)/SSMStandalone$(VBOX_SUFF_LIB) \
         $(LIB_DDU)
+VBoxSVC_LIBS.win += strmiids.lib
 VBoxSVC_SDKS = VBOX_LIBPNG VBOX_ZLIB
 VBoxSVC_LIBS.solaris = \

trunk/src/VBox/Main/include/HostVideoCaptureDeviceImpl.h

@@ -40 +40 @@
 
     /* Public initializer/uninitializer for internal purposes only. */
-    HRESULT init(com::Utf8Str name, com::Utf8Str path, com::Utf8Str alias);
+    HRESULT init(const com::Utf8Str &name, const com::Utf8Str &path, const com::Utf8Str &alias);
     void uninit();
 

trunk/src/VBox/Main/src-server/HostVideoCaptureDeviceImpl.cpp

@@ -20 +20 @@
 #include "Logging.h"
 
+#ifdef RT_OS_WINDOWS
+#include <dshow.h>
+#endif
+
 /*
  * HostVideoCaptureDevice implementation.
@@ -40 +44 @@
  * Initializes the instance.
  */
-HRESULT HostVideoCaptureDevice::init(com::Utf8Str name, com::Utf8Str path, com::Utf8Str alias)
+HRESULT HostVideoCaptureDevice::init(const com::Utf8Str &name, const com::Utf8Str &path, const com::Utf8Str &alias)
 {
     LogFlowThisFunc(("\n"));
@@ -76 +80 @@
 }
 
+static HRESULT hostVideoCaptureDeviceAdd(HostVideoCaptureDeviceList *pList,
+                                         const com::Utf8Str &name,
+                                         const com::Utf8Str &path,
+                                         const com::Utf8Str &alias)
+{
+    ComObjPtr<HostVideoCaptureDevice> obj;
+    HRESULT hr = obj.createObject();
+    if (SUCCEEDED(hr))
+    {
+        hr = obj->init(name, path, alias);
+        if (SUCCEEDED(hr))
+            pList->push_back(obj);
+    }
+    return hr;
+}
+
+#ifdef RT_OS_WINDOWS
+static HRESULT hvcdCreateEnumerator(IEnumMoniker **ppEnumMoniker)
+{
+    ICreateDevEnum *pCreateDevEnum = NULL;
+    HRESULT hr = CoCreateInstance(CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC_SERVER,
+                                  IID_PPV_ARGS(&pCreateDevEnum));
+    if (SUCCEEDED(hr))
+    {
+        hr = pCreateDevEnum->CreateClassEnumerator(CLSID_VideoInputDeviceCategory, ppEnumMoniker, 0);
+        pCreateDevEnum->Release();
+    }
+    return hr;
+}
+
+static HRESULT hvcdFillList(HostVideoCaptureDeviceList *pList, IEnumMoniker *pEnumMoniker)
+{
+    int iDevice = 0;
+    IMoniker *pMoniker = NULL;
+    while (pEnumMoniker->Next(1, &pMoniker, NULL) == S_OK)
+    {
+        IPropertyBag *pPropBag = NULL;
+        HRESULT hr = pMoniker->BindToStorage(0, 0, IID_PPV_ARGS(&pPropBag));
+        if (FAILED(hr))
+        {
+            pMoniker->Release();
+            continue;
+        }
+
+        VARIANT var;
+        VariantInit(&var);
+
+        hr = pPropBag->Read(L"DevicePath", &var, 0);
+        if (FAILED(hr))
+        {
+            /* Can't use a device without path. */
+            pMoniker->Release();
+            continue;
+        }
+
+        ++iDevice;
+
+        com::Utf8Str path = var.bstrVal;
+        VariantClear(&var);
+
+        hr = pPropBag->Read(L"FriendlyName", &var, 0);
+        if (FAILED(hr))
+        {
+            hr = pPropBag->Read(L"Description", &var, 0);
+        }
+
+        com::Utf8Str name;
+        if (SUCCEEDED(hr))
+        {
+            name = var.bstrVal;
+            VariantClear(&var);
+        }
+        else
+        {
+            name = com::Utf8StrFmt("Video Input Device #%d", iDevice);
+        }
+
+        com::Utf8Str alias = com::Utf8StrFmt(".%d", iDevice);
+
+        hr = hostVideoCaptureDeviceAdd(pList, name, path, alias);
+
+        pPropBag->Release();
+        pMoniker->Release();
+
+        if (FAILED(hr))
+            return hr;
+    }
+
+    return S_OK;
+}
+
+static HRESULT fillDeviceList(HostVideoCaptureDeviceList *pList)
+{
+    IEnumMoniker *pEnumMoniker = NULL;
+    HRESULT hr = hvcdCreateEnumerator(&pEnumMoniker);
+    if (SUCCEEDED(hr))
+    {
+        if (hr != S_FALSE)
+        {
+            /* List not empty */
+            hr = hvcdFillList(pList, pEnumMoniker);
+            pEnumMoniker->Release();
+        }
+        else
+        {
+            hr = S_OK; /* Return empty list. */
+        }
+    }
+    return hr;
+}
+#else
+static HRESULT fillDeviceList(HostVideoCaptureDeviceList *pList)
+{
+    NOREF(pList);
+    return E_NOTIMPL;
+}
+#endif /* RT_OS_WINDOWS */
+
 /* static */ HRESULT HostVideoCaptureDevice::queryHostDevices(HostVideoCaptureDeviceList *pList)
 {
-    HRESULT hr = S_OK;
-#if 0
-    PDARWINETHERNIC pEtherNICs = DarwinGetEthernetControllers();
-    while (pEtherNICs)
-    {
-        ComObjPtr<HostNetworkInterface> IfObj;
-        IfObj.createObject();
-        if (SUCCEEDED(IfObj->init(Bstr(pEtherNICs->szName), Guid(pEtherNICs->Uuid), HostNetworkInterfaceType_Bridged)))
-            list.push_back(IfObj);
-
-        /* next, free current */
-        void *pvFree = pEtherNICs;
-        pEtherNICs = pEtherNICs->pNext;
-        RTMemFree(pvFree);
-    }
-#endif
+    HRESULT hr = fillDeviceList(pList);
+
+    if (FAILED(hr))
+    {
+        pList->clear();
+    }
+
     return hr;
 }