Changeset 46465 in vbox for trunk/src/VBox/Main

Timestamp:

Jun 10, 2013 2:11:26 PM (11 years ago)

Author:

vboxsync

Message:

Main/VPX: introduced onVideoCaptureChange event

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (5 diffs)
• include/ConsoleImpl.h (modified) (1 diff)
• include/DisplayImpl.h (modified) (1 diff)
• include/MachineImpl.h (modified) (3 diffs)
• include/SessionImpl.h (modified) (1 diff)
• src-client/ConsoleImpl.cpp (modified) (1 diff)
• src-client/DisplayImpl.cpp (modified) (2 diffs)
• src-client/SessionImpl.cpp (modified) (1 diff)
• src-server/MachineImpl.cpp (modified) (9 diffs)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -14900 +14900 @@
     </method>
 
-    <method name="enableVideoCapture">
-      <desc>
-        Start/continue video capture.
+    <method name="enableVideoCaptureScreens">
+      <desc>
+        Start/stop video capture on selected screens.
       </desc>
       <param name="screens" type="boolean" safearray="yes" dir="in">
         <desc>
-          The screens to start/continue capturing.
-        </desc>
-      </param>
-    </method>
-
-    <method name="disableVideoCapture">
-      <desc>
-        Stop video capture.
-      </desc>
-      <param name="screens" type="boolean" safearray="yes" dir="in">
-        <desc>
-          The screens to stop capturing.
+          The screens to start/stop capturing.
         </desc>
       </param>
@@ -17103 +17092 @@
         <desc>Flag whether the server must be restarted</desc>
       </param>
+    </method>
+
+    <method name="onVideoCaptureChange">
+      <desc>
+        Triggered when video capture settings have changed.
+      </desc>
     </method>
 
@@ -18791 +18786 @@
   <enum
     name="VBoxEventType"
-    uuid="c51645b3-7108-4dce-b5a3-bbf5e4f69ed2"
+    uuid="f019b8c7-22a6-468a-9f7c-3443b7b6c40a"
     >
 
@@ -19150 +19145 @@
       </desc>
     </const>
+    <const name="OnVideoCaptureChanged" value="91">
+      <desc>
+        See <link to="IVideoCaptureChangedEvent">IVideoCapturedChangeEvent</link>.
+      </desc>
+    </const>
     <!-- Last event marker -->
-    <const name="Last" value="91">
+    <const name="Last" value="92">
       <desc>
         Must be last event, used for iterations and structures relying on numerical event values.
@@ -20353 +20353 @@
       should use <link to="IConsole::VRDEServerInfo">IVRDEServerInfo</link>
       attributes to find out what is the current status.
+    </desc>
+  </interface>
+  
+  <interface
+    name="IVideoCaptureChangedEvent" extends="IEvent"
+    uuid="6215d169-25dd-4719-ab34-c908701efb58"
+    wsmap="managed" autogen="VBoxEvent" id="OnVideoCaptureChanged"
+    >
+    <desc>
+      Notification when video capture settings have changed.
     </desc>
   </interface>

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

@@ -201 +201 @@
     HRESULT onDragAndDropModeChange(DragAndDropMode_T aDragAndDropMode);
     HRESULT onVRDEServerChange(BOOL aRestart);
+    HRESULT onVideoCaptureChange();
     HRESULT onUSBControllerChange();
     HRESULT onSharedFolderChange(BOOL aGlobal);

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

@@ -170 +170 @@
     STDMETHOD(TakeScreenShotToArray)(ULONG aScreenId, ULONG width, ULONG height, ComSafeArrayOut(BYTE, aScreenData));
     STDMETHOD(TakeScreenShotPNGToArray)(ULONG aScreenId, ULONG width, ULONG height, ComSafeArrayOut(BYTE, aScreenData));
-    STDMETHOD(EnableVideoCapture)(ComSafeArrayIn(BOOL, aScreens));
-    STDMETHOD(DisableVideoCapture)(ComSafeArrayIn(BOOL, aScreens));
+    STDMETHOD(EnableVideoCaptureScreens)(ComSafeArrayIn(BOOL, aScreens));
     STDMETHOD(DrawToScreen)(ULONG aScreenId, BYTE *address, ULONG x, ULONG y, ULONG width, ULONG height);
     STDMETHOD(InvalidateAndUpdate)();

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

@@ -741 +741 @@
     virtual HRESULT onBandwidthGroupChange(IBandwidthGroup * /* aBandwidthGroup */) { return S_OK; }
     virtual HRESULT onStorageDeviceChange(IMediumAttachment * /* mediumAttachment */, BOOL /* remove */, BOOL /* silent */) { return S_OK; }
