Introduce polymorphic stream constructors

This commit is contained in:
Benjamin Saunders 2020-01-21 22:01:49 -08:00
parent 78df791377
commit 076b814a15
5 changed files with 142 additions and 44 deletions

View file

@ -21,14 +21,24 @@ fn main() -> Result<(), anyhow::Error> {
let err_fn = |err| eprintln!("an error occurred on stream: {}", err);
let data_fn = move |data: &mut cpal::Data| match data.sample_format() {
cpal::SampleFormat::F32 => write_data::<f32>(data, channels, &mut next_value),
cpal::SampleFormat::I16 => write_data::<i16>(data, channels, &mut next_value),
cpal::SampleFormat::U16 => write_data::<u16>(data, channels, &mut next_value),
let stream = match format.data_type {
cpal::SampleFormat::F32 => device.build_output_stream(
&format.shape(),
move |data: &mut [f32]| write_data(data, channels, &mut next_value),
err_fn,
)?,
cpal::SampleFormat::I16 => device.build_output_stream(
&format.shape(),
move |data: &mut [i16]| write_data(data, channels, &mut next_value),
err_fn,
)?,
cpal::SampleFormat::U16 => device.build_output_stream(
&format.shape(),
move |data: &mut [u16]| write_data(data, channels, &mut next_value),
err_fn,
)?,
};
let stream = device.build_output_stream_raw(&format, data_fn, err_fn)?;
stream.play()?;
std::thread::sleep(std::time::Duration::from_millis(1000));
@ -36,11 +46,10 @@ fn main() -> Result<(), anyhow::Error> {
Ok(())
}
fn write_data<T>(output: &mut cpal::Data, channels: usize, next_sample: &mut dyn FnMut() -> f32)
fn write_data<T>(output: &mut [T], channels: usize, next_sample: &mut dyn FnMut() -> f32)
where
T: cpal::Sample,
{
let output = output.as_slice_mut::<T>().expect("unexpected sample type");
for frame in output.chunks_mut(channels) {
let value: T = cpal::Sample::from::<f32>(&next_sample());
for sample in frame.iter_mut() {

View file

@ -29,12 +29,11 @@ fn main() -> Result<(), anyhow::Error> {
println!("Using default output device: \"{}\"", output_device.name()?);
// We'll try and use the same format between streams to keep it simple
let mut format = input_device.default_input_format()?;
format.data_type = cpal::SampleFormat::F32;
let shape = input_device.default_input_format()?.shape();
// Create a delay in case the input and output devices aren't synced.
let latency_frames = (LATENCY_MS / 1_000.0) * format.sample_rate.0 as f32;
let latency_samples = latency_frames as usize * format.channels as usize;
let latency_frames = (LATENCY_MS / 1_000.0) * shape.sample_rate.0 as f32;
let latency_samples = latency_frames as usize * shape.channels as usize;
// The buffer to share samples
let ring = RingBuffer::new(latency_samples * 2);
@ -47,9 +46,8 @@ fn main() -> Result<(), anyhow::Error> {
producer.push(0.0).unwrap();
}
let input_data_fn = move |data: &cpal::Data| {
let input_data_fn = move |data: &[f32]| {
let mut output_fell_behind = false;
let data = data.as_slice::<f32>().expect("unexpected sample type");
for &sample in data {
if producer.push(sample).is_err() {
output_fell_behind = true;
@ -60,9 +58,8 @@ fn main() -> Result<(), anyhow::Error> {
}
};
let output_data_fn = move |data: &mut cpal::Data| {
let output_data_fn = move |data: &mut [f32]| {
let mut input_fell_behind = None;
let data = data.as_slice_mut::<f32>().expect("unexpected sample type");
for sample in data {
*sample = match consumer.pop() {
Ok(s) => s,
@ -81,9 +78,12 @@ fn main() -> Result<(), anyhow::Error> {
};
// Build streams.
println!("Attempting to build both streams with `{:?}`.", format);
let input_stream = input_device.build_input_stream_raw(&format, input_data_fn, err_fn)?;
let output_stream = output_device.build_output_stream_raw(&format, output_data_fn, err_fn)?;
println!(
"Attempting to build both streams with f32 samples and `{:?}`.",
shape
);
let input_stream = input_device.build_input_stream(&shape, input_data_fn, err_fn)?;
let output_stream = output_device.build_output_stream(&shape, output_data_fn, err_fn)?;
println!("Successfully built streams.");
// Play the streams.

View file

@ -40,14 +40,24 @@ fn main() -> Result<(), anyhow::Error> {
eprintln!("an error occurred on stream: {}", err);
};
let data_fn = move |data: &cpal::Data| match data.sample_format() {
cpal::SampleFormat::F32 => write_input_data::<f32, f32>(data, &writer_2),
cpal::SampleFormat::I16 => write_input_data::<i16, i16>(data, &writer_2),
cpal::SampleFormat::U16 => write_input_data::<u16, i16>(data, &writer_2),
let stream = match format.data_type {
cpal::SampleFormat::F32 => device.build_input_stream(
&format.shape(),
move |data| write_input_data::<f32, f32>(data, &writer_2),
err_fn,
)?,
cpal::SampleFormat::I16 => device.build_input_stream(
&format.shape(),
move |data| write_input_data::<i16, i16>(data, &writer_2),
err_fn,
)?,
cpal::SampleFormat::U16 => device.build_input_stream(
&format.shape(),
move |data| write_input_data::<u16, i16>(data, &writer_2),
err_fn,
)?,
};
let stream = device.build_input_stream_raw(&format, data_fn, err_fn)?;
stream.play()?;
// Let recording go for roughly three seconds.
@ -77,12 +87,11 @@ fn wav_spec_from_format(format: &cpal::Format) -> hound::WavSpec {
type WavWriterHandle = Arc<Mutex<Option<hound::WavWriter<BufWriter<File>>>>>;
fn write_input_data<T, U>(input: &cpal::Data, writer: &WavWriterHandle)
fn write_input_data<T, U>(input: &[T], writer: &WavWriterHandle)
where
T: cpal::Sample,
U: cpal::Sample + hound::Sample,
{
let input = input.as_slice::<T>().expect("unexpected sample format");
if let Ok(mut guard) = writer.try_lock() {
if let Some(writer) = guard.as_mut() {
for &sample in input.iter() {