Changeset 87299 in vbox for trunk/src

Timestamp:

Jan 18, 2021 2:06:59 PM (4 years ago)

Author:

vboxsync

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

142258

Message:

Audio/ALSA: Resolved a @todo (Initialize fSwapEndian in alsaALSAToAudioProps()).

File:

• trunk/src/VBox/Devices/Audio/DrvHostALSAAudio.cpp (modified) (8 diffs)

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

@@ -161 +161 @@
 static int alsaALSAToAudioProps(snd_pcm_format_t fmt, PPDMAUDIOPCMPROPS pProps)
 {
-    /** @todo r=bird: Why isn't this code setting fSwapEndian for every case? It
-     *        seems to make some UNDOCUMENT ASSUMPTIONS about pProps. */
     switch (fmt)
     {
@@ -168 +166 @@
             pProps->cbSample    = 1;
             pProps->fSigned     = true;
+            pProps->fSwapEndian = false;
             break;
 
@@ -173 +172 @@
             pProps->cbSample    = 1;
             pProps->fSigned     = false;
+            pProps->fSwapEndian = false;
             break;
 
@@ -178 +178 @@
             pProps->cbSample    = 2;
             pProps->fSigned     = true;
+            pProps->fSwapEndian = false;
             break;
 
@@ -183 +184 @@
             pProps->cbSample    = 2;
             pProps->fSigned     = false;
+            pProps->fSwapEndian = false;
             break;
 
@@ -204 +206 @@
             pProps->cbSample    = 4;
             pProps->fSigned     = true;
+            pProps->fSwapEndian = false;
             break;
 
@@ -209 +212 @@
             pProps->cbSample    = 4;
             pProps->fSigned     = false;
+            pProps->fSwapEndian = false;
             break;
 
@@ -231 +235 @@
     }
 
-    Assert(pProps->cbSample > 0);
-    Assert(pProps->cChannels > 0);
+    AssertReturn(pProps->cbSample > 0,  VERR_NOT_SUPPORTED);
+    AssertReturn(pProps->cChannels > 0, VERR_INVALID_PARAMETER);
+
     pProps->cShift = PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(pProps->cbSample, pProps->cChannels);