Changeset 49132 in vbox for trunk/src

Timestamp:

Oct 16, 2013 12:09:56 PM (11 years ago)

Author:

vboxsync

Message:

Main/HostVideoInputDeviceImpl: use VBoxHostWebcamList.

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (1 diff)
• include/HostVideoInputDeviceImpl.h (modified) (1 diff)
• src-server/HostImpl.cpp (modified) (1 diff)
• src-server/HostVideoInputDeviceImpl.cpp (modified) (2 diffs)

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/HostVideoInputDeviceImpl.h

@@ -43 +43 @@
     void uninit();
 
-    static HRESULT queryHostDevices(HostVideoInputDeviceList *pList);
+    static HRESULT queryHostDevices(VirtualBox *pVirtualBox, HostVideoInputDeviceList *pList);
 
 private:

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

@@ -1760 +1760 @@
     HostVideoInputDeviceList list;
 
-    HRESULT hr = HostVideoInputDevice::queryHostDevices(&list);
+    HRESULT hr = HostVideoInputDevice::queryHostDevices(m->pParent, &list);
 
     if (SUCCEEDED(hr))

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

@@ -19 +19 @@
 #include "HostVideoInputDeviceImpl.h"
 #include "Logging.h"
-
-#ifdef RT_OS_WINDOWS
-#include <dshow.h>
+#include "VirtualBoxImpl.h"
+#ifdef VBOX_WITH_EXTPACK
+# include "ExtPackManagerImpl.h"
 #endif
