Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2024-12-31 21:29:39 +00:00
Code Issues Projects Releases Wiki Activity

Speaker: change from mono to stereo sound buffer (but left channel silent).

Browse Source 
Possible fix for #1159.
This commit is contained in:
tomcw 2024-01-13 17:55:57 +00:00
parent c022bbde72
commit 78ee8101d5
4 changed files with 85 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
help/CommandLine.html
View File

@ -203,9 +203,9 @@
<br> <br>
-wav-speaker &lt;file.wav&gt;<br> -wav-speaker &lt;file.wav&gt;<br>
Save the speaker audio to a .wav file.<br> Save the speaker audio to a .wav file.<br>
Warning: there's no file size limit, so it just keeps saving until AppleWin exits (~5MB per minute).<br> Warning: there's no file size limit, so it just keeps saving until AppleWin exits (~10MB per minute).<br>
<br> <br>
Save the Mockingboard audio to a .wav file.<br> Save the Mockingboard audio (but not speech) to a .wav file.<br>
-wav-mockingboard &lt;file.wav&gt;<br> -wav-mockingboard &lt;file.wav&gt;<br>
Warning: there's no file size limit, so it just keeps saving until AppleWin exits (~10MB per minute).<br> Warning: there's no file size limit, so it just keeps saving until AppleWin exits (~10MB per minute).<br>
<br> <br>

109
source/Speaker.cpp
View File

