Changeset 73689 in vbox for trunk/src

Timestamp:

Aug 15, 2018 9:55:52 AM (7 years ago)

Author:

vboxsync

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

124366

Message:

Audio: Make use of VERR_AUDIO_STREAM_COULD_NOT_CREATE when streaming creations fail.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DrvHostALSAAudio.cpp (modified) (17 diffs)
• DrvHostCoreAudio.cpp (modified) (1 diff)
• DrvHostDSound.cpp (modified) (2 diffs)
• DrvHostOSSAudio.cpp (modified) (9 diffs)
• DrvHostPulseAudio.cpp (modified) (9 diffs)

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

@@ -326 +326 @@
 {
     snd_pcm_t *phPCM = NULL;
-    int rc;
+
+    int rc = VERR_AUDIO_STREAM_COULD_NOT_CREATE;
 
     unsigned int cChannels = pCfgReq->nchannels;
@@ -350 +351 @@
         {
             LogRel(("ALSA: Failed to open \"%s\" as %s device: %s\n", pszDev, fIn ? "input" : "output", snd_strerror(err)));
-            rc = VERR_AUDIO_BACKEND_INIT_FAILED;
             break;
         }
@@ -358 +358 @@
         {
             LogRel(("ALSA: Error setting output non-blocking mode: %s\n", snd_strerror(err)));
-            rc = VERR_ACCESS_DENIED; /** @todo Find a better rc. */
             break;
         }
@@ -368 +367 @@
         {
             LogRel(("ALSA: Failed to initialize hardware parameters: %s\n", snd_strerror(err)));
-            rc = VERR_AUDIO_BACKEND_INIT_FAILED;
             break;
         }
@@ -376 +374 @@
         {
             LogRel(("ALSA: Failed to set access type: %s\n", snd_strerror(err)));
-            rc = VERR_AUDIO_BACKEND_INIT_FAILED;
             break;
         }
@@ -384 +381 @@
         {
             LogRel(("ALSA: Failed to set audio format to %d: %s\n", pCfgReq->fmt, snd_strerror(err)));
-            rc = VERR_AUDIO_BACKEND_INIT_FAILED;
             break;
         }
@@ -392 +388 @@
         {
             LogRel(("ALSA: Failed to set frequency to %uHz: %s\n", pCfgReq->freq, snd_strerror(err)));
-            rc = VERR_AUDIO_BACKEND_INIT_FAILED;
             break;
         }
@@ -400 +395 @@
         {
             LogRel(("ALSA: Failed to set number of channels to %d\n", pCfgReq->nchannels));
-            rc = VERR_AUDIO_BACKEND_INIT_FAILED;
             break;
         }
@@ -408 +402 @@
         {
             LogRel(("ALSA: Number of audio channels (%u) not supported\n", cChannels));
-            rc = VERR_AUDIO_BACKEND_INIT_FAILED;
             break;
         }
@@ -422 +415 @@
         {
             LogRel(("ALSA: Could not determine minimal period size\n"));
-            rc = VERR_AUDIO_BACKEND_INIT_FAILED;
             break;
         }
@@ -436 +428 @@
         if (err < 0)
         {
-            LogRel(("ALSA: Failed to set period size %d (%s)\n",
-                    period_size_f, snd_strerror(err)));
-            rc = VERR_AUDIO_BACKEND_INIT_FAILED;
+            LogRel(("ALSA: Failed to set period size %d (%s)\n", period_size_f, snd_strerror(err)));
             break;
         }
@@ -447 +437 @@
         {
             LogRel(("ALSA: Could not retrieve minimal buffer size\n"));
-            rc = VERR_AUDIO_BACKEND_INIT_FAILED;
             break;
         }
@@ -457 +446 @@
         {
             LogRel(("ALSA: Failed to set near buffer size %RU32: %s\n", buffer_size_f, snd_strerror(err)));
-            rc = VERR_AUDIO_BACKEND_INIT_FAILED;
             break;
         }
@@ -465 +453 @@
         {
             LogRel(("ALSA: Failed to apply audio parameters\n"));
-            rc = VERR_AUDIO_BACKEND_INIT_FAILED;
             break;
         }
@@ -473 +460 @@
         {
             LogRel(("ALSA: Failed to get buffer size\n"));
-            rc = VERR_AUDIO_BACKEND_INIT_FAILED;
             break;
         }
@@ -482 +468 @@
         {
             LogRel(("ALSA: Failed to get period size\n"));
-            rc = VERR_AUDIO_BACKEND_INIT_FAILED;
             break;
         }
@@ -506 +491 @@
         pCfgObt->period_size = obt_period_size;
         pCfgObt->buffer_size = obt_buffer_size;
+
+        rc = VINF_SUCCESS;
     }
     while (0);

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

@@ -2337 +2337 @@
     }
     else
-        rc = VERR_NOT_AVAILABLE;
+        rc = VERR_AUDIO_STREAM_COULD_NOT_CREATE;
 
     LogFunc(("Returning %Rrc\n", rc));

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

@@ -1775 +1775 @@
     }
     else
