Changeset 96324 in vbox for trunk/src/VBox/Main/include

Timestamp:

Aug 19, 2022 8:15:55 AM (3 years ago)

Author:

vboxsync

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

153138

Message:

Recording/Main: Renaming (use m_ prefixes for class variables).

Location:

trunk/src/VBox/Main/include

Files:

• Recording.h (modified) (4 diffs)
• RecordingStream.h (modified) (3 diffs)
• WebMWriter.h (modified) (7 diffs)

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

@@ -48 +48 @@
     size_t GetStreamCount(void) const;
 #ifdef VBOX_WITH_AUDIO_RECORDING
-    PRECORDINGCODEC GetCodecAudio(void) { return &this->CodecAudio; }
+    PRECORDINGCODEC GetCodecAudio(void) { return &this->m_CodecAudio; }
 #endif
 
@@ -118 +118 @@
 
     /** Pointer to the console object. */
-    Console                     *pConsole;
+    Console                     *m_pConsole;
     /** Used recording configuration. */
     settings::RecordingSettings  m_Settings;
     /** The current state. */
-    RECORDINGSTS                 enmState;
+    RECORDINGSTS                 m_enmState;
     /** Critical section to serialize access. */
-    RTCRITSECT                   CritSect;
+    RTCRITSECT                   m_CritSect;
     /** Semaphore to signal the encoding worker thread. */
-    RTSEMEVENT                   WaitEvent;
+    RTSEMEVENT                   m_WaitEvent;
     /** Shutdown indicator. */
-    bool                         fShutdown;
+    bool                         m_fShutdown;
     /** Encoding worker thread. */
-    RTTHREAD                     Thread;
+    RTTHREAD                     m_Thread;
     /** Vector of current recording streams.
      *  Per VM screen (display) one recording stream is being used. */
-    RecordingStreams             vecStreams;
+    RecordingStreams             m_vecStreams;
     /** Number of streams in vecStreams which currently are enabled for recording. */
-    uint16_t                     cStreamsEnabled;
+    uint16_t                     m_cStreamsEnabled;
     /** Timestamp (in ms) of when recording has been started. */
-    uint64_t                     tsStartMs;
+    uint64_t                     m_tsStartMs;
 #ifdef VBOX_WITH_AUDIO_RECORDING
     /** Audio codec to use.
@@ -145 +145 @@
      *  all audio data of a VM will be the same for each stream at a given
      *  point in time. */
-    RECORDINGCODEC               CodecAudio;
+    RECORDINGCODEC               m_CodecAudio;
 #endif /* VBOX_WITH_AUDIO_RECORDING */
     /** Block map of raw common data blocks which need to get encoded first. */
-    RecordingBlockMap            mapBlocksRaw;
+    RecordingBlockMap            m_mapBlocksRaw;
     /** Block map of encoded common blocks.
      *
@@ -159 +159 @@
      *  For now this only affects audio, e.g. all recording streams
      *  need to have the same audio data at a specific point in time. */
-    RecordingBlockMap            mapBlocksEncoded;
+    RecordingBlockMap            m_mapBlocksEncoded;
 };
 #endif /* !MAIN_INCLUDED_Recording_h */

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

@@ -125 +125 @@
 
     const settings::RecordingScreenSettings &GetConfig(void) const;
-    uint16_t GetID(void) const { return this->uScreenID; };
+    uint16_t GetID(void) const { return this->m_uScreenID; };
 #ifdef VBOX_WITH_AUDIO_RECORDING
-    PRECORDINGCODEC GetAudioCodec(void) { return this->pCodecAudio; };
+    PRECORDINGCODEC GetAudioCodec(void) { return this->m_pCodecAudio; };
 #endif
-    PRECORDINGCODEC GetVideoCodec(void) { return &this->CodecVideo; };
+    PRECORDINGCODEC GetVideoCodec(void) { return &this->m_CodecVideo; };
 
     bool IsLimitReached(uint64_t msTimestamp) const;
@@ -176 +176 @@
     RecordingContext       *m_pCtx;
     /** The current state. */
-    RECORDINGSTREAMSTATE    enmState;
+    RECORDINGSTREAMSTATE    m_enmState;
     struct
     {
         /** File handle to use for writing. */
-        RTFILE              hFile;
+        RTFILE              m_hFile;
         /** Pointer to WebM writer instance being used. */
-        WebMWriter         *pWEBM;
+        WebMWriter         *m_pWEBM;
     } File;
-    bool                fEnabled;
+    bool                m_fEnabled;
     /** Track number of audio stream.
      *  Set to UINT8_MAX if not being used. */
-    uint8_t             uTrackAudio;
+    uint8_t             m_uTrackAudio;
     /** Track number of video stream.
      *  Set to UINT8_MAX if not being used. */
-    uint8_t             uTrackVideo;
+    uint8_t             m_uTrackVideo;
     /** Screen ID. */
-    uint16_t            uScreenID;
+    uint16_t            m_uScreenID;
     /** Critical section to serialize access. */
-    RTCRITSECT          CritSect;
+    RTCRITSECT          m_CritSect;
     /** Timestamp (in ms) of when recording has been started. */
-    uint64_t            tsStartMs;
+    uint64_t            m_tsStartMs;
 #ifdef VBOX_WITH_AUDIO_RECORDING
     /** Pointer to audio codec instance data to use.
@@ -206 +206 @@
      *
      *  Might be NULL if not being used. */