@ -53,7 +53,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// their buffers are running low. // their buffers are running low.
// //
static const unsigned short g_nSPKR_NumChannels = 1; static const unsigned short g_nSPKR_NumChannels = 2;
static const DWORD g_dwDSSpkrBufferSize = MAX_SAMPLES * sizeof(short) * g_nSPKR_NumChannels; static const DWORD g_dwDSSpkrBufferSize = MAX_SAMPLES * sizeof(short) * g_nSPKR_NumChannels;
//------------------------------------- //-------------------------------------
@ -64,7 +64,7 @@ static short* g_pSpeakerBuffer = NULL;
const short SPKR_DATA_INIT = (short)0x8000; const short SPKR_DATA_INIT = (short)0x8000;
short g_nSpeakerData = SPKR_DATA_INIT; short g_nSpeakerData = SPKR_DATA_INIT;
static UINT g_nBufferIdx = 0; static UINT g_nBufferIdx = 0; // Sample index
static short* g_pRemainderBuffer = NULL; static short* g_pRemainderBuffer = NULL;
static UINT g_nRemainderBufferSize; // Setup in SpkrInitialize() static UINT g_nRemainderBufferSize; // Setup in SpkrInitialize()
@ -101,6 +101,11 @@ void Spkr_OutputToRiff(void)
g_bSpkrOutputToRiff = true; g_bSpkrOutputToRiff = true;
} }
UINT Spkr_GetNumChannels(void)
{
return g_nSPKR_NumChannels;
}
//============================================================================= //=============================================================================
static void DisplayBenchmarkResults () static void DisplayBenchmarkResults ()
@ -269,7 +274,7 @@ void SpkrInitialize ()
{ {
InitRemainderBuffer(); InitRemainderBuffer();
g_pSpeakerBuffer = new short [SPKR_SAMPLE_RATE]; // Buffer can hold a max of 1 seconds worth of samples g_pSpeakerBuffer = new short [SPKR_SAMPLE_RATE * g_nSPKR_NumChannels]; // Buffer can hold a max of 1 seconds worth of samples
} }
} }
@ -341,8 +346,19 @@ static void UpdateRemainderBuffer(ULONG* pnCycleDiff)
nSampleMean += (signed long) g_pRemainderBuffer[i]; nSampleMean += (signed long) g_pRemainderBuffer[i];
nSampleMean /= (signed long) g_nRemainderBufferSize; nSampleMean /= (signed long) g_nRemainderBufferSize;
if(g_nBufferIdx < SPKR_SAMPLE_RATE-1) if (g_nBufferIdx < SPKR_SAMPLE_RATE - 1)
g_pSpeakerBuffer[g_nBufferIdx++] = DCFilter( (short)nSampleMean ); {
if (g_nSPKR_NumChannels == 1)
{
g_pSpeakerBuffer[g_nBufferIdx] = DCFilter((short)nSampleMean);
}
else
{
g_pSpeakerBuffer[g_nBufferIdx * 2 + 0] = 0x0000;
g_pSpeakerBuffer[g_nBufferIdx * 2 + 1] = DCFilter((short)nSampleMean);
}
g_nBufferIdx++;
}
} }
} }
} }
@ -359,8 +375,19 @@ static void UpdateSpkr()
ULONG nCyclesRemaining = (ULONG) ((double)nCycleDiff - (double)nNumSamples * g_fClksPerSpkrSample); ULONG nCyclesRemaining = (ULONG) ((double)nCycleDiff - (double)nNumSamples * g_fClksPerSpkrSample);
while((nNumSamples--) && (g_nBufferIdx < SPKR_SAMPLE_RATE-1)) while ((nNumSamples--) && (g_nBufferIdx < SPKR_SAMPLE_RATE - 1))
g_pSpeakerBuffer[g_nBufferIdx++] = DCFilter(g_nSpeakerData); {
if (g_nSPKR_NumChannels == 1)
{
g_pSpeakerBuffer[g_nBufferIdx] = DCFilter(g_nSpeakerData);
}
else
{
g_pSpeakerBuffer[g_nBufferIdx * 2 + 0] = 0x0000;
g_pSpeakerBuffer[g_nBufferIdx * 2 + 1] = DCFilter(g_nSpeakerData);
}
g_nBufferIdx++;
}
ReinitRemainderBuffer(nCyclesRemaining); // Partially fill 1Mhz sample buffer ReinitRemainderBuffer(nCyclesRemaining); // Partially fill 1Mhz sample buffer
} }
@ -454,7 +481,7 @@ void SpkrUpdate (DWORD totalcycles)
nSamplesUsed = Spkr_SubmitWaveBuffer(g_pSpeakerBuffer, g_nBufferIdx); nSamplesUsed = Spkr_SubmitWaveBuffer(g_pSpeakerBuffer, g_nBufferIdx);
_ASSERT(nSamplesUsed <= g_nBufferIdx); _ASSERT(nSamplesUsed <= g_nBufferIdx);
memmove(g_pSpeakerBuffer, &g_pSpeakerBuffer[nSamplesUsed], g_nBufferIdx-nSamplesUsed); // FIXME-TC: _Size * 2 memmove(g_pSpeakerBuffer, &g_pSpeakerBuffer[nSamplesUsed], (g_nBufferIdx - nSamplesUsed) * sizeof(short) * g_nSPKR_NumChannels);
g_nBufferIdx -= nSamplesUsed; g_nBufferIdx -= nSamplesUsed;
} }
} }
@ -470,7 +497,7 @@ void SpkrUpdate_Timer()
nSamplesUsed = Spkr_SubmitWaveBuffer_FullSpeed(g_pSpeakerBuffer, g_nBufferIdx); nSamplesUsed = Spkr_SubmitWaveBuffer_FullSpeed(g_pSpeakerBuffer, g_nBufferIdx);
_ASSERT(nSamplesUsed <= g_nBufferIdx); _ASSERT(nSamplesUsed <= g_nBufferIdx);
memmove(g_pSpeakerBuffer, &g_pSpeakerBuffer[nSamplesUsed], g_nBufferIdx-nSamplesUsed); // FIXME-TC: _Size * 2 (GH#213?) memmove(g_pSpeakerBuffer, &g_pSpeakerBuffer[nSamplesUsed], (g_nBufferIdx - nSamplesUsed) * sizeof(short) * g_nSPKR_NumChannels);
g_nBufferIdx -= nSamplesUsed; g_nBufferIdx -= nSamplesUsed;
} }
} }
@ -559,7 +586,7 @@ static ULONG Spkr_SubmitWaveBuffer_FullSpeed(short* pSpeakerBuffer, ULONG nNumSa
if(nBytesRemaining < g_dwDSSpkrBufferSize / 4) if(nBytesRemaining < g_dwDSSpkrBufferSize / 4)
{ {
// < 1/4 of play-buffer remaining (need *more* data) // < 1/4 of play-buffer remaining (need *more* data)
nNumPadSamples = ((g_dwDSSpkrBufferSize / 4) - nBytesRemaining) / sizeof(short); nNumPadSamples = ((g_dwDSSpkrBufferSize / 4) - nBytesRemaining) / (sizeof(short) * g_nSPKR_NumChannels);
if(nNumPadSamples > nNumSamples) if(nNumPadSamples > nNumSamples)
nNumPadSamples -= nNumSamples; nNumPadSamples -= nNumSamples;
@ -574,15 +601,15 @@ static ULONG Spkr_SubmitWaveBuffer_FullSpeed(short* pSpeakerBuffer, ULONG nNumSa
UINT nBytesFree = g_dwDSSpkrBufferSize - nBytesRemaining; // Calc free buffer space UINT nBytesFree = g_dwDSSpkrBufferSize - nBytesRemaining; // Calc free buffer space
ULONG nNumSamplesToUse = nNumSamples + nNumPadSamples; ULONG nNumSamplesToUse = nNumSamples + nNumPadSamples;
if(nNumSamplesToUse * sizeof(short) > nBytesFree) if (nNumSamplesToUse * sizeof(short) * g_nSPKR_NumChannels > nBytesFree)
nNumSamplesToUse = nBytesFree / sizeof(short); nNumSamplesToUse = nBytesFree / (sizeof(short) * g_nSPKR_NumChannels);
// //
if(nNumSamplesToUse >= 128) // Limit the buffer unlock/locking to a minimum if(nNumSamplesToUse >= 128) // Limit the buffer unlock/locking to a minimum
{ {
hr = DSGetLock(SpeakerVoice.lpDSBvoice, hr = DSGetLock(SpeakerVoice.lpDSBvoice,
dwByteOffset, (DWORD)nNumSamplesToUse * sizeof(short), dwByteOffset, (DWORD)nNumSamplesToUse * sizeof(short) * g_nSPKR_NumChannels,
&pDSLockedBuffer0, &dwDSLockedBufferSize0, &pDSLockedBuffer0, &dwDSLockedBufferSize0,
&pDSLockedBuffer1, &dwDSLockedBufferSize1); &pDSLockedBuffer1, &dwDSLockedBufferSize1);
if (FAILED(hr)) if (FAILED(hr))
@ -597,15 +624,15 @@ static ULONG Spkr_SubmitWaveBuffer_FullSpeed(short* pSpeakerBuffer, ULONG nNumSa
{ {
//LogOutput("[Submit_FS] C=%08X, PC=%08X, WC=%08X, Diff=%08X, Off=%08X, NS=%08X ***\n", nDbgSpkrCnt, dwCurrentPlayCursor, dwCurrentWriteCursor, dwCurrentWriteCursor-dwCurrentPlayCursor, dwByteOffset, nNumSamples); //LogOutput("[Submit_FS] C=%08X, PC=%08X, WC=%08X, Diff=%08X, Off=%08X, NS=%08X ***\n", nDbgSpkrCnt, dwCurrentPlayCursor, dwCurrentWriteCursor, dwCurrentWriteCursor-dwCurrentPlayCursor, dwByteOffset, nNumSamples);
if(nNumSamples*sizeof(short) <= dwDSLockedBufferSize0) if (nNumSamples * sizeof(short) * g_nSPKR_NumChannels <= dwDSLockedBufferSize0)
{ {
dwBufferSize0 = nNumSamples*sizeof(short); dwBufferSize0 = nNumSamples * sizeof(short) * g_nSPKR_NumChannels;
dwBufferSize1 = 0; dwBufferSize1 = 0;
} }
else else
{ {
dwBufferSize0 = dwDSLockedBufferSize0; dwBufferSize0 = dwDSLockedBufferSize0;
dwBufferSize1 = nNumSamples*sizeof(short) - dwDSLockedBufferSize0; dwBufferSize1 = nNumSamples * sizeof(short) * g_nSPKR_NumChannels - dwDSLockedBufferSize0;
if(dwBufferSize1 > dwDSLockedBufferSize1) if(dwBufferSize1 > dwDSLockedBufferSize1)
dwBufferSize1 = dwDSLockedBufferSize1; dwBufferSize1 = dwDSLockedBufferSize1;
@ -613,15 +640,15 @@ static ULONG Spkr_SubmitWaveBuffer_FullSpeed(short* pSpeakerBuffer, ULONG nNumSa
memcpy(pDSLockedBuffer0, &pSpeakerBuffer[0], dwBufferSize0); memcpy(pDSLockedBuffer0, &pSpeakerBuffer[0], dwBufferSize0);
if (g_bSpkrOutputToRiff) if (g_bSpkrOutputToRiff)
RiffPutSamples(pDSLockedBuffer0, dwBufferSize0/sizeof(short)); RiffPutSamples(pDSLockedBuffer0, dwBufferSize0 / (sizeof(short) * g_nSPKR_NumChannels));
nNumSamples = dwBufferSize0/sizeof(short); nNumSamples = dwBufferSize0 / (sizeof(short) * g_nSPKR_NumChannels);
if(pDSLockedBuffer1 && dwBufferSize1) if(pDSLockedBuffer1 && dwBufferSize1)
{ {
memcpy(pDSLockedBuffer1, &pSpeakerBuffer[dwDSLockedBufferSize0/sizeof(short)], dwBufferSize1); memcpy(pDSLockedBuffer1, &pSpeakerBuffer[dwDSLockedBufferSize0/sizeof(short)], dwBufferSize1);
if (g_bSpkrOutputToRiff) if (g_bSpkrOutputToRiff)
RiffPutSamples(pDSLockedBuffer1, dwBufferSize1/sizeof(short)); RiffPutSamples(pDSLockedBuffer1, dwBufferSize1 / (sizeof(short) * g_nSPKR_NumChannels));
nNumSamples += dwBufferSize1/sizeof(short); nNumSamples += dwBufferSize1 / (sizeof(short) * g_nSPKR_NumChannels);
} }
} }
@ -634,16 +661,42 @@ static ULONG Spkr_SubmitWaveBuffer_FullSpeed(short* pSpeakerBuffer, ULONG nNumSa
if(dwBufferSize0) if(dwBufferSize0)
{ {
std::fill_n(pDSLockedBuffer0, dwBufferSize0/sizeof(short), DCFilter(g_nSpeakerData)); const UINT numSamples = dwBufferSize0 / (sizeof(short) * g_nSPKR_NumChannels);
if (g_nSPKR_NumChannels == 1)
{
std::fill_n(pDSLockedBuffer0, numSamples, DCFilter(g_nSpeakerData));
}
else
{
for (UINT i = 0; i < numSamples; i++)
{
pDSLockedBuffer0[i * 2 + 0] = 0x0000;
pDSLockedBuffer0[i * 2 + 1] = DCFilter(g_nSpeakerData);
}
}
if (g_bSpkrOutputToRiff) if (g_bSpkrOutputToRiff)
RiffPutSamples(pDSLockedBuffer0, dwBufferSize0/sizeof(short)); RiffPutSamples(pDSLockedBuffer0, numSamples);
} }
if(pDSLockedBuffer1) if(pDSLockedBuffer1)
{ {
std::fill_n(pDSLockedBuffer1, dwBufferSize1/sizeof(short), DCFilter(g_nSpeakerData)); const UINT numSamples = dwBufferSize0 / (sizeof(short) * g_nSPKR_NumChannels);
if (g_nSPKR_NumChannels == 1)
{
std::fill_n(pDSLockedBuffer1, numSamples, DCFilter(g_nSpeakerData));
}
else
{
for (UINT i = 0; i < numSamples; i++)
{
pDSLockedBuffer1[i * 2 + 0] = 0x0000;
pDSLockedBuffer1[i * 2 + 1] = DCFilter(g_nSpeakerData);
}
}
if (g_bSpkrOutputToRiff) if (g_bSpkrOutputToRiff)
RiffPutSamples(pDSLockedBuffer1, dwBufferSize1/sizeof(short)); RiffPutSamples(pDSLockedBuffer1, numSamples);
} }
} }
@ -777,7 +830,7 @@ static ULONG Spkr_SubmitWaveBuffer(short* pSpeakerBuffer, ULONG nNumSamples)
//LogOutput("[Submit] C=%08X, PC=%08X, WC=%08X, Diff=%08X, Off=%08X, NS=%08X +++\n", nDbgSpkrCnt, dwCurrentPlayCursor, dwCurrentWriteCursor, dwCurrentWriteCursor-dwCurrentPlayCursor, dwByteOffset, nNumSamplesToUse); //LogOutput("[Submit] C=%08X, PC=%08X, WC=%08X, Diff=%08X, Off=%08X, NS=%08X +++\n", nDbgSpkrCnt, dwCurrentPlayCursor, dwCurrentWriteCursor, dwCurrentWriteCursor-dwCurrentPlayCursor, dwByteOffset, nNumSamplesToUse);
hr = DSGetLock(SpeakerVoice.lpDSBvoice, hr = DSGetLock(SpeakerVoice.lpDSBvoice,
dwByteOffset, (DWORD)nNumSamplesToUse * sizeof(short), dwByteOffset, (DWORD)nNumSamplesToUse * sizeof(short) * g_nSPKR_NumChannels,
&pDSLockedBuffer0, &dwDSLockedBufferSize0, &pDSLockedBuffer0, &dwDSLockedBufferSize0,
&pDSLockedBuffer1, &dwDSLockedBufferSize1); &pDSLockedBuffer1, &dwDSLockedBufferSize1);
if (FAILED(hr)) if (FAILED(hr))
@ -788,13 +841,13 @@ static ULONG Spkr_SubmitWaveBuffer(short* pSpeakerBuffer, ULONG nNumSamples)
memcpy(pDSLockedBuffer0, &pSpeakerBuffer[0], dwDSLockedBufferSize0); memcpy(pDSLockedBuffer0, &pSpeakerBuffer[0], dwDSLockedBufferSize0);
if (g_bSpkrOutputToRiff) if (g_bSpkrOutputToRiff)
RiffPutSamples(pDSLockedBuffer0, dwDSLockedBufferSize0/sizeof(short)); RiffPutSamples(pDSLockedBuffer0, dwDSLockedBufferSize0 / (sizeof(short) * g_nSPKR_NumChannels));
if(pDSLockedBuffer1) if(pDSLockedBuffer1)
{ {
memcpy(pDSLockedBuffer1, &pSpeakerBuffer[dwDSLockedBufferSize0/sizeof(short)], dwDSLockedBufferSize1); memcpy(pDSLockedBuffer1, &pSpeakerBuffer[dwDSLockedBufferSize0/sizeof(short)], dwDSLockedBufferSize1);
if (g_bSpkrOutputToRiff) if (g_bSpkrOutputToRiff)
RiffPutSamples(pDSLockedBuffer1, dwDSLockedBufferSize1/sizeof(short)); RiffPutSamples(pDSLockedBuffer1, dwDSLockedBufferSize1 / (sizeof(short) * g_nSPKR_NumChannels));
} }
// Commit sound buffer // Commit sound buffer
@ -901,7 +954,7 @@ bool Spkr_DSInit()
SpeakerVoice.bIsSpeaker = true; SpeakerVoice.bIsSpeaker = true;
HRESULT hr = DSGetSoundBuffer(&SpeakerVoice, DSBCAPS_CTRLVOLUME, g_dwDSSpkrBufferSize, SPKR_SAMPLE_RATE, 1, "Spkr"); HRESULT hr = DSGetSoundBuffer(&SpeakerVoice, DSBCAPS_CTRLVOLUME, g_dwDSSpkrBufferSize, SPKR_SAMPLE_RATE, g_nSPKR_NumChannels, "Spkr");
if (FAILED(hr)) if (FAILED(hr))
{ {
LogFileOutput("Spkr_DSInit: DSGetSoundBuffer failed (%08X)\n", hr); LogFileOutput("Spkr_DSInit: DSGetSoundBuffer failed (%08X)\n", hr);

1
source/Speaker.h
View File

@ -31,6 +31,7 @@ void Spkr_Unmute();
bool Spkr_IsActive(); bool Spkr_IsActive();
bool Spkr_DSInit(); bool Spkr_DSInit();
void Spkr_OutputToRiff(void); void Spkr_OutputToRiff(void);
UINT Spkr_GetNumChannels(void);
void SpkrSaveSnapshot(class YamlSaveHelper& yamlSaveHelper); void SpkrSaveSnapshot(class YamlSaveHelper& yamlSaveHelper);
void SpkrLoadSnapshot(class YamlLoadHelper& yamlLoadHelper); void SpkrLoadSnapshot(class YamlLoadHelper& yamlLoadHelper);

2
source/Windows/AppleWin.cpp
View File

@ -627,7 +627,7 @@ static void OneTimeInitialization(HINSTANCE passinstance)
// Currently only support one RIFF file // Currently only support one RIFF file
if (!g_cmdLine.wavFileSpeaker.empty()) if (!g_cmdLine.wavFileSpeaker.empty())
{ {
if (RiffInitWriteFile(g_cmdLine.wavFileSpeaker.c_str(), SPKR_SAMPLE_RATE, 1)) if (RiffInitWriteFile(g_cmdLine.wavFileSpeaker.c_str(), SPKR_SAMPLE_RATE, Spkr_GetNumChannels()))
Spkr_OutputToRiff(); Spkr_OutputToRiff();
} }
else if (!g_cmdLine.wavFileMockingboard.empty()) else if (!g_cmdLine.wavFileMockingboard.empty())