Se.Cherkasov/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2026-01-29 09:28:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

Correctly calculate FAudio block alignment

Browse Source 
This fixes music playback on FAudio 26.01.

FAudio 26.01 added bounds checks to FAudioSourceVoice_SubmitSourceBuffer
in 033498ab08f5a1349ed5723a47aaa87163654be6.

The calculation of nBlockAlign is currently incorrect. nBlockAlign is
set to the block size in bits, not in bytes, causing this new bounds
check to trip.

Similarly, the wav_length for sound effects is in bytes.
This commit is contained in:
Sönke Holz
2026-01-24 21:52:44 +01:00
committed by Ethan Lee
parent 33f275a62e
commit 770915a39f
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
desktop_version/src/Music.cpp
View File

@@ -137,7 +137,7 @@ public:
format.nSamplesPerSec = spec.freq; format.nSamplesPerSec = spec.freq;
format.wFormatTag = FAUDIO_FORMAT_PCM; format.wFormatTag = FAUDIO_FORMAT_PCM;
format.wBitsPerSample = SDL_AUDIO_BITSIZE(spec.format); format.wBitsPerSample = SDL_AUDIO_BITSIZE(spec.format);
format.nBlockAlign = format.nChannels * format.wBitsPerSample; format.nBlockAlign = format.nChannels * (format.wBitsPerSample / 8);
format.nAvgBytesPerSec = format.nSamplesPerSec * format.nBlockAlign; format.nAvgBytesPerSec = format.nSamplesPerSec * format.nBlockAlign;
format.cbSize = 0; format.cbSize = 0;
valid = true; valid = true;
@@ -161,7 +161,7 @@ end:
format.wBitsPerSample = sizeof(float) * 8; format.wBitsPerSample = sizeof(float) * 8;
format.nChannels = vorbis_info.channels; format.nChannels = vorbis_info.channels;
format.nSamplesPerSec = vorbis_info.sample_rate; format.nSamplesPerSec = vorbis_info.sample_rate;
format.nBlockAlign = format.nChannels * format.wBitsPerSample; format.nBlockAlign = format.nChannels * (format.wBitsPerSample / 8);
format.nAvgBytesPerSec = format.nSamplesPerSec * format.nBlockAlign; format.nAvgBytesPerSec = format.nSamplesPerSec * format.nBlockAlign;
format.cbSize = 0; format.cbSize = 0;
@@ -214,7 +214,7 @@ end:
} }
FAudioBuffer faudio_buffer = { FAudioBuffer faudio_buffer = {
FAUDIO_END_OF_STREAM, /* Flags */ FAUDIO_END_OF_STREAM, /* Flags */
wav_length * 8, /* AudioBytes */ wav_length, /* AudioBytes */
wav_buffer, /* AudioData */ wav_buffer, /* AudioData */
0, /* playbegin */ 0, /* playbegin */
0, /* playlength */ 0, /* playlength */
@@ -266,7 +266,7 @@ end:
format.nSamplesPerSec = audio_rate; format.nSamplesPerSec = audio_rate;
format.wFormatTag = FAUDIO_FORMAT_PCM; format.wFormatTag = FAUDIO_FORMAT_PCM;
format.wBitsPerSample = 16; format.wBitsPerSample = 16;
format.nBlockAlign = format.nChannels * format.wBitsPerSample; format.nBlockAlign = format.nChannels * (format.wBitsPerSample / 8);
format.nAvgBytesPerSec = format.nSamplesPerSec * format.nBlockAlign; format.nAvgBytesPerSec = format.nSamplesPerSec * format.nBlockAlign;
format.cbSize = 0; format.cbSize = 0;
voice_formats[i] = format; voice_formats[i] = format;
@@ -399,7 +399,7 @@ public:
format.wBitsPerSample = sizeof(float) * 8; format.wBitsPerSample = sizeof(float) * 8;
format.nChannels = vorbis_info.channels; format.nChannels = vorbis_info.channels;
format.nSamplesPerSec = vorbis_info.sample_rate; format.nSamplesPerSec = vorbis_info.sample_rate;
format.nBlockAlign = format.nChannels * format.wBitsPerSample; format.nBlockAlign = format.nChannels * (format.wBitsPerSample / 8);
format.nAvgBytesPerSec = format.nSamplesPerSec * format.nBlockAlign; format.nAvgBytesPerSec = format.nSamplesPerSec * format.nBlockAlign;
format.cbSize = 0; format.cbSize = 0;