Index: /trunk/src/VBox/Main/src-client/Recording.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/Recording.cpp	(revision 75391)
+++ /trunk/src/VBox/Main/src-client/Recording.cpp	(revision 75392)
@@ -1,5 +1,5 @@
 /* $Id$ */
 /** @file
- * Recording (with optional audio recording) code.
+ * Recording context code.
  *
  * This code employs a separate encoding thread per recording context
@@ -175,5 +175,5 @@
  *
  * @returns IPRT status code.
- * @param   a_Settings          Capture settings to use for context creation.
+ * @param   a_Settings          Recording settings to use for context creation.
  */
 int RecordingContext::createInternal(const settings::RecordingSettings &a_Settings)
@@ -223,4 +223,9 @@
 }
 
+/**
+ * Starts a recording context by creating its worker thread.
+ *
+ * @returns IPRT status code.
+ */
 int RecordingContext::startInternal(void)
 {
@@ -247,4 +252,9 @@
 }
 
+/**
+ * Stops a recording context by telling the worker thread to stop and finalizing its operation.
+ *
+ * @returns IPRT status code.
+ */
 int RecordingContext::stopInternal(void)
 {
@@ -275,5 +285,5 @@
 
 /**
- * Destroys a recording context.
+ * Destroys a recording context, internal version.
  */
 int RecordingContext::destroyInternal(void)
@@ -324,4 +334,9 @@
 }
 
+/**
+ * Returns a recording context's current settings.
+ *
+ * @returns The recording context's current settings.
+ */
 const settings::RecordingSettings &RecordingContext::GetConfig(void) const
 {
@@ -329,4 +344,10 @@
 }
 
+/**
+ * Returns the recording stream for a specific screen.
+ *
+ * @returns Recording stream for a specific screen, or NULL if not found.
+ * @param   uScreen             Screen ID to retrieve recording stream for.
+ */
 RecordingStream *RecordingContext::getStreamInternal(unsigned uScreen) const
 {
@@ -356,4 +377,9 @@
 }
 
+/**
+ * Returns the number of configured recording streams for a recording context.
+ *
+ * @returns Number of configured recording streams.
+ */
 size_t RecordingContext::GetStreamCount(void) const
 {
@@ -361,4 +387,11 @@
 }
 
+/**
+ * Creates a new recording context.
+ *
+ * @returns IPRT status code.
+ * @param   a_Settings          Recording settings to use for creation.
+ *
+ */
 int RecordingContext::Create(const settings::RecordingSettings &a_Settings)
 {
@@ -366,4 +399,7 @@
 }
 
+/**
+ * Destroys a recording context.
+ */
 int RecordingContext::Destroy(void)
 {
@@ -371,4 +407,9 @@
 }
 
+/**
+ * Starts a recording context.
+ *
+ * @returns IPRT status code.
+ */
 int RecordingContext::Start(void)
 {
@@ -376,4 +417,7 @@
 }
 
+/**
+ * Stops a recording context.
+ */
 int RecordingContext::Stop(void)
 {
@@ -381,4 +425,12 @@
 }
 
+/**
+ * Returns if a specific recoding feature is enabled for at least one of the attached
+ * recording streams or not.
+ *
+ * @returns \c true if at least one recording stream has this feature enabled, or \c false if
+ *          no recording stream has this feature enabled.
+ * @param   enmFeature          Recording feature to check for.
+ */
 bool RecordingContext::IsFeatureEnabled(RecordingFeature_T enmFeature) const
 {
@@ -554,7 +606,7 @@
  */
 int RecordingContext::SendVideoFrame(uint32_t uScreen, uint32_t x, uint32_t y,
-                                   uint32_t uPixelFormat, uint32_t uBPP, uint32_t uBytesPerLine,
-                                   uint32_t uSrcWidth, uint32_t uSrcHeight, uint8_t *puSrcData,
-                                   uint64_t uTimeStampMs)
+                                     uint32_t uPixelFormat, uint32_t uBPP, uint32_t uBytesPerLine,
+                                     uint32_t uSrcWidth, uint32_t uSrcHeight, uint8_t *puSrcData,
+                                     uint64_t uTimeStampMs)
 {
     AssertReturn(uSrcWidth,  VERR_INVALID_PARAMETER);
Index: /trunk/src/VBox/Main/src-client/RecordingStream.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/RecordingStream.cpp	(revision 75391)
+++ /trunk/src/VBox/Main/src-client/RecordingStream.cpp	(revision 75392)
@@ -182,4 +182,11 @@
 }
 
