Changeset 42838 in vbox for trunk/src/VBox/Main/xml

Timestamp:

Aug 16, 2012 9:21:09 AM (13 years ago)

Author:

vboxsync

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

80095

Message:

Main/EncodeAndVideoRecording Module and API implementation: Integrating an independent encoding and video recording module that will serve all the frontends.
Introducing settings settings and API implementation for accessing and modifying video recording parameters:
->target video capture file
->video capture width
->video capture height
->enable video capturing

Location:

trunk/src/VBox/Main/xml

Files:

• Settings.cpp (modified) (5 diffs)
• VirtualBox-settings-common.xsd (modified) (1 diff)

trunk/src/VBox/Main/xml/Settings.cpp

@@ -1589 +1589 @@
 #endif
 
-/**
- * Hardware struct constructor.
- */
 Hardware::Hardware()
         : strVersion("1"),
@@ -1610 +1607 @@
           fAccelerate3D(false),
           fAccelerate2DVideo(false),
+          ulVideoCaptureHorzRes(640),
+          ulVideoCaptureVertRes(480),
+          fVideoCaptureEnabled(false),
+          strVideoCaptureFile("Test.webm"),
           firmwareType(FirmwareType_BIOS),
           pointingHIDType(PointingHIDType_PS2Mouse),
@@ -1674 +1675 @@
                   && (fAccelerate3D             == h.fAccelerate3D)
                   && (fAccelerate2DVideo        == h.fAccelerate2DVideo)
+                  && (fVideoCaptureEnabled      == h.fVideoCaptureEnabled)
+                  && (strVideoCaptureFile       == h.strVideoCaptureFile)
+                  && (ulVideoCaptureHorzRes     == h.ulVideoCaptureHorzRes)
+                  && (ulVideoCaptureVertRes     == h.ulVideoCaptureVertRes)
                   && (firmwareType              == h.firmwareType)
                   && (pointingHIDType           == h.pointingHIDType)
@@ -2556 +2561 @@
             pelmHwChild->getAttributeValue("accelerate2DVideo", hw.fAccelerate2DVideo);
         }
+        else if (pelmHwChild->nameEquals("VideoRecording"))
+        {
+            pelmHwChild->getAttributeValue("enabled", hw.fVideoCaptureEnabled);
+            pelmHwChild->getAttributeValue("file",    hw.strVideoCaptureFile);
+            pelmHwChild->getAttributeValue("horzRes", hw.ulVideoCaptureHorzRes);
+            pelmHwChild->getAttributeValue("vertRes", hw.ulVideoCaptureVertRes);
+        }
+
         else if (pelmHwChild->nameEquals("RemoteDisplay"))
         {
@@ -3702 +3715 @@
     if (m->sv >= SettingsVersion_v1_8)
         pelmDisplay->setAttribute("accelerate2DVideo", hw.fAccelerate2DVideo);
+    xml::ElementNode *pelmVideoCapture = pelmHardware->createChild("VideoRecording");
+
+    if (m->sv >= SettingsVersion_v1_12)
+    {
+        pelmVideoCapture->setAttribute("enabled", hw.fVideoCaptureEnabled);
+        pelmVideoCapture->setAttribute("file",    hw.strVideoCaptureFile);
+        pelmVideoCapture->setAttribute("horzRes", hw.ulVideoCaptureHorzRes);
+        pelmVideoCapture->setAttribute("vertRes", hw.ulVideoCaptureVertRes);
+    }
 
     xml::ElementNode *pelmVRDE = pelmHardware->createChild("RemoteDisplay");

trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd

@@ -460 +460 @@
 
 <xsd:complexType name="TDisplay">
+  <xsd:element name="VideoRecording">
+    <xsd:complexType>
+      <xsd:attribute name="enabled" type="xsd:boolean"/>
+      <xsd:attribute name="file" type="xsd:string"/>
+      <xsd:attribute name="horzRes" use="required">
+        <xsd:simpleType>
+          <xsd:restriction base="xsd:unsignedInt">
+            <xsd:minInclusive value="4"/>
+            <xsd:maxInclusive value="2097152"/>
+           </xsd:restriction>
+         </xsd:simpleType>
+      </xsd:attribute>
+      <xsd:attribute name="vertRes" type="xsd:unsignedInt"/>
+    </xsd:complexType>
+  </xsd:element>
   <xsd:attribute name="VRAMSize" use="required">
     <xsd:simpleType>