asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #14788 from mrcdk/ogg_pop_noise_fix

Browse source 
Fix ogg looping pop noise. Closes #11468
This commit is contained in:
Rémi Verschelde 2017-12-17 23:59:09 +01:00 committed by GitHub
commit 4e442b0648
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
modules/stb_vorbis/audio_stream_ogg_vorbis.cpp
View file

@ -42,12 +42,17 @@ void AudioStreamPlaybackOGGVorbis::_mix_internal(AudioFrame *p_buffer, int p_fra
int todo = p_frames; int todo = p_frames;
while (todo && active) { int start_buffer = 0;
int mixed = stb_vorbis_get_samples_float_interleaved(ogg_stream, 2, (float *)p_buffer, todo * 2); while (todo && active) {
float *buffer = (float *)p_buffer;
if (start_buffer > 0) {
buffer = (buffer + start_buffer * 2);
}
int mixed = stb_vorbis_get_samples_float_interleaved(ogg_stream, 2, buffer, todo * 2);
if (vorbis_stream->channels == 1 && mixed > 0) { if (vorbis_stream->channels == 1 && mixed > 0) {
//mix mono to stereo //mix mono to stereo
for (int i = 0; i < mixed; i++) { for (int i = start_buffer; i < mixed; i++) {
p_buffer[i].r = p_buffer[i].l; p_buffer[i].r = p_buffer[i].l;
} }
} }
@ -60,11 +65,14 @@ void AudioStreamPlaybackOGGVorbis::_mix_internal(AudioFrame *p_buffer, int p_fra
//loop //loop
seek(vorbis_stream->loop_offset); seek(vorbis_stream->loop_offset);
loops++; loops++;
// we still have buffer to fill, start from this element in the next iteration.
start_buffer = p_frames - todo;
} else { } else {
for (int i = mixed; i < p_frames; i++) { for (int i = p_frames - todo; i < p_frames; i++) {
p_buffer[i] = AudioFrame(0, 0); p_buffer[i] = AudioFrame(0, 0);
} }
active = false; active = false;
todo = 0;
} }
} }
} }