servius/songbird
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move empty packet check to also cover 48kHz audio (#225)

Browse Source 
Previously, we were only skipping zero-packet frames when we needed to
resample because the source sampling rate was not set to 48kHz. This
check should have also been applied in the case that a packet did not
need a resampler to be built.

Fixes #224.
This commit is contained in:
Kyle Simpson
2024-02-24 19:46:15 +00:00
committed by GitHub
parent 087e5f2292
commit 873fb68726
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/driver/tasks/mixer/mix_logic.rs
View File

@@ -144,6 +144,11 @@ pub fn mix_symph_indiv(
let source_packet = source_packet.unwrap(); let source_packet = source_packet.unwrap();
let in_rate = source_packet.spec().rate; let in_rate = source_packet.spec().rate;
let pkt_frames = source_packet.frames();
if pkt_frames == 0 {
continue;
}
if in_rate == SAMPLE_RATE_RAW as u32 { if in_rate == SAMPLE_RATE_RAW as u32 {
// No need to resample: mix as standard. // No need to resample: mix as standard.
@@ -158,7 +163,7 @@ pub fn mix_symph_indiv(
samples_written += samples_marched; samples_written += samples_marched;
local_state.inner_pos += samples_marched; local_state.inner_pos += samples_marched;
local_state.inner_pos %= source_packet.frames(); local_state.inner_pos %= pkt_frames;
} else { } else {
// NOTE: this should NEVER change in one stream. // NOTE: this should NEVER change in one stream.
let chan_c = source_packet.spec().channels.count(); let chan_c = source_packet.spec().channels.count();
@@ -178,11 +183,6 @@ pub fn mix_symph_indiv(
}); });
let inner_pos = local_state.inner_pos; let inner_pos = local_state.inner_pos;
let pkt_frames = source_packet.frames();
if pkt_frames == 0 {
continue;
}
let needed_in_frames = resampler.input_frames_next(); let needed_in_frames = resampler.input_frames_next();
let available_frames = pkt_frames - inner_pos; let available_frames = pkt_frames - inner_pos;