eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixes for ASIO sound interface

Browse source
This commit is contained in:
Volker Fischer 2008-11-01 22:26:17 +00:00
parent 78684feaf7
commit 8de53c301a
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
linux/sound.cpp
View file

@ -195,7 +195,7 @@ void CSound::SetInNumBuf ( int iNewNum )
if ( iNewNum != iCurPeriodSizeIn ) if ( iNewNum != iCurPeriodSizeIn )
{ {
iCurPeriodSizeIn = iNewNum; iCurPeriodSizeIn = iNewNum;
bChangParamIn = true; bChangParamIn = true;
} }
} }

24
windows/sound.cpp
View file

@ -481,6 +481,18 @@ std::string CSound::PrepareDriver()
iMinNumSndBuf = static_cast<int> ( iMinNumSndBuf = static_cast<int> (
ceil ( static_cast<double> ( iASIOBufferSizeMono ) / iBufferSizeMono ) ); ceil ( static_cast<double> ( iASIOBufferSizeMono ) / iBufferSizeMono ) );
// TODO better solution
// For some ASIO buffer sizes, the above calculation seems not to work although
// it should be correct. Maybe there is a misunderstanding or a bug in the
// sound interface implementation. As a workaround, we implement a table here, to
// get working parameters for the most common ASIO buffer settings
// Interesting observation: only 256 samples seems to be wrong, all other tested
// buffer sizes like 192, 512, 384, etc. are correct...
if ( iASIOBufferSizeMono == 256 )
{
iMinNumSndBuf = 4;
}
Q_ASSERT ( iMinNumSndBuf < MAX_SND_BUF_IN ); Q_ASSERT ( iMinNumSndBuf < MAX_SND_BUF_IN );
Q_ASSERT ( iMinNumSndBuf < MAX_SND_BUF_OUT ); Q_ASSERT ( iMinNumSndBuf < MAX_SND_BUF_OUT );
@ -498,7 +510,7 @@ std::string CSound::PrepareDriver()
QString().number ( iASIOBufferSizeMono ) + QString().number ( iASIOBufferSizeMono ) +
QString ( " samples which is too large. Please try to modify " QString ( " samples which is too large. Please try to modify "
"the ASIO buffer size value in your ASIO driver settings (most ASIO " "the ASIO buffer size value in your ASIO driver settings (most ASIO "
"drivers like ASIO4All or kx allow to change the ASIO buffer size). " "drivers like ASIO4All or kx driver allow to change the ASIO buffer size). "
"Recommended settings are 96 or 128 samples." ), "Ok", 0 ); "Recommended settings are 96 or 128 samples." ), "Ok", 0 );
} }
@ -739,7 +751,7 @@ void CSound::bufferSwitch ( long index, ASIOBool processNow )
{ {
psCaptureBuffer[iBufferPosCapture + psCaptureBuffer[iBufferPosCapture +
2 * iCurSample + bufferInfos[i].channelNum] = 2 * iCurSample + bufferInfos[i].channelNum] =
((short*) bufferInfos[i].buffers[index])[iCurSample]; ( (short*) bufferInfos[i].buffers[index] )[iCurSample];
} }
break; break;
@ -751,7 +763,7 @@ void CSound::bufferSwitch ( long index, ASIOBool processNow )
{ {
// convert current sample in 16 bit format // convert current sample in 16 bit format
int iCurSam = 0; int iCurSam = 0;
memcpy ( &iCurSam, ((char*) bufferInfos[i].buffers[index]) + iCurSample * 3, 3); memcpy ( &iCurSam, ( (char*) bufferInfos[i].buffers[index] ) + iCurSample * 3, 3 );
iCurSam >>= 8; iCurSam >>= 8;
psCaptureBuffer[iBufferPosCapture + psCaptureBuffer[iBufferPosCapture +
@ -783,7 +795,7 @@ void CSound::bufferSwitch ( long index, ASIOBool processNow )
case ASIOSTInt16LSB: case ASIOSTInt16LSB:
for ( iCurSample = 0; iCurSample < iASIOBufferSizeMono; iCurSample++ ) for ( iCurSample = 0; iCurSample < iASIOBufferSizeMono; iCurSample++ )
{ {
((short*) bufferInfos[i].buffers[index])[iCurSample] = ( (short*) bufferInfos[i].buffers[index] )[iCurSample] =
psPlayBuffer[2 * iCurSample + bufferInfos[i].channelNum]; psPlayBuffer[2 * iCurSample + bufferInfos[i].channelNum];
} }
break; break;
@ -798,7 +810,7 @@ void CSound::bufferSwitch ( long index, ASIOBool processNow )
int iCurSam = static_cast<int> ( psPlayBuffer[2 * iCurSample + bufferInfos[i].channelNum] ); int iCurSam = static_cast<int> ( psPlayBuffer[2 * iCurSample + bufferInfos[i].channelNum] );
iCurSam <<= 8; iCurSam <<= 8;
memcpy ( ((char*) bufferInfos[i].buffers[index]) + iCurSample * 3, &iCurSam, 3); memcpy ( ( (char*) bufferInfos[i].buffers[index] ) + iCurSample * 3, &iCurSam, 3 );
} }
break; break;
@ -807,7 +819,7 @@ void CSound::bufferSwitch ( long index, ASIOBool processNow )
{ {
// convert to 32 bit // convert to 32 bit
int iCurSam = static_cast<int> ( psPlayBuffer[2 * iCurSample + bufferInfos[i].channelNum] ); int iCurSam = static_cast<int> ( psPlayBuffer[2 * iCurSample + bufferInfos[i].channelNum] );
((int*) bufferInfos[i].buffers[index])[iCurSample] = ( iCurSam << 16 ); ( (int*) bufferInfos[i].buffers[index] )[iCurSample] = ( iCurSam << 16 );
} }
break; break;
} }