Changeset 87998 in vbox for trunk/src/VBox/Devices

Timestamp:

Mar 8, 2021 1:20:54 AM (4 years ago)

Author:

vboxsync

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

143121

Message:

Audio: nits. bugref:9890

File:

• trunk/src/VBox/Devices/Audio/DrvAudioCommon.cpp (modified) (4 diffs)

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

@@ -85 +85 @@
 
 /**
- * Retrieves the matching PDMAUDIOFMT for given bits + signing flag.
- *
- * @return  IPRT status code.
- * @return  PDMAUDIOFMT         Resulting audio format or PDMAUDIOFMT_INVALID if invalid.
- * @param   cBits               Bits to retrieve audio format for.
- * @param   fSigned             Signed flag for bits to retrieve audio format for.
- */
-PDMAUDIOFMT DrvAudioAudFmtBitsToAudFmt(uint8_t cBits, bool fSigned)
+ * Retrieves the matching PDMAUDIOFMT for the given bits + signing flag.
+ *
+ * @return  Matching PDMAUDIOFMT value.
+ * @retval  PDMAUDIOFMT_INVALID if unsupported @a cBits value.
+ *
+ * @param   cBits       The number of bits in the audio format.
+ * @param   fSigned     Whether the audio format is signed @c true or not.
+ */
+PDMAUDIOFMT DrvAudioAudFmtBitsToFormat(uint8_t cBits, bool fSigned)
 {
     if (fSigned)
@@ -101 +102 @@
             case 16: return PDMAUDIOFMT_S16;
             case 32: return PDMAUDIOFMT_S32;
-            default: break;
+            default: AssertMsgFailedReturn(("Bogus audio bits %RU8\n", cBits), PDMAUDIOFMT_INVALID);
         }
     }
@@ -111 +112 @@
             case 16: return PDMAUDIOFMT_U16;
             case 32: return PDMAUDIOFMT_U32;
-            default: break;
-        }
-    }
-
-    AssertMsgFailed(("Bogus audio bits %RU8\n", cBits));
-    return PDMAUDIOFMT_INVALID;
+            default: AssertMsgFailedReturn(("Bogus audio bits %RU8\n", cBits), PDMAUDIOFMT_INVALID);
+        }
+    }
 }
 
@@ -789 +787 @@
     if (!RTStrICmp(pszFmt, "u8"))
         return PDMAUDIOFMT_U8;
-    else if (!RTStrICmp(pszFmt, "u16"))
+    if (!RTStrICmp(pszFmt, "u16"))
         return PDMAUDIOFMT_U16;
-    else if (!RTStrICmp(pszFmt, "u32"))
+    if (!RTStrICmp(pszFmt, "u32"))
         return PDMAUDIOFMT_U32;
-    else if (!RTStrICmp(pszFmt, "s8"))
+    if (!RTStrICmp(pszFmt, "s8"))
         return PDMAUDIOFMT_S8;
-    else if (!RTStrICmp(pszFmt, "s16"))
+    if (!RTStrICmp(pszFmt, "s16"))
         return PDMAUDIOFMT_S16;
-    else if (!RTStrICmp(pszFmt, "s32"))
+    if (!RTStrICmp(pszFmt, "s32"))
         return PDMAUDIOFMT_S32;