儲存庫 vbox 的更動 62581

時間撮記:

2016-7-27 上午09:57:41 (8 年 以前)

作者:

vboxsync

訊息:

Audio: Committed too much.

檔案:

• trunk/src/VBox/Devices/Audio/DrvAudioCommon.cpp (修改) (8 筆差異)

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

@@ -366 +366 @@
     bool fEqual =    pProps->uHz         == pCfg->uHz
                   && pProps->cChannels   == pCfg->cChannels
-                  && pProps->cbBitrate   == pCfg->cbBitrate
                   && pProps->fSigned     == fSigned
                   && pProps->cBits       == cBits
@@ -383 +382 @@
     return    pProps1->uHz         == pProps2->uHz
            && pProps1->cChannels   == pProps2->cChannels
-           && pProps1->cbBitrate   == pProps2->cbBitrate
            && pProps1->fSigned     == pProps2->fSigned
            && pProps1->cBits       == pProps2->cBits
@@ -403 +401 @@
     pCfg->uHz           = pPCMProps->uHz;
     pCfg->cChannels     = pPCMProps->cChannels;
-    pCfg->cbBitrate     = DrvAudioHlpCalcBitrate(pPCMProps->cBits, pPCMProps->uHz, pPCMProps->cChannels) / 8;
     pCfg->enmFormat     = DrvAudioAudFmtBitsToAudFmt(pPCMProps->cBits, pPCMProps->fSigned);
 
@@ -441 +438 @@
     fValid |= pCfg->uHz > 0;
     /** @todo Check for defined frequencies supported. */
-    fValid |= pCfg->cbBitrate > 0;
 
     return fValid;
@@ -498 +494 @@
         pProps->cChannels   = pCfg->cChannels;
         pProps->uAlign      = (1 << pProps->cShift) - 1;
-        pProps->cbBitrate   = DrvAudioHlpCalcBitrate(pCfg) / 8;
         pProps->fSwapEndian = pCfg->enmEndianness != PDMAUDIOHOSTENDIANNESS;
     }
@@ -535 +530 @@
             break;
     }
-
-    LogFlow((", bitrate=%RU32", pCfg->cbBitrate));
 
     LogFlow((", endianness="));
@@ -681 +674 @@
     Assert(pProps->cChannels);
     Assert(pProps->uHz);
-    Assert(pProps->cbBitrate);
     Assert(pProps->cBits);
 
@@ -702 +694 @@
     pData->Hdr.u16NumChannels   = pProps->cChannels;
     pData->Hdr.u32SampleRate    = pProps->uHz;
-    pData->Hdr.u32ByteRate      = pProps->cbBitrate / 8;
+    pData->Hdr.u32ByteRate      = DrvAudioHlpCalcBitrate(pProps->cBits, pProps->uHz, pProps->cChannels) / 8;
     pData->Hdr.u16BlockAlign    = pProps->cChannels * pProps->cBits / 8;
     pData->Hdr.u16BitsPerSample = pProps->cBits;