-        rc = VERR_GENERAL_FAILURE; /** @todo Fudge! */
+        rc = VERR_AUDIO_STREAM_COULD_NOT_CREATE;
 
     LogFlowFuncLeaveRC(rc);
@@ -1949 +1949 @@
     }
     else
-        rc = VERR_GENERAL_FAILURE; /** @todo Fudge! */
+        rc = VERR_AUDIO_STREAM_COULD_NOT_CREATE;
 
     return rc;

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

@@ -225 +225 @@
 static int ossStreamOpen(const char *pszDev, int fOpen, POSSAUDIOSTREAMCFG pOSSReq, POSSAUDIOSTREAMCFG pOSSAcq, int *phFile)
 {
-    int rc = VINF_SUCCESS;
+    int rc = VERR_AUDIO_STREAM_COULD_NOT_CREATE;
 
     int hFile = -1;
@@ -234 +234 @@
         {
             LogRel(("OSS: Failed to open %s: %s (%d)\n", pszDev, strerror(errno), errno));
-            rc = RTErrConvertFromErrno(errno);
             break;
         }
@@ -250 +249 @@
 
             default:
-                rc = VERR_NOT_SUPPORTED;
+                rc = VERR_AUDIO_STREAM_COULD_NOT_CREATE;
                 break;
         }
@@ -260 +259 @@
         {
             LogRel(("OSS: Failed to set audio format to %ld: %s (%d)\n", iFormat, strerror(errno), errno));
-            rc = RTErrConvertFromErrno(errno);
             break;
         }
@@ -269 +267 @@
             LogRel(("OSS: Failed to set number of audio channels (%RU8): %s (%d)\n",
                     pOSSReq->Props.cChannels, strerror(errno), errno));
-            rc = RTErrConvertFromErrno(errno);
             break;
         }
@@ -277 +274 @@
         {
             LogRel(("OSS: Failed to set audio frequency (%dHZ): %s (%d)\n", pOSSReq->Props.uHz, strerror(errno), errno));
-            rc = RTErrConvertFromErrno(errno);
             break;
         }
@@ -286 +282 @@
         {
             LogRel(("OSS: Failed to set non-blocking mode: %s (%d)\n", strerror(errno), errno));
-            rc = RTErrConvertFromErrno(errno);
             break;
         }
@@ -302 +297 @@
             LogRel(("OSS: Failed to set %RU16 fragments to %RU32 bytes each: %s (%d)\n",
                     pOSSReq->cFragments, pOSSReq->cbFragmentSize, strerror(errno), errno));
-            rc = RTErrConvertFromErrno(errno);
             break;
         }
@@ -310 +304 @@
         {
             LogRel(("OSS: Failed to retrieve %s buffer length: %s (%d)\n", fIn ? "input" : "output", strerror(errno), errno));
-            rc = RTErrConvertFromErrno(errno);
             break;
         }

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

@@ -480 +480 @@
     AssertPtrReturn(pszName,   VERR_INVALID_POINTER);
 
-    int rc = VINF_SUCCESS;
+    int rc = VERR_AUDIO_STREAM_COULD_NOT_CREATE;
 
     pa_stream *pStream = NULL;
@@ -498 +498 @@
         {
             LogRel(("PulseAudio: Unsupported sample specification for stream '%s'\n", pszName));
-            rc = VERR_NOT_SUPPORTED;
             break;
         }
@@ -539 +538 @@
                 LogRel(("PulseAudio: Could not connect input stream '%s': %s\n",
                         pszName, pa_strerror(pa_context_errno(pThis->pContext))));
-                rc = VERR_AUDIO_BACKEND_INIT_FAILED;
                 break;
             }
@@ -553 +551 @@
                 LogRel(("PulseAudio: Could not connect playback stream '%s': %s\n",
                         pszName, pa_strerror(pa_context_errno(pThis->pContext))));
-                rc = VERR_AUDIO_BACKEND_INIT_FAILED;
                 break;
             }
@@ -572 +569 @@
             {
                 LogRel(("PulseAudio: Failed to initialize stream '%s' (state %ld)\n", pszName, streamSt));
-                rc = VERR_AUDIO_BACKEND_INIT_FAILED;
                 break;
             }
@@ -593 +589 @@
         pStreamPA->pStream = pStream;
 
+        rc = VINF_SUCCESS;
+
     } while (0);
 
@@ -659 +657 @@
             LogRel(("PulseAudio: Failed to start threaded mainloop: %s\n",
                      pa_strerror(pa_context_errno(pThis->pContext))));
-            rc = VERR_AUDIO_BACKEND_INIT_FAILED;
             break;
         }
@@ -674 +671 @@
             LogRel(("PulseAudio: Failed to connect to server: %s\n",
                      pa_strerror(pa_context_errno(pThis->pContext))));
-            rc = VERR_AUDIO_BACKEND_INIT_FAILED;
             break;
         }
@@ -692 +688 @@
             {
                 LogRel(("PulseAudio: Failed to initialize context (state %d)\n", cstate));
-                rc = VERR_AUDIO_BACKEND_INIT_FAILED;
                 break;
             }