+/**
+ * Parses an options string to configure advanced / hidden / experimental features of a recording stream.
+ * Unknown values will be skipped.
+ *
+ * @returns IPRT status code.
+ * @param   strOptions          Options string to parse.
+ */
 int RecordingStream::parseOptionsString(const com::Utf8Str &strOptions)
 {
@@ -245,4 +252,9 @@
 }
 
+/**
+ * Returns the recording stream's used configuration.
+ *
+ * @returns The recording stream's used configuration.
+ */
 const settings::RecordingScreenSettings &RecordingStream::GetConfig(void) const
 {
@@ -251,5 +263,5 @@
 
 /**
- * Checks if a specified limit for recording has been reached.
+ * Checks if a specified limit for a recording stream has been reached.
  *
  * @returns true if any limit has been reached.
@@ -289,4 +301,9 @@
 }
 
+/**
+ * Returns whether a recording stream is ready (e.g. enabled and active) or not.
+ *
+ * @returns \c true if ready, \c false if not.
+ */
 bool RecordingStream::IsReady(void) const
 {
@@ -424,6 +441,20 @@
 }
 
+/**
+ * Sends a raw (e.g. not yet encoded) video frame to the recording stream.
+ *
+ * @returns IPRT status code.
+ * @param   x                   Upper left (X) coordinate where the video frame starts.
+ * @param   y                   Upper left (Y) coordinate where the video frame starts.
+ * @param   uPixelFormat        Pixel format of the video frame.
+ * @param   uBPP                Bits per pixel (BPP) of the video frame.
+ * @param   uBytesPerLine       Bytes per line  of the video frame.
+ * @param   uSrcWidth           Width (in pixels) of the video frame.
+ * @param   uSrcHeight          Height (in pixels) of the video frame.
+ * @param   puSrcData           Actual pixel data of the video frame.
+ * @param   uTimeStampMs        Timestamp (in ms) as PTS.
+ */
 int RecordingStream::SendVideoFrame(uint32_t x, uint32_t y, uint32_t uPixelFormat, uint32_t uBPP, uint32_t uBytesPerLine,
-                                  uint32_t uSrcWidth, uint32_t uSrcHeight, uint8_t *puSrcData, uint64_t uTimeStampMs)
+                                    uint32_t uSrcWidth, uint32_t uSrcHeight, uint8_t *puSrcData, uint64_t uTimeStampMs)
 {
     lock();
@@ -880,4 +911,9 @@
 }
 
+/**
+ * Uninitializes a recording stream, internal version.
+ *
+ * @returns IPRT status code.
+ */
 int RecordingStream::uninitInternal(void)
 {
@@ -905,5 +941,5 @@
 
 /**
- * Uninitializes video recording for a certain recording stream.
+ * Uninitializes video recording for a recording stream.
  *
  * @returns IPRT status code.
@@ -921,5 +957,5 @@
 #ifdef VBOX_WITH_LIBVPX
 /**
- * Uninitializes the VPX codec for a certain recording stream.
+ * Uninitializes the VPX codec for a recording stream.
  *
  * @returns IPRT status code.
@@ -939,5 +975,5 @@
 
 /**
- * Initializes the video recording for a certain recording stream.
+ * Initializes the video recording for a recording stream.
  *
  * @returns IPRT status code.
@@ -971,5 +1007,5 @@
 #ifdef VBOX_WITH_LIBVPX
 /**
- * Initializes the VPX codec for a certain recording stream.
+ * Initializes the VPX codec for a recording stream.
  *
  * @returns IPRT status code.
@@ -1027,4 +1063,9 @@
 #endif
 
+/**
+ * Initializes the audio part of a recording stream,
+ *
+ * @returns IPRT status code.
+ */
 int RecordingStream::initAudio(void)
 {