Skip to content
Merged
Changes from all commits
Commits
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
26 changes: 18 additions & 8 deletions crates/recording/src/feeds/microphone.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ use cap_media_info::{AudioInfo, ffmpeg_sample_format_for};
use cap_timestamp::Timestamp;
use cpal::{
Device, InputCallbackInfo, SampleFormat, StreamError, SupportedStreamConfig,
SupportedStreamConfigRange,
traits::{DeviceTrait, HostTrait, StreamTrait},
};
use flume::TrySendError;
Expand Down Expand Up @@ -146,16 +147,25 @@ fn get_usable_device(device: Device) -> Option<(String, Device, SupportedStreamC
.then(b.max_sample_rate().cmp(&a.max_sample_rate()))
});

configs
.into_iter()
.filter(|c| c.min_sample_rate().0 <= 48000 && c.max_sample_rate().0 >= 48000)
.find(|c| ffmpeg_sample_format_for(c.sample_format()).is_some())
configs.into_iter().find_map(|config| {
ffmpeg_sample_format_for(config.sample_format())
.map(|_| config.with_sample_rate(select_sample_rate(&config)))
})
});

result.and_then(|config| {
let final_config = config.with_sample_rate(cpal::SampleRate(48000));
device.name().ok().map(|name| (name, device, final_config))
})
result.and_then(|config| device.name().ok().map(|name| (name, device, config)))
}

fn select_sample_rate(config: &SupportedStreamConfigRange) -> cpal::SampleRate {
const PREFERRED_RATES: [u32; 2] = [48_000, 44_100];

for rate in PREFERRED_RATES {
if config.min_sample_rate().0 <= rate && config.max_sample_rate().0 >= rate {
return cpal::SampleRate(rate);
}
}

cpal::SampleRate(config.max_sample_rate().0)
}

#[derive(Reply)]
Expand Down
Loading