+    virtual HRESULT onVideoCaptureChange() { return S_OK; }
 
     HRESULT saveRegistryEntry(settings::MachineRegistryEntry &data);
@@ -1119 +1120 @@
     HRESULT onParallelPortChange(IParallelPort *parallelPort);
     HRESULT onCPUChange(ULONG aCPU, BOOL aRemove);
-    HRESULT onCPUExecutionCapChange(ULONG aCpuExecutionCap);
     HRESULT onVRDEServerChange(BOOL aRestart);
+    HRESULT onVideoCaptureChange();
     HRESULT onUSBControllerChange();
     HRESULT onUSBDeviceAttach(IUSBDevice *aDevice,
@@ -1132 +1133 @@
     HRESULT onBandwidthGroupChange(IBandwidthGroup *aBandwidthGroup);
     HRESULT onStorageDeviceChange(IMediumAttachment *aMediumAttachment, BOOL aRemove, BOOL aSilent);
+    HRESULT onCPUExecutionCapChange(ULONG aCpuExecutionCap);
 
     bool hasMatchingUSBFilter(const ComObjPtr<HostUSBDevice> &aDevice, ULONG *aMaskedIfs);

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

@@ -93 +93 @@
     STDMETHOD(OnCPUExecutionCapChange)(ULONG aExecutionCap);
     STDMETHOD(OnVRDEServerChange)(BOOL aRestart);
+    STDMETHOD(OnVideoCaptureChange)();
     STDMETHOD(OnUSBControllerChange)();
     STDMETHOD(OnSharedFolderChange)(BOOL aGlobal);

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -5101 +5101 @@
 }
 
