Changeset 55335 in vbox for trunk/src/VBox
- Timestamp:
- Apr 17, 2015 4:00:22 PM (10 years ago)
- Location:
- trunk/src/VBox/Devices/Audio
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Devices/Audio/AudioMixBuffer.cpp
r55197 r55335 306 306 { \ 307 307 AUDMIXBUF_MACRO_LOG(("%p: l=%RI16, r=%RI16\n", paDst, *pSrc, *(pSrc + 1))); \ 308 paDst-> u64LSample = (ASMMult2xS32RetS64(audioMixBufClipFrom##_aName(*pSrc++), pOpts->Volume.uLeft ) >> 31); \309 paDst-> u64RSample = (ASMMult2xS32RetS64(audioMixBufClipFrom##_aName(*pSrc++), pOpts->Volume.uRight) >> 31); \310 AUDMIXBUF_MACRO_LOG(("\t-> l=%RI64, r=%RI64\n", paDst-> u64LSample, paDst->u64RSample)); \308 paDst->i64LSample = (ASMMult2xS32RetS64(audioMixBufClipFrom##_aName(*pSrc++), pOpts->Volume.uLeft ) >> 31); \ 309 paDst->i64RSample = (ASMMult2xS32RetS64(audioMixBufClipFrom##_aName(*pSrc++), pOpts->Volume.uRight) >> 31); \ 310 AUDMIXBUF_MACRO_LOG(("\t-> l=%RI64, r=%RI64\n", paDst->i64LSample, paDst->i64RSample)); \ 311 311 paDst++; \ 312 312 } \ … … 323 323 for (uint32_t i = 0; i < cSamples; i++) \ 324 324 { \ 325 paDst-> u64LSample = ASMMult2xS32RetS64(audioMixBufClipFrom##_aName(pSrc[0]), pOpts->Volume.uLeft); \326 paDst-> u64RSample = paDst->u64LSample; \325 paDst->i64LSample = ASMMult2xS32RetS64(audioMixBufClipFrom##_aName(pSrc[0]), pOpts->Volume.uLeft); \ 326 paDst->i64RSample = paDst->i64LSample; \ 327 327 pSrc++; \ 328 328 paDst++; \ … … 341 341 while (cSamples--) \ 342 342 { \ 343 AUDMIXBUF_MACRO_LOG(("%p: l=%RI64, r=%RI64\n", pSrc, pSrc-> u64LSample, pSrc->u64RSample)); \344 l = audioMixBufClipTo##_aName(pSrc-> u64LSample); \345 r = audioMixBufClipTo##_aName(pSrc-> u64RSample); \343 AUDMIXBUF_MACRO_LOG(("%p: l=%RI64, r=%RI64\n", pSrc, pSrc->i64LSample, pSrc->i64RSample)); \ 344 l = audioMixBufClipTo##_aName(pSrc->i64LSample); \ 345 r = audioMixBufClipTo##_aName(pSrc->i64RSample); \ 346 346 AUDMIXBUF_MACRO_LOG(("\t-> l=%RI16, r=%RI16\n", l, r)); \ 347 347 *pDst++ = l; \ … … 359 359 while (cSamples--) \ 360 360 { \ 361 *pDst++ = audioMixBufClipTo##_aName(pSrc-> u64LSample + pSrc->u64RSample); \361 *pDst++ = audioMixBufClipTo##_aName(pSrc->i64LSample + pSrc->i64RSample); \ 362 362 pSrc++; \ 363 363 } \ … … 386 386 { \ 387 387 AUDMIXBUF_MACRO_LOG(("cSrcSamples=%RU32, cDstSamples=%RU32\n", cSrcSamples, cDstSamples)); \ 388 AUDMIXBUF_MACRO_LOG(("pRate=%p: srcOffset=0x%x (%RU32), dstOffset=0x%x (%RU32), dstInc=0x% x(%RU64)\n", \388 AUDMIXBUF_MACRO_LOG(("pRate=%p: srcOffset=0x%x (%RU32), dstOffset=0x%x (%RU32), dstInc=0x%RX64 (%RU64)\n", \ 389 389 pRate, pRate->srcOffset, pRate->srcOffset, pRate->dstOffset >> 32, pRate->dstOffset >> 32, \ 390 390 pRate->dstInc, pRate->dstInc)); \ … … 396 396 for (uint32_t i = 0; i < cSamples; i++) \ 397 397 { \ 398 paDst[i]. u64LSample _aOp paSrc[i].u64LSample; \399 paDst[i]. u64RSample _aOp paSrc[i].u64RSample; \398 paDst[i].i64LSample _aOp paSrc[i].i64LSample; \ 399 paDst[i].i64RSample _aOp paSrc[i].i64RSample; \ 400 400 } \ 401 401 \ … … 446 446 int64_t iDstOffInt = pRate->dstOffset & UINT32_MAX; \ 447 447 \ 448 samOut. u64LSample = (samLast.u64LSample * ((int64_t) UINT32_MAX - iDstOffInt) + samCur.u64LSample * iDstOffInt) >> 32; \449 samOut. u64RSample = (samLast.u64RSample * ((int64_t) UINT32_MAX - iDstOffInt) + samCur.u64RSample * iDstOffInt) >> 32; \448 samOut.i64LSample = (samLast.i64LSample * ((int64_t) UINT32_MAX - iDstOffInt) + samCur.i64LSample * iDstOffInt) >> 32; \ 449 samOut.i64RSample = (samLast.i64RSample * ((int64_t) UINT32_MAX - iDstOffInt) + samCur.i64RSample * iDstOffInt) >> 32; \ 450 450 \ 451 paDst-> u64LSample _aOp samOut.u64LSample; \452 paDst-> u64RSample _aOp samOut.u64RSample; \451 paDst->i64LSample _aOp samOut.i64LSample; \ 452 paDst->i64RSample _aOp samOut.i64RSample; \ 453 453 paDst++; \ 454 454 \ 455 AUDMIXBUF_MACRO_LOG(("\tlDelta=0x% x (%RU64), iDstOffInt=0x%x(%RI64), l=%RI64, r=%RI64 (cur l=%RI64, r=%RI64)\n", \455 AUDMIXBUF_MACRO_LOG(("\tlDelta=0x%RX64 (%RU64), iDstOffInt=0x%RX64 (%RI64), l=%RI64, r=%RI64 (cur l=%RI64, r=%RI64)\n", \ 456 456 lDelta, lDelta, iDstOffInt, iDstOffInt, \ 457 paDst-> u64LSample, paDst->u64RSample, \458 samCur. u64LSample, samCur.u64RSample)); \457 paDst->i64LSample, paDst->i64RSample, \ 458 samCur.i64LSample, samCur.i64RSample)); \ 459 459 \ 460 460 pRate->dstOffset += pRate->dstInc; \ 461 461 \ 462 AUDMIXBUF_MACRO_LOG(("\t\tpRate->dstOffset=0x% x(%RU32)\n", pRate->dstOffset, pRate->dstOffset >> 32)); \462 AUDMIXBUF_MACRO_LOG(("\t\tpRate->dstOffset=0x%RX32 (%RU32)\n", pRate->dstOffset, pRate->dstOffset >> 32)); \ 463 463 \ 464 464 } \ … … 469 469 pRate->srcSampleLast = samLast; \ 470 470 \ 471 AUDMIXBUF_MACRO_LOG(("pRate->srcSampleLast l=%RI64, r=%RI64, lDelta=0x% x(%RU64)\n", \472 pRate->srcSampleLast. u64LSample, pRate->srcSampleLast.u64RSample, lDelta, lDelta)); \471 AUDMIXBUF_MACRO_LOG(("pRate->srcSampleLast l=%RI64, r=%RI64, lDelta=0x%RX64 (%RU64)\n", \ 472 pRate->srcSampleLast.i64LSample, pRate->srcSampleLast.i64RSample, lDelta, lDelta)); \ 473 473 \ 474 474 if (pcDstWritten) \ … … 746 746 / AUDMIXBUF_FMT_SAMPLE_FREQ(pParent->AudioFmt); 747 747 748 AUDMIXBUF_LOG(("uThisHz=%RU32, uParentHz=%RU32, iFreqRatio=0x% x (%RI64), uRateInc=0x%x(%RU64), cSamples=%RU32 (%RU32 parent)\n",748 AUDMIXBUF_LOG(("uThisHz=%RU32, uParentHz=%RU32, iFreqRatio=0x%RX64 (%RI64), uRateInc=0x%RX64 (%RU64), cSamples=%RU32 (%RU32 parent)\n", 749 749 AUDMIXBUF_FMT_SAMPLE_FREQ(pMixBuf->AudioFmt), 750 750 AUDMIXBUF_FMT_SAMPLE_FREQ(pParent->AudioFmt), -
trunk/src/VBox/Devices/Audio/DevIchAc97.cpp
r55272 r55335 566 566 streamCfg.cChannels = 2; 567 567 streamCfg.enmFormat = AUD_FMT_S16; 568 streamCfg.enmEndianness = PDMAUDIOHOSTENDIAN ESS;568 streamCfg.enmEndianness = PDMAUDIOHOSTENDIANNESS; 569 569 570 570 char *pszDesc; … … 992 992 streamCfg.cChannels = 2; 993 993 streamCfg.enmFormat = AUD_FMT_S16; 994 streamCfg.enmEndianness = PDMAUDIOHOSTENDIAN ESS;994 streamCfg.enmEndianness = PDMAUDIOHOSTENDIANNESS; 995 995 996 996 rc2 = audioMixerSetDeviceFormat(pThis->pMixer, &streamCfg); -
trunk/src/VBox/Devices/Audio/DevIchHda.cpp
r55270 r55335 1778 1778 pCfg->cChannels = (u32SdFmt & 0xf) + 1; 1779 1779 pCfg->enmFormat = enmFmt; 1780 pCfg->enmEndianness = PDMAUDIOHOSTENDIAN ESS;1780 pCfg->enmEndianness = PDMAUDIOHOSTENDIANNESS; 1781 1781 #else 1782 1782 pCfg->nchannels = (u32SdFmt & 0xf) + 1; … … 3849 3849 streamCfg.cChannels = 2; 3850 3850 streamCfg.enmFormat = AUD_FMT_S16; 3851 streamCfg.enmEndianness = PDMAUDIOHOSTENDIAN ESS;3851 streamCfg.enmEndianness = PDMAUDIOHOSTENDIANNESS; 3852 3852 3853 3853 rc = audioMixerSetDeviceFormat(pThis->pMixer, &streamCfg); -
trunk/src/VBox/Devices/Audio/DevIchHdaCodec.cpp
r55065 r55335 1 /* $Id$ */1 /* ENDIANNESS: DevIchHdaCodec.cpp 99354 2015-04-01 09:29:05Z andy $ */ 2 2 /** @file 3 3 * DevIchHdaCodec - VBox ICH Intel HD Audio Codec. … … 2464 2464 as.cChannels = 2; 2465 2465 as.enmFormat = AUD_FMT_S16; 2466 as.enmEndianness = PDMAUDIOHOSTENDIAN ESS;2466 as.enmEndianness = PDMAUDIOHOSTENDIANNESS; 2467 2467 #else 2468 2468 AUD_register_card("ICH0", &pThis->card); -
trunk/src/VBox/Devices/Audio/DevSB16.cpp
r55325 r55335 460 460 streamCfg.cChannels = 1 << pThis->fmt_stereo; 461 461 streamCfg.enmFormat = pThis->fmt; 462 streamCfg.enmEndianness = PDMAUDIOHOSTENDIAN ESS;462 streamCfg.enmEndianness = PDMAUDIOHOSTENDIANNESS; 463 463 464 464 int rc = sb16OpenOut(pThis, &streamCfg); … … 613 613 streamCfg.cChannels = 1 << pThis->fmt_stereo; 614 614 streamCfg.enmFormat = pThis->fmt; 615 streamCfg.enmEndianness = PDMAUDIOHOSTENDIAN ESS;615 streamCfg.enmEndianness = PDMAUDIOHOSTENDIANNESS; 616 616 617 617 int rc = sb16OpenOut(pThis, &streamCfg); … … 1135 1135 streamCfg.cChannels = 1; /* Mono */ 1136 1136 streamCfg.enmFormat = AUD_FMT_U8; 1137 streamCfg.enmEndianness = PDMAUDIOHOSTENDIAN ESS;1137 streamCfg.enmEndianness = PDMAUDIOHOSTENDIANNESS; 1138 1138 1139 1139 int rc = sb16OpenOut(pThis, &streamCfg); … … 1438 1438 streamCfg.cChannels = 2; 1439 1439 streamCfg.enmFormat = AUD_FMT_S16; 1440 streamCfg.enmEndianness = PDMAUDIOHOSTENDIAN ESS;1440 streamCfg.enmEndianness = PDMAUDIOHOSTENDIANNESS; 1441 1441 1442 1442 rc2 = audioMixerSetDeviceFormat(pThis->pMixer, &streamCfg); … … 2053 2053 streamCfg.cChannels = 1 << pThis->fmt_stereo; 2054 2054 streamCfg.enmFormat = pThis->fmt; 2055 streamCfg.enmEndianness = PDMAUDIOHOSTENDIAN ESS;2055 streamCfg.enmEndianness = PDMAUDIOHOSTENDIANNESS; 2056 2056 2057 2057 int rc = sb16OpenOut(pThis, &streamCfg); -
trunk/src/VBox/Devices/Audio/DrvAudio.cpp
r55032 r55335 285 285 || pCfg->cChannels == 2); /* Either stereo (2) or mono (1), per stream. */ 286 286 287 fValid |= ( pCfg->enmEndianness == PDMAUDIOENDIAN ESS_LITTLE288 || pCfg->enmEndianness == PDMAUDIOENDIAN ESS_BIG);287 fValid |= ( pCfg->enmEndianness == PDMAUDIOENDIANNESS_LITTLE 288 || pCfg->enmEndianness == PDMAUDIOENDIANNESS_BIG); 289 289 290 290 if (fValid) -
trunk/src/VBox/Devices/Audio/DrvAudio.h
r55057 r55335 177 177 2, /* nchannels */ 178 178 AUD_FMT_S16, /* fmt */ 179 PDMAUDIOHOSTENDIAN ESS179 PDMAUDIOHOSTENDIANNESS 180 180 } 181 181 }, … … 190 190 2, /* nchannels */ 191 191 AUD_FMT_S16, /* fmt */ 192 PDMAUDIOHOSTENDIAN ESS192 PDMAUDIOHOSTENDIANNESS 193 193 } 194 194 }, -
trunk/src/VBox/Devices/Audio/DrvAudioCommon.cpp
r54973 r55335 308 308 && pProps->fSigned == fSigned 309 309 && pProps->cBits == cBits 310 && pProps->fSwapEndian == !(pCfg->enmEndianness == PDMAUDIOHOSTENDIAN ESS);310 && pProps->fSwapEndian == !(pCfg->enmEndianness == PDMAUDIOHOSTENDIANNESS); 311 311 312 312 LogFlowFunc(("fEqual=%RTbool\n", fEqual)); … … 357 357 pProps->uAlign = (1 << pProps->cShift) - 1; 358 358 pProps->cbPerSec = pProps->uHz << pProps->cShift; 359 pProps->fSwapEndian = pCfg->enmEndianness != PDMAUDIOHOSTENDIAN ESS;359 pProps->fSwapEndian = pCfg->enmEndianness != PDMAUDIOHOSTENDIANNESS; 360 360 } 361 361 … … 401 401 switch (pCfg->enmEndianness) 402 402 { 403 case PDMAUDIOENDIAN ESS_LITTLE:403 case PDMAUDIOENDIANNESS_LITTLE: 404 404 LogFlow(("little\n")); 405 405 break; 406 case PDMAUDIOENDIAN ESS_BIG:406 case PDMAUDIOENDIANNESS_BIG: 407 407 LogFlow(("big\n")); 408 408 break; -
trunk/src/VBox/Devices/Audio/DrvHostALSAAudio.cpp
r54907 r55335 219 219 220 220 static int drvHostALSAAudioALSAToFmt(snd_pcm_format_t fmt, 221 PDMAUDIOFMT *pFmt, PDMAUDIOENDIAN ESS *pEndianness)221 PDMAUDIOFMT *pFmt, PDMAUDIOENDIANNESS *pEndianness) 222 222 { 223 223 AssertPtrReturn(pFmt, VERR_INVALID_POINTER); … … 229 229 *pFmt = AUD_FMT_S8; 230 230 if (pEndianness) 231 *pEndianness = PDMAUDIOENDIAN ESS_LITTLE;231 *pEndianness = PDMAUDIOENDIANNESS_LITTLE; 232 232 break; 233 233 … … 235 235 *pFmt = AUD_FMT_U8; 236 236 if (pEndianness) 237 *pEndianness = PDMAUDIOENDIAN ESS_LITTLE;237 *pEndianness = PDMAUDIOENDIANNESS_LITTLE; 238 238 break; 239 239 … … 241 241 *pFmt = AUD_FMT_S16; 242 242 if (pEndianness) 243 *pEndianness = PDMAUDIOENDIAN ESS_LITTLE;243 *pEndianness = PDMAUDIOENDIANNESS_LITTLE; 244 244 break; 245 245 … … 247 247 *pFmt = AUD_FMT_U16; 248 248 if (pEndianness) 249 *pEndianness = PDMAUDIOENDIAN ESS_LITTLE;249 *pEndianness = PDMAUDIOENDIANNESS_LITTLE; 250 250 break; 251 251 … … 253 253 *pFmt = AUD_FMT_S16; 254 254 if (pEndianness) 255 *pEndianness = PDMAUDIOENDIAN ESS_BIG;255 *pEndianness = PDMAUDIOENDIANNESS_BIG; 256 256 break; 257 257 … … 259 259 *pFmt = AUD_FMT_U16; 260 260 if (pEndianness) 261 *pEndianness = PDMAUDIOENDIAN ESS_BIG;261 *pEndianness = PDMAUDIOENDIANNESS_BIG; 262 262 break; 263 263 … … 265 265 *pFmt = AUD_FMT_S32; 266 266 if (pEndianness) 267 *pEndianness = PDMAUDIOENDIAN ESS_LITTLE;267 *pEndianness = PDMAUDIOENDIANNESS_LITTLE; 268 268 break; 269 269 … … 271 271 *pFmt = AUD_FMT_U32; 272 272 if (pEndianness) 273 *pEndianness = PDMAUDIOENDIAN ESS_LITTLE;273 *pEndianness = PDMAUDIOENDIANNESS_LITTLE; 274 274 break; 275 275 … … 277 277 *pFmt = AUD_FMT_S32; 278 278 if (pEndianness) 279 *pEndianness = PDMAUDIOENDIAN ESS_BIG;279 *pEndianness = PDMAUDIOENDIANNESS_BIG; 280 280 break; 281 281 … … 283 283 *pFmt = AUD_FMT_U32; 284 284 if (pEndianness) 285 *pEndianness = PDMAUDIOENDIAN ESS_BIG;285 *pEndianness = PDMAUDIOENDIANNESS_BIG; 286 286 break; 287 287 … … 1088 1088 1089 1089 PDMAUDIOFMT enmFormat; 1090 PDMAUDIOENDIAN ESS enmEnd;1090 PDMAUDIOENDIANNESS enmEnd; 1091 1091 rc = drvHostALSAAudioALSAToFmt(obt.fmt, &enmFormat, &enmEnd); 1092 1092 if (RT_FAILURE(rc)) … … 1159 1159 1160 1160 PDMAUDIOFMT enmFormat; 1161 PDMAUDIOENDIAN ESS enmEnd;1161 PDMAUDIOENDIANNESS enmEnd; 1162 1162 rc = drvHostALSAAudioALSAToFmt(obt.fmt, &enmFormat, &enmEnd); 1163 1163 if (RT_FAILURE(rc)) -
trunk/src/VBox/Devices/Audio/DrvHostDSound.cpp
r55163 r55335 989 989 990 990 pDSoundStrmOut->streamCfg = *pCfg; 991 pDSoundStrmOut->streamCfg.enmEndianness = PDMAUDIOHOSTENDIAN ESS;991 pDSoundStrmOut->streamCfg.enmEndianness = PDMAUDIOHOSTENDIANNESS; 992 992 993 993 int rc = drvAudioStreamCfgToProps(&pDSoundStrmOut->streamCfg, &pDSoundStrmOut->hw.Props); … … 1229 1229 1230 1230 pDSoundStrmIn->streamCfg = *pCfg; 1231 pDSoundStrmIn->streamCfg.enmEndianness = PDMAUDIOHOSTENDIAN ESS;1231 pDSoundStrmIn->streamCfg.enmEndianness = PDMAUDIOHOSTENDIANNESS; 1232 1232 1233 1233 /** @todo caller should already init Props? */ -
trunk/src/VBox/Devices/Audio/DrvHostOSSAudio.cpp
r54575 r55335 58 58 { 59 59 PDMAUDIOFMT enmFormat; 60 PDMAUDIOENDIAN ESS enmEndianess;60 PDMAUDIOENDIANNESS enmENDIANNESS; 61 61 uint16_t uFreq; 62 62 uint8_t cChannels; … … 157 157 158 158 static int drvHostOSSAudioOSSToFmt(int fmt, 159 PDMAUDIOFMT *pFmt, PDMAUDIOENDIAN ESS *pEndianess)159 PDMAUDIOFMT *pFmt, PDMAUDIOENDIANNESS *pENDIANNESS) 160 160 { 161 161 switch (fmt) … … 163 163 case AFMT_S8: 164 164 *pFmt = AUD_FMT_S8; 165 if (pE ndianess)166 *pE ndianess = PDMAUDIOENDIANESS_LITTLE;165 if (pENDIANNESS) 166 *pENDIANNESS = PDMAUDIOENDIANNESS_LITTLE; 167 167 break; 168 168 169 169 case AFMT_U8: 170 170 *pFmt = AUD_FMT_U8; 171 if (pE ndianess)172 *pE ndianess = PDMAUDIOENDIANESS_LITTLE;171 if (pENDIANNESS) 172 *pENDIANNESS = PDMAUDIOENDIANNESS_LITTLE; 173 173 break; 174 174 175 175 case AFMT_S16_LE: 176 176 *pFmt = AUD_FMT_S16; 177 if (pE ndianess)178 *pE ndianess = PDMAUDIOENDIANESS_LITTLE;177 if (pENDIANNESS) 178 *pENDIANNESS = PDMAUDIOENDIANNESS_LITTLE; 179 179 break; 180 180 181 181 case AFMT_U16_LE: 182 182 *pFmt = AUD_FMT_U16; 183 if (pE ndianess)184 *pE ndianess = PDMAUDIOENDIANESS_LITTLE;183 if (pENDIANNESS) 184 *pENDIANNESS = PDMAUDIOENDIANNESS_LITTLE; 185 185 break; 186 186 187 187 case AFMT_S16_BE: 188 188 *pFmt = AUD_FMT_S16; 189 if (pE ndianess)190 *pE ndianess = PDMAUDIOENDIANESS_BIG;189 if (pENDIANNESS) 190 *pENDIANNESS = PDMAUDIOENDIANNESS_BIG; 191 191 break; 192 192 193 193 case AFMT_U16_BE: 194 194 *pFmt = AUD_FMT_U16; 195 if (pE ndianess)196 *pE ndianess = PDMAUDIOENDIANESS_BIG;195 if (pENDIANNESS) 196 *pENDIANNESS = PDMAUDIOENDIANNESS_BIG; 197 197 break; 198 198 … … 312 312 313 313 rc = drvHostOSSAudioOSSToFmt(iFormat, 314 &pObt->enmFormat, &pObt->enmE ndianess);314 &pObt->enmFormat, &pObt->enmENDIANNESS); 315 315 if (RT_SUCCESS(rc)) 316 316 { … … 597 597 streamCfg.uHz = obtStream.uFreq; 598 598 streamCfg.cChannels = pCfg->cChannels; 599 streamCfg.enmEndianness = obtStream.enmE ndianess;599 streamCfg.enmEndianness = obtStream.enmENDIANNESS; 600 600 601 601 rc = drvAudioStreamCfgToProps(&streamCfg, &pHstStrmIn->Props); … … 674 674 streamCfg.uHz = obtStream.uFreq; 675 675 streamCfg.cChannels = pCfg->cChannels; 676 streamCfg.enmEndianness = obtStream.enmE ndianess;676 streamCfg.enmEndianness = obtStream.enmENDIANNESS; 677 677 678 678 rc = drvAudioStreamCfgToProps(&streamCfg, &pHstStrmOut->Props); -
trunk/src/VBox/Devices/Audio/DrvHostPulseAudio.cpp
r54910 r55335 154 154 155 155 static int drvHostPulseAudioPulseToFmt(pa_sample_format_t pulsefmt, 156 PDMAUDIOFMT *pFmt, PDMAUDIOENDIAN ESS *pEndianess)156 PDMAUDIOFMT *pFmt, PDMAUDIOENDIANNESS *pEndianess) 157 157 { 158 158 switch (pulsefmt) … … 160 160 case PA_SAMPLE_U8: 161 161 *pFmt = AUD_FMT_U8; 162 *pEndianess = PDMAUDIOENDIAN ESS_LITTLE;162 *pEndianess = PDMAUDIOENDIANNESS_LITTLE; 163 163 break; 164 164 165 165 case PA_SAMPLE_S16LE: 166 166 *pFmt = AUD_FMT_S16; 167 *pEndianess = PDMAUDIOENDIAN ESS_LITTLE;167 *pEndianess = PDMAUDIOENDIANNESS_LITTLE; 168 168 break; 169 169 170 170 case PA_SAMPLE_S16BE: 171 171 *pFmt = AUD_FMT_S16; 172 *pEndianess = PDMAUDIOENDIAN ESS_BIG;172 *pEndianess = PDMAUDIOENDIANNESS_BIG; 173 173 break; 174 174 … … 176 176 case PA_SAMPLE_S32LE: 177 177 *pFmt = AUD_FMT_S32; 178 *pEndianess = PDMAUDIOENDIAN ESS_LITTLE;178 *pEndianess = PDMAUDIOENDIANNESS_LITTLE; 179 179 break; 180 180 #endif … … 183 183 case PA_SAMPLE_S32BE: 184 184 *pFmt = AUD_FMT_S32; 185 *pEndianess = PDMAUDIOENDIAN ESS_BIG;185 *pEndianess = PDMAUDIOENDIANNESS_BIG; 186 186 break; 187 187 #endif -
trunk/src/VBox/Devices/Audio/testcase/tstAudioMixBuffer.cpp
r55270 r55335 46 46 2 /* Channels */, 47 47 AUD_FMT_S16 /* Format */, 48 PDMAUDIOENDIAN ESS_LITTLE /* Endianess*/48 PDMAUDIOENDIANNESS_LITTLE /* ENDIANNESS */ 49 49 }; 50 50 PDMPCMPROPS props; … … 143 143 2 /* Channels */, 144 144 AUD_FMT_S16 /* Format */, 145 PDMAUDIOENDIAN ESS_LITTLE /* Endianess*/145 PDMAUDIOENDIANNESS_LITTLE /* ENDIANNESS */ 146 146 }; 147 147 PDMPCMPROPS props; … … 158 158 2 /* Channels */, 159 159 AUD_FMT_S16 /* Format */, 160 PDMAUDIOENDIAN ESS_LITTLE /* Endianess*/160 PDMAUDIOENDIANNESS_LITTLE /* ENDIANNESS */ 161 161 }; 162 162 … … 173 173 2 /* Channels */, 174 174 AUD_FMT_S16 /* Format */, 175 PDMAUDIOENDIAN ESS_LITTLE /* Endianess*/175 PDMAUDIOENDIANNESS_LITTLE /* ENDIANNESS */ 176 176 }; 177 177
Note:
See TracChangeset
for help on using the changeset viewer.