Skip to content

Always clamp frames_needed to the allowed mix/max range in the mixer #2843

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 7, 2023
Merged

Always clamp frames_needed to the allowed mix/max range in the mixer #2843

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 22 additions & 5 deletions src/hardware/mixer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,16 @@ static struct mixer_t mixer = {};

alignas(sizeof(float)) uint8_t MixTemp[MixerBufferLength] = {};

// TODO Once the mixer code is thorougly refactored, revisit whether this is
// still necessary (i.e., we might be able to be more precise with our
// 'frames_needed' calculation so we never under or overshoot).
static int clamp_frames_needed(const int frames_needed)
{
return clamp(frames_needed,
mixer.min_frames_needed.load(),
mixer.max_frames_needed.load());
}

uint16_t MIXER_GetPreBufferMs()
{
assert(mixer.prebuffer_ms > 0);
Expand Down Expand Up @@ -897,7 +907,8 @@ void MixerChannel::Mix(const uint16_t frames_requested)
return;
}

frames_needed = frames_requested;
frames_needed = clamp_frames_needed(frames_requested);

while (frames_needed > frames_done) {
auto frames_remaining = frames_needed - frames_done;
frames_remaining *= freq_add;
Expand Down Expand Up @@ -2105,7 +2116,11 @@ static void MIXER_Mix()

MIXER_MixData(mixer.frames_needed);
mixer.tick_counter += mixer.tick_add;
mixer.frames_needed += mixer.tick_counter >> TickShift;

const auto frames_needed = mixer.frames_needed +
(mixer.tick_counter >> TickShift);
mixer.frames_needed = clamp_frames_needed(frames_needed);

mixer.tick_counter &= TickMask;

MIXER_UnlockAudioDevice();
Expand Down Expand Up @@ -2137,7 +2152,7 @@ static void MIXER_Mix_NoSound()

/* Set values for next tick */
mixer.tick_counter += mixer.tick_add;
mixer.frames_needed = (mixer.tick_counter >> TickShift);
mixer.frames_needed = clamp_frames_needed(mixer.tick_counter >> TickShift);
mixer.tick_counter &= TickMask;
mixer.frames_done = 0;

Expand Down Expand Up @@ -2267,7 +2282,9 @@ static void SDLCALL MIXER_CallBack([[maybe_unused]] void* userdata,
}

mixer.frames_done -= reduce_frames;
mixer.frames_needed -= reduce_frames;

const auto frames_needed = mixer.frames_needed - reduce_frames;
mixer.frames_needed = clamp_frames_needed(frames_needed);

pos = mixer.pos;
mixer.pos = check_cast<work_index_t>((mixer.pos + reduce_frames) &
Expand Down Expand Up @@ -2888,7 +2905,7 @@ void MIXER_Init(Section* sec)

mixer.pos = 0;
mixer.frames_done = 0;
mixer.frames_needed = mixer.min_frames_needed + 1;
mixer.frames_needed = clamp_frames_needed(mixer.min_frames_needed + 1);
mixer.min_frames_needed = 0;
mixer.max_frames_needed = mixer.blocksize * 2 + 2 * prebuffer_frames;

Expand Down