Skip to content

output/Source.cxx: cross-fade using the ReplayGainFilter's output format #2573

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
MaxKellermann merged 1 commit into from
Aug 22, 2026
+11 −2
Merged

output/Source.cxx: cross-fade using the ReplayGainFilter's output format #2573

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
13 changes: 11 additions & 2 deletions src/output/Source.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,13 +185,22 @@ AudioOutputSource::FilterChunk(const MusicChunk &chunk)
case */
mix_ratio = 1.0f - mix_ratio;

/* use the post-replay-gain format for mixing;
the ReplayGainFilter may convert the sample
format (e.g. S16 to S24_P32 when software
volume is enabled) */
const SampleFormat cross_fade_format =
replay_gain_filter
? replay_gain_filter->GetOutAudioFormat().format
: in_audio_format.format;

void *dest = cross_fade_buffer.Get(other_data.size());
memcpy(dest, other_data.data(), other_data.size());
if (!pcm_mix(cross_fade_dither, dest, data.data(), data.size(),
in_audio_format.format,
cross_fade_format,
mix_ratio))
throw FmtRuntimeError("Cannot cross-fade format {}",
in_audio_format.format);
cross_fade_format);

data = {(const std::byte *)dest, other_data.size()};
}
Expand Down
Loading