Changeset 89388 in vbox

Timestamp:

May 31, 2021 10:03:25 AM (4 years ago)

Author:

vboxsync

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

144739

Message:

ValKit/AudioTest: Extensible wav-file support. Don't use RTMsgError++ in generic library files, so ferry error info back via RTERRINFO. Set up a release logger instance for the audio test program and point it at stderr. [build fix] bugref:10008

File:

• trunk/src/VBox/Devices/Audio/AudioTest.cpp (modified) (1 diff)

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

@@ -1411 +1411 @@
                     if (uBuf.Wave.u.Fmt.Data.uFormatTag == RTRIFFWAVEFMT_TAG_EXTENSIBLE)
                     {
-                        unsigned iCh = 0;
+                        static unsigned const   s_cStdIds = (unsigned)PDMAUDIOCHANNELID_END_STANDARD
+                                                          - (unsigned)PDMAUDIOCHANNELID_FIRST_STANDARD;
+                        unsigned                iCh       = 0;
                         for (unsigned idCh = 0; idCh < 32 && iCh < uBuf.Wave.u.Fmt.Data.cChannels; idCh++)
                             if (uBuf.Wave.u.FmtExt.Data.fChannelMask & RT_BIT_32(idCh))
                             {
-                                pWaveFile->Props.aidChannels[iCh] = idCh <   PDMAUDIOCHANNELID_END_STANDARD
-                                                                           - PDMAUDIOCHANNELID_FIRST_STANDARD
-                                                                  ? idCh + PDMAUDIOCHANNELID_END_STANDARD
-                                                                  : PDMAUDIOCHANNELID_UNKNOWN;
+                                pWaveFile->Props.aidChannels[iCh] = idCh < s_cStdIds
+                                                                  ? idCh + (unsigned)PDMAUDIOCHANNELID_FIRST_STANDARD
+                                                                  : (unsigned)PDMAUDIOCHANNELID_UNKNOWN;
                                 iCh++;
                             }