Changeset 76777 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Jan 11, 2019 1:53:44 PM (6 years ago)

Author:

vboxsync

Message:

Audio/Mixer: Removed VBOX_AUDIO_MIXER_WITH_MIXBUF define, as this is the default anyway since quite a while.

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioMixer.cpp (modified) (6 diffs)
• AudioMixer.h (modified) (2 diffs)

trunk/src/VBox/Devices/Audio/AudioMixer.cpp

@@ -770 +770 @@
         case AUDMIXSINKCMD_DROP:
         {
-#ifdef VBOX_AUDIO_MIXER_WITH_MIXBUF
             AudioMixBufReset(&pSink->MixBuf);
-#endif
+
             /* Clear dirty bit, keep others. */
             pSink->fStatus &= ~AUDMIXSINK_STS_DIRTY;
@@ -955 +954 @@
         && !(pSink->fStatus & AUDMIXSINK_STS_PENDING_DISABLE))
     {
-#ifdef VBOX_AUDIO_MIXER_WITH_MIXBUF
         cbWritable = AudioMixBufFreeBytes(&pSink->MixBuf);
-#else
-        /* Return how much data we expect since the last write. */
-        cbWritable = DrvAudioHlpMilliToBytes(10 /* ms */, &pSink->PCMProps); /** @todo Make this configurable! */
-#endif
     }
 
@@ -1314 +1308 @@
     LogFunc(("[%s]\n", pSink->pszName));
 
-#ifdef VBOX_AUDIO_MIXER_WITH_MIXBUF
     AudioMixBufReset(&pSink->MixBuf);
-#endif
 
     /* Update last updated timestamp. */
@@ -1422 +1414 @@
                  pSink->pszName, pSink->PCMProps.cBytes * 8, pSink->PCMProps.cChannels, pSink->PCMProps.uHz));
 
-#ifdef VBOX_AUDIO_MIXER_WITH_MIXBUF
     /* Also update the sink's mixing buffer format. */
     AudioMixBufDestroy(&pSink->MixBuf);
@@ -1435 +1426 @@
         }
     }
-#endif /* VBOX_AUDIO_MIXER_WITH_MIXBUF */
 
 #ifdef VBOX_AUDIO_MIXER_DEBUG
@@ -1968 +1958 @@
             if (cbWrittenBuf) /* Update the mixer stream's last written time stamp. */
                 pMixStream->tsLastReadWrittenNs = RTTimeNanoTS();
+
+            Log3Func(("[%s] Mixer stream '%s' -> cbWrittenBuf=%RU32\n", pSink->pszName, pMixStream->pszName, cbWrittenBuf));
         }
     }

trunk/src/VBox/Devices/Audio/AudioMixer.h

@@ -29 +29 @@
 
 #include <VBox/vmm/pdmaudioifs.h>
-
-/* Use a mixer sink's mixing buffer for multiplexing. */
-#define VBOX_AUDIO_MIXER_WITH_MIXBUF
 
 /**
@@ -171 +168 @@
     /** The sink's critical section. */
     RTCRITSECT              CritSect;
-#ifdef VBOX_AUDIO_MIXER_WITH_MIXBUF
     /** This sink's mixing buffer, acting as
      * a parent buffer for all streams this sink owns. */
     PDMAUDIOMIXBUF          MixBuf;
-#endif
     /** Union for input/output specifics. */
     union