-    PRECORDINGCODEC     pCodecAudio;
+    PRECORDINGCODEC     m_pCodecAudio;
 #endif /* VBOX_WITH_AUDIO_RECORDING */
     /** Video codec instance data to use. */
-    RECORDINGCODEC      CodecVideo;
+    RECORDINGCODEC      m_CodecVideo;
     /** Screen settings to use. */
     settings::RecordingScreenSettings
-                        ScreenSettings;
+                        m_ScreenSettings;
     /** Common set of recording (data) blocks, needed for
      *  multiplexing to all recording streams. */
-    RecordingBlockSet   Blocks;
+    RecordingBlockSet   m_Blocks;
 };
 

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

@@ -373 +373 @@
     {
         WebMSegment(void)
-            : tcAbsStartMs(0)
-            , tcAbsLastWrittenMs(0)
-            , offStart(0)
-            , offInfo(0)
-            , offSeekInfo(0)
-            , offTracks(0)
-            , offCues(0)
-            , cClusters(0)
-        {
-            uTimecodeScaleFactor = VBOX_WEBM_TIMECODESCALE_FACTOR_MS;
-
-            LogFunc(("Default timecode scale is: %RU64ns\n", uTimecodeScaleFactor));
+            : m_tcAbsStartMs(0)
+            , m_tcAbsLastWrittenMs(0)
+            , m_offStart(0)
+            , m_offInfo(0)
+            , m_offSeekInfo(0)
+            , m_offTracks(0)
+            , m_offCues(0)
+            , m_cClusters(0)
+        {
+            m_uTimecodeScaleFactor = VBOX_WEBM_TIMECODESCALE_FACTOR_MS;
+
+            LogFunc(("Default timecode scale is: %RU64ns\n", m_uTimecodeScaleFactor));
         }
 
@@ -399 +399 @@
         int init(void)
         {
-            return RTCritSectInit(&CritSect);
+            return RTCritSectInit(&m_CritSect);
         }
 
@@ -409 +409 @@
             clear();
 
-            RTCritSectDelete(&CritSect);
+            RTCritSectDelete(&m_CritSect);
         }
 
@@ -417 +417 @@
         void clear(void)
         {
-            WebMCuePointList::iterator itCuePoint = lstCuePoints.begin();
-            while (itCuePoint != lstCuePoints.end())
+            WebMCuePointList::iterator itCuePoint = m_lstCuePoints.begin();
+            while (itCuePoint != m_lstCuePoints.end())
             {
                 WebMCuePoint *pCuePoint = (*itCuePoint);
@@ -424 +424 @@
                 delete pCuePoint;
 
-                lstCuePoints.erase(itCuePoint);
-                itCuePoint = lstCuePoints.begin();
+                m_lstCuePoints.erase(itCuePoint);
+                itCuePoint = m_lstCuePoints.begin();
             }
 
-            Assert(lstCuePoints.empty());
+            Assert(m_lstCuePoints.empty());
         }
 
         /** Critical section for serializing access to this segment. */
-        RTCRITSECT                      CritSect;
+        RTCRITSECT                      m_CritSect;
 
         /** The timecode scale factor of this segment. */
-        uint64_t                        uTimecodeScaleFactor;
+        uint64_t                        m_uTimecodeScaleFactor;
 
         /** Absolute timecode (in ms) when starting this segment. */
-        WebMTimecodeAbs                 tcAbsStartMs;
+        WebMTimecodeAbs                 m_tcAbsStartMs;
         /** Absolute timecode (in ms) of last write. */
-        WebMTimecodeAbs                 tcAbsLastWrittenMs;
+        WebMTimecodeAbs                 m_tcAbsLastWrittenMs;
 
         /** Absolute offset (in bytes) of CurSeg. */
-        uint64_t                        offStart;
+        uint64_t                        m_offStart;
         /** Absolute offset (in bytes) of general info. */
-        uint64_t                        offInfo;
+        uint64_t                        m_offInfo;
         /** Absolute offset (in bytes) of seeking info. */
-        uint64_t                        offSeekInfo;
+        uint64_t                        m_offSeekInfo;
         /** Absolute offset (in bytes) of tracks. */
-        uint64_t                        offTracks;
+        uint64_t                        m_offTracks;
         /** Absolute offset (in bytes) of cues table. */
-        uint64_t                        offCues;
+        uint64_t                        m_offCues;
         /** List of cue points. Needed for seeking table. */
-        WebMCuePointList                lstCuePoints;
+        WebMCuePointList                m_lstCuePoints;
 
         /** Total number of clusters. */
-        uint64_t                        cClusters;
+        uint64_t                        m_cClusters;
 
         /** Map of tracks.
          *  The key marks the track number (*not* the UUID!). */
-        std::map <uint8_t, WebMTrack *> mapTracks;
+        std::map <uint8_t, WebMTrack *> m_mapTracks;
 
         /** Current cluster which is being handled.
@@ -466 +466 @@
          *  Note that we don't need (and shouldn't need, as this can be a *lot* of data!) a
          *  list of all clusters. */
-        WebMCluster                     CurCluster;
-
-        WebMQueue                       queueBlocks;
-
-    } CurSeg;
+        WebMCluster                     m_CurCluster;
+
+        WebMQueue                       m_queueBlocks;
+
+    } m_CurSeg;
 
     /** Audio codec to use. */
@@ -542 +542 @@
      * @returns Number of written WebM clusters; 0 when no clusters written (empty file).
      */
-    uint64_t GetClusters(void) const { return CurSeg.cClusters; }
+    uint64_t GetClusters(void) const { return m_CurSeg.m_cClusters; }
 
 protected: