Changeset 7525 in vbox

Timestamp:

Mar 25, 2008 10:17:49 AM (17 years ago)

Author:

vboxsync

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

28995

Message:

Solaris host audio: fixes and integrated into Main. Needs more
rigorous testing, only tested locally here. BFE still acts weird.

Location:

trunk/src/VBox

Files:

• Devices/Audio/audio.c (modified) (1 diff)
• Devices/Audio/solaudio.c (modified) (23 diffs)
• Frontends/VBoxManage/VBoxManage.cpp (modified) (4 diffs)
• Frontends/VirtualBox/src/VBoxGlobal.cpp (modified) (1 diff)
• Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui.h (modified) (1 diff)
• Main/AudioAdapterImpl.cpp (modified) (3 diffs)
• Main/ConsoleImpl2.cpp (modified) (1 diff)
• Main/idl/VirtualBox.xidl (modified) (1 diff)
• Main/xml/SettingsConverter.xsl (modified) (1 diff)
• Main/xml/VirtualBox-settings-solaris.xsd (modified) (1 diff)

trunk/src/VBox/Devices/Audio/audio.c

@@ -1870 +1870 @@
         case AUD_MIXER_PCM:
             name = "PCM_OUT";
+            vol  = &pcm_out_volume;
             break;
         case AUD_MIXER_LINE_IN:

trunk/src/VBox/Devices/Audio/solaudio.c

@@ -59 +59 @@
 } conf =
 {
-    INIT_FIELD (cbBuffer =) 8912,
+    INIT_FIELD (cbBuffer =) 4352,
 };
 
@@ -123 +123 @@
 
 
-static char *solaudio_getdevice ()
+static char *solaudio_getdevice (void)
 {
     /* This is for multiple audio devices where env. var determines current one,
      * otherwise else we fallback to default.
      */
-    char *pszAudioDev = RTEnvGet("AUDIODEV");
+    const char *pszAudioDev = RTEnvGet("AUDIODEV");
     if (pszAudioDev)
         return RTStrDup(pszAudioDev);
@@ -141 +141 @@
     int AudioCtl;
     struct stat FileStat;
-    const char *pszAudioDev = NULL;
-    const char *pszAudioCtl = "/dev/audioctl";
+    char *pszAudioDev = NULL;
+    char *pszAudioCtl = NULL;
     audio_info_t AudioInfo;
 
@@ -149 +149 @@
     {
         LogRel(("solaudio: solaudio_getdevice() failed to return a valid device.\n"));
-        goto err;
+        return -1;
     }
 
@@ -155 +155 @@
     {
         LogRel(("solaudio: failed to stat %s\n", pszAudioDev));
-        goto err;
+        goto err2;
     }
 
@@ -161 +161 @@
     {
         LogRel(("solaudio: invalid mode for %s\n", pszAudioDev));
-        goto err;
+        goto err2;
     }
 
@@ -168 +168 @@
     {
         LogRel(("solaudio: failed to open %s\n", pszAudioDev));
-        goto err;
-    }
-
+        goto err2;
+    }
+
+    RTStrAPrintf(&pszAudioCtl, "%sctl", pszAudioDev);
     AudioCtl = open(pszAudioCtl, O_WRONLY | O_NONBLOCK);
     if (AudioCtl < 0)
@@ -193 +194 @@
     AudioInfo.play.buffer_size = info->play.buffer_size;
     AudioInfo.play.gain = AUDIO_MAX_GAIN;
-    AudioInfo.play.balance = AUDIO_MID_BALANCE;
     if (ioctl(AudioDev, AUDIO_SETINFO, &AudioInfo) < 0)
     {
@@ -204 +204 @@
     *pfd = AudioDev;
     *pctl_fd = AudioCtl;
+    RTStrFree(pszAudioDev);
+    RTStrFree(pszAudioCtl);
     return 0;
 
 err:
+    RTStrFree(pszAudioCtl);
+err2:
     RTStrFree(pszAudioDev);
     return -1;
@@ -224 +228 @@
     AudioInfo.play.channels = as->nchannels;
     AudioInfo.play.precision = aud_to_solfmt(as->fmt);
+#if 0
+    /* Not really needed. */
+    int cbPerSample = (AudioInfo.play.channels * AudioInfo.play.precision) / 8;
+    int cbPerSecond = cbPerSample * AudioInfo.play.sample_rate;
+    AudioInfo.play.buffer_size = cbPerSecond > 131072 ? conf.cbBuffer : conf.cbBuffer / 2;
+#endif
     AudioInfo.play.buffer_size = conf.cbBuffer;
+
     if (as->fmt == AUD_FMT_U8)
         AudioInfo.play.encoding = AUDIO_ENCODING_LINEAR8;
@@ -260 +271 @@
 static void solaudio_stop (solaudioVoiceOut *sol)
 {
+    audio_info_t AudioInfo;
     LogFlow(("solaudio: stop\n"));
     if (sol->AudioDev < 0 || sol->AudioCtl < 0)
@@ -269 +281 @@
     if (ioctl(sol->AudioCtl, I_SETSIG, 0) < 0)
     {
-        LogRel(("solaudio: failed to stop signalling\n"));
+        Log(("solaudio: failed to stop signalling\n"));
         return;
     }
@@ -275 +287 @@
     if (ioctl(sol->AudioDev, I_FLUSH, FLUSHW) < 0)
     {
-        Log(("solaudio: failed to drop unplayed buffers\n"));
+        LogRel(("solaudio: failed to drop unplayed buffers\n"));
         return;
     }
+
+    AUDIO_INITINFO(&AudioInfo);
+    AudioInfo.play.samples = 0;
+    AudioInfo.play.pause = 0;
+    AudioInfo.play.eof = 0;
+    AudioInfo.play.error = 0;
+    sol->cBuffersPlayed = 0;
+    if (ioctl(sol->AudioDev, AUDIO_SETINFO, &AudioInfo) < 0)
+    {
+        LogRel(("solaudio: AUDIO_SETINFO failed during stop.\n"));
+        return;
+    }
+}
+
+
+static void solaudio_fini_out (HWVoiceOut *hw)
+{
+    solaudioVoiceOut *sol = (solaudioVoiceOut *) hw;
+    solaudio_stop (sol);
 
     close(sol->AudioDev);
@@ -283 +314 @@
     close(sol->AudioCtl);
     sol->AudioCtl = -1;
-    sol->cBuffersPlayed = 0;
     if (sol->pPCMBuf)
     {
@@ -289 +319 @@
         sol->pPCMBuf = NULL;
     }
-}
-
-
-static void solaudio_fini_out (HWVoiceOut *hw)
-{
-    solaudioVoiceOut *sol = (solaudioVoiceOut *) hw;
-    solaudio_stop (sol);
+
     LogFlow(("solaudio: fini_out done\n"));
 }
@@ -312 +336 @@
     }
 
-    cbBuffer = AudioInfo.play.buffer_size * (2 + AudioInfo.play.eof - sol->cBuffersPlayed);
+    if (sol->cBuffersPlayed - AudioInfo.play.eof <= 2)
+        cbBuffer = AudioInfo.play.buffer_size;
 
     LogFlow(("avail: eof=%d samples=%d bufsize=%d bufplayed=%d avail=%d\n", AudioInfo.play.eof, AudioInfo.play.samples,
@@ -328 +353 @@
 
     WaitTimeSpec.tv_sec = 0;
-    WaitTimeSpec.tv_nsec = 1000000;
-
-    while (AudioInfo.play.eof < pSol->cBuffersPlayed - 2)
+    WaitTimeSpec.tv_nsec = 100000000;
+
+    while (AudioInfo.play.eof + 10 < pSol->cBuffersPlayed)
     {
         nanosleep(&WaitTimeSpec, NULL);
@@ -373 +398 @@
             break;
 
+        /* Increment eof marker for synchronous buffer processed */
+        write (pSol->AudioDev, NULL, 0);
+        pSol->cBuffersPlayed++;
+
         hw->rpos   = (hw->rpos + csToWrite) % hw->samples;
         csSamples -= csToWrite;
     }
-    /* Increment eof marker for synchronous buffer processed */
-    write (pSol->AudioDev, NULL, 0);
-    pSol->cBuffersPlayed++;
     return csDecr;
 }
@@ -392 +418 @@
             /* reset the eof marker and samples markers */
             audio_info_t AudioInfo;
+            LogFlow(("solaudio: voice_enable\n"));
             AUDIO_INITINFO(&AudioInfo);
             ioctl(pSol->AudioDev, AUDIO_GETINFO, &AudioInfo);
@@ -400 +427 @@
 
             audio_pcm_info_clear_buf(&hw->info, pSol->pPCMBuf, hw->samples);
-            LogFlow(("solaudio: voice_enable\n"));
             break;
         }
@@ -429 +455 @@
 static void solaudio_audio_fini (void *opaque)
 {
-    (void) opaque;
-}
-
-
-static struct audio_pcm_ops solaudio_pcm_ops = {
+    NOREF(opaque);
+}
+
+
+static struct audio_pcm_ops solaudio_pcm_ops =
+{
     solaudio_init_out,
     solaudio_fini_out,
@@ -447 +474 @@
 };
 
-static struct audio_option solaudio_options[] = {
+static struct audio_option solaudio_options[] =
+{
     {"BUFFER_SIZE", AUD_OPT_INT, &conf.cbBuffer,
      "Size of the buffer in bytes", NULL, 0},
@@ -453 +481 @@
 };
 
-struct audio_driver solaudio_audio_driver = {
+struct audio_driver solaudio_audio_driver =
+{
     INIT_FIELD (name           = ) "solaudio",
     INIT_FIELD (descr          = ) "SolarisAudio http://sun.com",

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

@@ -234 +234 @@
 #else
     bool fWin = false;
+#endif
+#ifdef RT_OS_SOLARIS
+    bool fSolaris = true;
+#else
+    bool fSolaris = false;
 #endif
 #ifdef RT_OS_DARWIN
@@ -371 +376 @@
 #endif
         }
+        if (fSolaris)
+        {
+            RTPrintf(                        "|solaudio");
+        }
         if (fLinux)
         {
@@ -1435 +1444 @@
                         pszDrv = "CoreAudio";
                     break;
+                case AudioDriverType_SolAudio:
+                    if (details == VMINFO_MACHINEREADABLE)
+                        pszDrv = "solaudio";
+                    else
+                        pszDrv = "SolAudio";
+                    break;
                 default:
                     if (details == VMINFO_MACHINEREADABLE)
@@ -4923 +4938 @@
 # endif
 #endif /* !RT_OS_LINUX */
+#ifdef RT_OS_SOLARIS
+                else if (strcmp(audio, "solaudio") == 0)
+                {
+                    CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_SolAudio));
+                    CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true));
+                }
+
+#endif /* !RT_OS_SOLARIS */
 #ifdef RT_OS_DARWIN
                 else if (strcmp(audio, "coreaudio") == 0)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -2353 +2353 @@
     audioDriverTypes [KAudioDriverType_WinMM] =
         tr ("Windows Multimedia", "AudioDriverType");
+    audioDriverTypes [KAudioDriverType_SolAudio] =
+        tr ("Solaris Audio", "AudioDriverType");
     audioDriverTypes [KAudioDriverType_OSS] =
         tr ("OSS Audio Driver", "AudioDriverType");

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui.h

@@ -863 +863 @@
     cbAudioDriver->insertItem (vboxGlobal().toString (KAudioDriverType_WinMM));
 # endif
+#elif defined Q_OS_SOLARIS
+    cbAudioDriver->insertItem (vboxGlobal().toString (KAudioDriverType_SolAudio));
 #elif defined Q_OS_LINUX
     cbAudioDriver->insertItem (vboxGlobal().toString (KAudioDriverType_OSS));

trunk/src/VBox/Main/AudioAdapterImpl.cpp

@@ -232 +232 @@
             case AudioDriverType_DirectSound:
 #endif /* RT_OS_WINDOWS */
+#ifdef RT_OS_SOLARIS
+            case AudioDriverType_SolAudio:
+#endif
 #ifdef RT_OS_LINUX
             case AudioDriverType_OSS:
@@ -383 +386 @@
         mData->mAudioDriver = AudioDriverType_DirectSound;
 #endif // RT_OS_WINDOWS
+#ifdef RT_OS_SOLARIS
+    else if (strcmp (driver, "SolAudio") == 0)
+        mData->mAudioDriver = AudioDriverType_SolAudio;
+#endif // RT_OS_SOLARIS
 #ifdef RT_OS_LINUX
     else if (strcmp (driver, "OSS") == 0)
@@ -473 +480 @@
             }
 #endif /* RT_OS_WINDOWS */
+#ifdef RT_OS_SOLARIS
+            case AudioDriverType_SolAudio:
+            {
+                driverStr = "SolAudio";
+                break;
+            }
+#endif
 #ifdef RT_OS_LINUX
             case AudioDriverType_ALSA:

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1404 +1404 @@
             }
 #endif /* RT_OS_WINDOWS */
+#ifdef RT_OS_SOLARIS
+            case AudioDriverType_SolAudio:
+            {
+                rc = CFGMR3InsertString(pCfg, "AudioDriver", "solaudio");               RC_CHECK();            
+                break;
+            }
+#endif
 #ifdef RT_OS_LINUX
             case AudioDriverType_OSS:

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

@@ -9252 +9252 @@
     <const name="MMPM"          value="6"/>
     <const name="Pulse"         value="7"/>
-    <const name="ESD"           value="8"/>
+    <const name="SolAudio"      value="8"/>
   </enum>
 

trunk/src/VBox/Main/xml/SettingsConverter.xsl

@@ -306 +306 @@
         <xsl:when test="@driver='winmm'">WinMM</xsl:when>
         <xsl:when test="@driver='dsound'">DirectSound</xsl:when>
-        <xsl:when test="@driver='esd'">ESD</xsl:when>
+        <xsl:when test="@driver='solaudio'">SolAudio</xsl:when>
         <xsl:when test="@driver='mmpm'">MMPM</xsl:when>
         <xsl:otherwise>

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

@@ -99 +99 @@
           <xsd:restriction base="xsd:token">
             <xsd:enumeration value="Null"/>
-            <xsd:enumeration value="ESD"/>
+            <xsd:enumeration value="SolAudio"/>
           </xsd:restriction>
         </xsd:simpleType>