+
+#include <iprt/ldr.h>
+#include <iprt/path.h>
+
+#include <VBox/sup.h>
 
 /*
@@ -96 +101 @@
 }
 
-#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));
+static DECLCALLBACK(int) hostWebcamAdd(void *pvUser,
+                                       const char *pszName,
+                                       const char *pszPath,
+                                       const char *pszAlias,
+                                       uint64_t *pu64Result)
+{
+    HostVideoInputDeviceList *pList = (HostVideoInputDeviceList *)pvUser;
+    HRESULT hr = hostVideoInputDeviceAdd(pList, pszName, pszPath, pszAlias);
+    if (FAILED(hr))
+    {
+        *pu64Result = (uint64_t)hr;
+        return VERR_NOT_SUPPORTED;
+    }
+    return VINF_SUCCESS;
+}
+
+/** @todo These typedefs must be in a header. */
+typedef DECLCALLBACK(int) FNVBOXHOSTWEBCAMADD(void *pvUser,
+                                              const char *pszName,
+                                              const char *pszPath,
+                                              const char *pszAlias,
+                                              uint64_t *pu64Result);
+typedef FNVBOXHOSTWEBCAMADD *PFNVBOXHOSTWEBCAMADD;
+
+typedef DECLCALLBACK(int) FNVBOXHOSTWEBCAMLIST(PFNVBOXHOSTWEBCAMADD pfnWebcamAdd,
+                                               void *pvUser,
+                                               uint64_t *pu64WebcamAddResult);
+typedef FNVBOXHOSTWEBCAMLIST *PFNVBOXHOSTWEBCAMLIST;
+
+static int loadHostWebcamLibrary(const char *pszPath, RTLDRMOD *phmod, PFNVBOXHOSTWEBCAMLIST *ppfn)
+{
+    int rc = VINF_SUCCESS;
+    RTLDRMOD hmod = NIL_RTLDRMOD;
+
+    RTERRINFOSTATIC ErrInfo;
+    RTErrInfoInitStatic(&ErrInfo);
+    if (RTPathHavePath(pszPath))
+        rc = SUPR3HardenedLdrLoadPlugIn(pszPath, &hmod, &ErrInfo.Core);
+    else
+        rc = VERR_INVALID_PARAMETER;
+    if (RT_SUCCESS(rc))
+    {
+        static const char *pszSymbol = "VBoxHostWebcamList";
+        rc = RTLdrGetSymbol(hmod, pszSymbol, (void **)ppfn);
+
+        if (RT_FAILURE(rc) && rc != VERR_SYMBOL_NOT_FOUND)
+            LogRel(("Resolving symbol '%s': %Rrc\n", pszSymbol, rc));
+    }
+    else
+    {
+        LogRel(("Loading the library '%s': %Rrc\n", pszPath, rc));
+        if (RTErrInfoIsSet(&ErrInfo.Core))
+            LogRel(("  %s\n", ErrInfo.Core.pszMsg));
+
+        hmod = NIL_RTLDRMOD;
+    }
+
+    if (RT_SUCCESS(rc))
+    {
+        *phmod = hmod;
+    }
+    else
+    {
+        if (hmod != NIL_RTLDRMOD)
+        {
+            RTLdrClose(hmod);
+            hmod = NIL_RTLDRMOD;
+        }
+    }
+
+    return rc;
+}
+
+static const Utf8Str strExtPackPuel("Oracle VM VirtualBox Extension Pack");
+
+static HRESULT fillDeviceList(VirtualBox *pVirtualBox, HostVideoInputDeviceList *pList)
+{
+    HRESULT hr;
+    Utf8Str strLibrary;
+
+#ifdef VBOX_WITH_EXTPACK
+    ExtPackManager *pExtPackMgr = pVirtualBox->getExtPackManager();
+    hr = pExtPackMgr->getLibraryPathForExtPack("VBoxHostWebcam", &strExtPackPuel, &strLibrary);
+#else
+    hr = E_NOTIMPL;
+#endif
+
     if (SUCCEEDED(hr))
     {
-        hr = pCreateDevEnum->CreateClassEnumerator(CLSID_VideoInputDeviceCategory, ppEnumMoniker, 0);
-        pCreateDevEnum->Release();
-    }
-    return hr;
-}
-
-static HRESULT hvcdFillList(HostVideoInputDeviceList *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))
+        PFNVBOXHOSTWEBCAMLIST pfn = NULL;
+        RTLDRMOD hmod = NIL_RTLDRMOD;
+        int rc = loadHostWebcamLibrary(strLibrary.c_str(), &hmod, &pfn);
+
+        LogRel(("Load [%s] rc %Rrc\n", strLibrary.c_str(), rc));
+
+        if (RT_SUCCESS(rc))
         {
-            pMoniker->Release();
-            continue;
+            uint64_t u64Result = S_OK;
+            rc = pfn(hostWebcamAdd, pList, &u64Result);
+            Log(("VBoxHostWebcamList rc %Rrc, result 0x%08X\n", rc, u64Result));
+            if (RT_FAILURE(rc))
+            {
+                hr = (HRESULT)u64Result;
+            }
+
+            RTLdrClose(hmod);
+            hmod = NIL_RTLDRMOD;
         }
 
-        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);
+            if (RT_FAILURE(rc))
+                hr = pVirtualBox->setError(VBOX_E_IPRT_ERROR,
+                         "Failed to get webcam list: %Rrc", rc);
         }
-        else
-        {
-            name = com::Utf8StrFmt("Video Input Device #%d", iDevice);
-        }
-
-        com::Utf8Str alias = com::Utf8StrFmt(".%d", iDevice);
-
-        hr = hostVideoInputDeviceAdd(pList, name, path, alias);
-
-        pPropBag->Release();
-        pMoniker->Release();
-
-        if (FAILED(hr))
-            return hr;
-    }
-
-    return S_OK;
-}
-
-static HRESULT fillDeviceList(HostVideoInputDeviceList *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(HostVideoInputDeviceList *pList)
-{
-    NOREF(pList);
-    return E_NOTIMPL;
-}
-#endif /* RT_OS_WINDOWS */
-
-/* static */ HRESULT HostVideoInputDevice::queryHostDevices(HostVideoInputDeviceList *pList)
-{
-    HRESULT hr = fillDeviceList(pList);
+
+/* static */ HRESULT HostVideoInputDevice::queryHostDevices(VirtualBox *pVirtualBox, HostVideoInputDeviceList *pList)
+{
+    HRESULT hr = fillDeviceList(pVirtualBox, pList);
 
     if (FAILED(hr))