Changeset 89517 in vbox for trunk/src/VBox

Timestamp:

Jun 4, 2021 10:31:57 PM (4 years ago)

Author:

vboxsync

Message:

DrvHostAudioOss: Use BufInfo.bytes for drvHstAudOssHA_StreamGetWritable and drvHstAudOssHA_StreamPlay too, it seems to work fine here on Linux. bugref:9890

File:

• trunk/src/VBox/Devices/Audio/DrvHostAudioOss.cpp (modified) (3 diffs)

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

@@ -696 +696 @@
     AssertMsgReturn(rc2 >= 0, ("SNDCTL_DSP_GETOSPACE failed: %s (%d)\n", strerror(errno), errno), 0);
 
-#if 0 /** @todo we could return BufInfo.bytes here iff StreamPlay didn't use the fragmented approach */
-    /** @todo r=bird: WTF do we make a fuss over BufInfo.bytes for when we don't
-     *        even use it?!? */
-    AssertLogRelMsgReturn(BufInfo.bytes >= 0, ("OSS: Warning: Invalid available size: %d\n", BufInfo.bytes), VERR_INTERNAL_ERROR_3);
-    if ((unsigned)BufInfo.bytes > cbBuf)
-    {
-        LogRel2(("OSS: Warning: Too big output size (%d > %RU32), limiting to %RU32\n", BufInfo.bytes, cbBuf, cbBuf));
-        BufInfo.bytes = cbBuf;
-        /* Keep going. */
-    }
-#endif
-
-    uint32_t cbRet = (uint32_t)(BufInfo.fragments * BufInfo.fragsize);
-    Log4Func(("returns %#x (%u)\n", cbRet, cbRet));
+    /* Try use the size. */
+    uint32_t        cbRet;
+    uint32_t const  cbBuf = pStreamOSS->OssCfg.cbFragment * pStreamOSS->OssCfg.cFragments;
+    if (BufInfo.bytes >= 0 && (unsigned)BufInfo.bytes <= cbBuf)
+        cbRet = BufInfo.bytes;
+    else
+    {
+        AssertMsgFailed(("Invalid available size: %d\n", BufInfo.bytes));
+        AssertMsgReturn(BufInfo.fragments >= 0, ("fragments: %d\n", BufInfo.fragments), 0);
+        AssertMsgReturn(BufInfo.fragsize >= 0, ("fragsize: %d\n", BufInfo.fragsize), 0);
+        cbRet = (uint32_t)(BufInfo.fragments * BufInfo.fragsize);
+        AssertMsgStmt(cbRet <= cbBuf, ("fragsize*fragments: %d, cbBuf=%#x\n", cbRet, cbBuf), 0);
+    }
+
+    Log4Func(("returns %#x (%u) [cbBuf=%#x]\n", cbRet, cbRet, cbBuf));
     return cbRet;
 }
@@ -739 +740 @@
 
     /*
-     * Figure out now much to write.
+     * Figure out now much to write (same as drvHstAudOssHA_StreamGetWritable).
      */
     audio_buf_info BufInfo;
@@ -747 +748 @@
                           RTErrConvertFromErrno(errno));
 
-#if 0   /** @todo r=bird: WTF do we make a fuss over BufInfo.bytes for when we don't even use it?!? */
-    AssertLogRelMsgReturn(BufInfo.bytes >= 0, ("OSS: Warning: Invalid available size: %d\n", BufInfo.bytes), VERR_INTERNAL_ERROR_3);
-    if ((unsigned)BufInfo.bytes > cbBuf)
-    {
-        LogRel2(("OSS: Warning: Too big output size (%d > %RU32), limiting to %RU32\n", BufInfo.bytes, cbBuf, cbBuf));
-        BufInfo.bytes = cbBuf;
-        /* Keep going. */
-    }
-#endif
-    uint32_t cbToWrite = (uint32_t)(BufInfo.fragments * BufInfo.fragsize);
+    uint32_t        cbToWrite;
+    uint32_t const  cbStreamBuf = pStreamOSS->OssCfg.cbFragment * pStreamOSS->OssCfg.cFragments;
+    if (BufInfo.bytes >= 0 && (unsigned)BufInfo.bytes <= cbStreamBuf)
+        cbToWrite = BufInfo.bytes;
+    else
+    {
+        AssertMsgFailed(("Invalid available size: %d\n", BufInfo.bytes));
+        AssertMsgReturn(BufInfo.fragments >= 0, ("fragments: %d\n", BufInfo.fragments), 0);
+        AssertMsgReturn(BufInfo.fragsize >= 0, ("fragsize: %d\n", BufInfo.fragsize), 0);
+        cbToWrite = (uint32_t)(BufInfo.fragments * BufInfo.fragsize);
+        AssertMsgStmt(cbToWrite <= cbStreamBuf, ("fragsize*fragments: %d, cbStreamBuf=%#x\n", cbToWrite, cbStreamBuf), 0);
+    }
+
     cbToWrite = RT_MIN(cbToWrite, cbBuf);
     Log3Func(("@%#RX64 cbBuf=%#x BufInfo: fragments=%#x fragstotal=%#x fragsize=%#x bytes=%#x %s cbToWrite=%#x\n",