ashikk
/
kaliber
mirror of https://github.com/auygun/kaliber.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not reset source index when streaming is in progress

This commit is contained in:
Attila Uygun 2023-06-26 10:48:13 +02:00
parent 467e73d3a8
commit b07ce8514e
1 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/engine/audio/audio_mixer.cc
View File

@ -204,43 +204,42 @@ void AudioMixer::RenderAudio(float* output_buffer, size_t num_frames) {
DCHECK(num_samples > 0); DCHECK(num_samples > 0);
for (size_t i = 0; i < num_frames * kChannelCount;) { for (size_t i = 0; i < num_frames * kChannelCount;) {
// Mix the 1st channel. if (src_index < num_samples) {
output_buffer[i++] += src[0][src_index] * amplitude; // Mix the 1st channel.
output_buffer[i++] += src[0][src_index] * amplitude;
// Mix the 2nd channel. Offset the source index for stereo simulation. // Mix the 2nd channel. Offset the source index for stereo simulation.
size_t ind = channel_offset + src_index; size_t ind = channel_offset + src_index;
if (ind < num_samples) if (ind < num_samples)
output_buffer[i++] += src[1][ind] * amplitude; output_buffer[i++] += src[1][ind] * amplitude;
else if (flags & kLoop) else if (flags & kLoop)
output_buffer[i++] += src[1][ind % num_samples] * amplitude; output_buffer[i++] += src[1][ind % num_samples] * amplitude;
else else
i++; i++;
// Apply amplitude modification. // Apply amplitude modification.
amplitude += amplitude_inc; amplitude += amplitude_inc;
if (amplitude <= 0) { if (amplitude <= 0) {
marked_for_removal = true; marked_for_removal = true;
break; break;
} else if (amplitude > max_amplitude) { } else if (amplitude > max_amplitude) {
amplitude = max_amplitude; amplitude = max_amplitude;
} }
// Advance source index. Apply basic resampling for variations.
accumulator += step;
src_index += accumulator / 100;
accumulator %= 100;
// Remove, loop or stream if the source data is consumed
if (src_index >= num_samples) {
src_index %= num_samples;
// Advance source index. Apply basic resampling for variations.
accumulator += step;
src_index += accumulator / 100;
accumulator %= 100;
} else {
if (audio_bus->EndOfStream()) { if (audio_bus->EndOfStream()) {
src_index %= num_samples;
marked_for_removal = !(flags & kLoop); marked_for_removal = !(flags & kLoop);
break; break;
} }
if (!it->get()->streaming_in_progress.load( if (!it->get()->streaming_in_progress.load(
std::memory_order_acquire)) { std::memory_order_acquire)) {
src_index %= num_samples;
it->get()->streaming_in_progress.store(true, it->get()->streaming_in_progress.store(true,
std::memory_order_relaxed); std::memory_order_relaxed);