+HRESULT Console::onVideoCaptureChange()
+{
+    AutoCaller autoCaller(this);
+    AssertComRCReturnRC(autoCaller.rc());
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    SafeArray<BOOL> screens;
+    HRESULT rc = mMachine->COMGETTER(VideoCaptureScreens)(ComSafeArrayAsOutParam(screens));
+    if (mDisplay)
+    {
+        if (SUCCEEDED(rc))
+            rc = mDisplay->EnableVideoCaptureScreens(ComSafeArrayAsInParam(screens));
+        if (SUCCEEDED(rc))
+            fireVideoCaptureChangedEvent(mEventSource);
+    }
+
+    return rc;
+}
 
 /**

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -2674 +2674 @@
 }
 
-STDMETHODIMP Display::EnableVideoCapture(ComSafeArrayIn(BOOL, aScreens))
+STDMETHODIMP Display::EnableVideoCaptureScreens(ComSafeArrayIn(BOOL, aScreens))
 {
 #ifdef VBOX_WITH_VPX
     com::SafeArray<LONG> Screens(ComSafeArrayInArg(aScreens));
     for (unsigned i = 0; i < Screens.size(); i++)
-        if (Screens[i])
-            maVideoRecEnabled[i] = true;
-    return S_OK;
-#else
-    return E_NOTIMPL;
-#endif
-}
-
-STDMETHODIMP Display::DisableVideoCapture(ComSafeArrayIn(BOOL, aScreens))
-{
-#ifdef VBOX_WITH_VPX
-    com::SafeArray<LONG> Screens(ComSafeArrayInArg(aScreens));
-    for (unsigned i = 0; i < Screens.size(); i++)
-        if (Screens[i])
-            maVideoRecEnabled[i] = false;
+        maVideoRecEnabled[i] = aScreens[i];
     return S_OK;
 #else
@@ -4467 +4453 @@
         }
         com::SafeArray<BOOL> screens;
-        int hrc = pMachine->COMGETTER(VideoCaptureScreens)(ComSafeArrayAsOutParam(screens));
+        HRESULT hrc = pMachine->COMGETTER(VideoCaptureScreens)(ComSafeArrayAsOutParam(screens));
         AssertComRCReturnRC(hrc);
         for (unsigned i = 0; i < RT_ELEMENTS(pDisplay->maVideoRecEnabled); i++)

trunk/src/VBox/Main/src-client/SessionImpl.cpp

@@ -642 +642 @@
 
     return mConsole->onVRDEServerChange(aRestart);
+}
+
+STDMETHODIMP Session::OnVideoCaptureChange()
+{
+    LogFlowThisFunc(("\n"));
+
+    AutoCaller autoCaller(this);
+    AssertComRCReturn(autoCaller.rc(), autoCaller.rc());
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    AssertReturn(mState == SessionState_Locked, VBOX_E_INVALID_VM_STATE);
+    AssertReturn(mType == SessionType_WriteLock, VBOX_E_INVALID_OBJECT_STATE);
+    AssertReturn(mConsole, VBOX_E_INVALID_OBJECT_STATE);
+
+    return mConsole->onVideoCaptureChange();
 }
 

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

@@ -1721 +1721 @@
 STDMETHODIMP Machine::COMSETTER(VideoCaptureEnabled)(BOOL fEnabled)
 {
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
+    HRESULT rc = S_OK;
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    rc = checkStateDependency(MutableStateDep);
+    if (FAILED(rc)) return rc;
+
+    setModified(IsModified_MachineData);
+    mHWData.backup();
+
     mHWData->mVideoCaptureEnabled = fEnabled;
-    return S_OK;
+
+    return rc;
 }
 
@@ -1732 +1741 @@
 {
     CheckComArgOutSafeArrayPointerValid(aScreens);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
     SafeArray<BOOL> screens(mHWData->mMonitorCount);
@@ -1744 +1758 @@
     SafeArray<BOOL> screens(ComSafeArrayInArg(aScreens));
     AssertReturn(screens.size() <= RT_ELEMENTS(mHWData->maVideoCaptureScreens), E_INVALIDARG);
+    bool fChanged = false;
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
     for (unsigned i = 0; i < screens.size(); i++)
-        mHWData->maVideoCaptureScreens[i] = RT_BOOL(screens[i]);
+    {
+        if (mHWData->maVideoCaptureScreens[i] != RT_BOOL(screens[i]))
+        {
+            mHWData->maVideoCaptureScreens[i] = RT_BOOL(screens[i]);
+            fChanged = true;
+        }
+    }
+    if (fChanged)
+    {
+        alock.release();
+        HRESULT rc = onVideoCaptureChange();
+        alock.acquire();
+        if (FAILED(rc)) return rc;
+        setModified(IsModified_MachineData);
+        if (Global::IsOnline(mData->mMachineState))
+            saveSettings(NULL);
+    }
+
     return S_OK;
 }
@@ -1766 +1801 @@
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    HRESULT rc = checkStateDependency(MutableStateDep);
+    if (FAILED(rc)) return rc; 
+
     if (strFile.isEmpty())
        strFile = "VideoCap.webm";
+
+    setModified(IsModified_MachineData);
+    mHWData.backup();
     mHWData->mVideoCaptureFile = strFile;
+
     return S_OK;
 }
@@ -1785 +1828 @@
 {
     AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc()))
-    {
-        LogFlow(("Autolocked failed\n"));
-        return autoCaller.rc();
-    }
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    HRESULT rc = checkStateDependency(MutableStateDep);
+    if (FAILED(rc)) return rc; 
+
+    setModified(IsModified_MachineData);
+    mHWData.backup();
     mHWData->mVideoCaptureWidth = aHorzRes;
+
     return S_OK;
 }
@@ -1811 +1857 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    HRESULT rc = checkStateDependency(MutableStateDep);
+    if (FAILED(rc)) return rc; 
+
+    setModified(IsModified_MachineData);
+    mHWData.backup();
     mHWData->mVideoCaptureHeight = aVertRes;
+
     return S_OK;
 }
@@ -1831 +1884 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    HRESULT rc = checkStateDependency(MutableStateDep);
+    if (FAILED(rc)) return rc;
+
+    setModified(IsModified_MachineData);
+    mHWData.backup();
     mHWData->mVideoCaptureRate = aRate;
+
     return S_OK;
 }
@@ -1851 +1911 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    HRESULT rc = checkStateDependency(MutableStateDep);
+    if (FAILED(rc)) return rc;
+
+    setModified(IsModified_MachineData);
+    mHWData.backup();
     mHWData->mVideoCaptureFps = aFps;
+
     return S_OK;
 }
@@ -13798 +13865 @@
 
 /**
+ * @note Locks this object for reading.
+ */
+HRESULT SessionMachine::onVideoCaptureChange()
+{
+    LogFlowThisFunc(("\n"));
+
+    AutoCaller autoCaller(this);
+    AssertComRCReturn(autoCaller.rc(), autoCaller.rc());
+
+    ComPtr<IInternalSessionControl> directControl;
+    {
+        AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+        directControl = mData->mSession.mDirectControl;
+    }
+
+    /* ignore notifications sent after #OnSessionEnd() is called */
+    if (!directControl)
+        return S_OK;
+
+    return directControl->OnVideoCaptureChange();
+}
+
+/**
  *  @note Locks this object for reading.
  */