mii/maudio-router
1
0
Fork 0
mirror of https://github.com/mii443/maudio-router.git synced 2025-08-22 16:05:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

virtual device resampling

Browse Source
This commit is contained in:
mii443
2024-02-15 12:05:54 +09:00
parent 2c536a3135
commit 5ca9f176f8
1 changed files with 123 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
src/commands/run.rs
View File

@ -2,7 +2,7 @@ use std::{io::Read, sync::{Arc, Mutex}};
use cpal::{traits::{DeviceTrait, HostTrait, StreamTrait}, Device}; use cpal::{traits::{DeviceTrait, HostTrait, StreamTrait}, Device};
use crate::{args::Run, device::virtual_device}; use crate::{args::Run, device::virtual_device::VirtualDevice};
fn reshape_audio_data<T>(input: &[T], channels: usize) -> Vec<Vec<T>> fn reshape_audio_data<T>(input: &[T], channels: usize) -> Vec<Vec<T>>
where where
@ -25,9 +25,9 @@ where
let frames = input[0].len(); let frames = input[0].len();
let mut output = vec![]; let mut output = vec![];
for i in 0..frames { for i in 0..frames {
for j in 0..channels { (0..channels).for_each(|j| {
output.push(input[j][i].clone()); output.push(input[j][i].clone());
} });
} }
output output
} }
@ -41,7 +41,7 @@ pub fn run(run: Run) {
} }
let mut buf = String::default(); let mut buf = String::default();
let mut config = if let Ok(config) = std::fs::File::open(&config) { let mut config = if let Ok(config) = std::fs::File::open(config) {
config config
} else { } else {
eprintln!("Cannot open config file."); eprintln!("Cannot open config file.");
@ -127,7 +127,6 @@ pub fn run(run: Run) {
let mut streams = vec![]; let mut streams = vec![];
// attach real device to virtual device
for input_route in &config.routes.input { for input_route in &config.routes.input {
match &input_route.device { match &input_route.device {
crate::config::Device::Local { local } => { crate::config::Device::Local { local } => {
@ -136,24 +135,50 @@ pub fn run(run: Run) {
.find(|device| device.name().unwrap() == local.name) .find(|device| device.name().unwrap() == local.name)
.unwrap(); .unwrap();
let config = device.default_input_config().unwrap(); let config = device.default_input_config().unwrap();
println!("input config: {:?}", config);
let channels = config.channels(); let channels = config.channels();
let virtual_devices = virtual_devices.iter().filter(|device| device.lock().unwrap().name == input_route.virtual_device).map(|d| d.clone()).collect::<Vec<_>>()[0].clone(); let sample_rate = config.sample_rate().0;
let stream = device.build_input_stream(
let virtual_devices = virtual_devices.iter().filter(|device| device.lock().unwrap().name == input_route.virtual_device).cloned().collect::<Vec<_>>()[0].clone();
let stream = match config.sample_format() {
cpal::SampleFormat::I8 => device.build_input_stream(
&config.into(), &config.into(),
{ {
move |data, _| { move |data: &[i8], _| input_callback(data, channels.into(), sample_rate, virtual_devices.clone())
println!("Data length: {}", data.len());
let audio_data = reshape_audio_data(&data, channels as usize);
for (i, buffer) in audio_data.iter().enumerate() {
virtual_devices.lock().unwrap().write_input(i as u8, buffer.clone());
}
}
}, },
move |err| eprintln!("An error occurred on the input stream: {}", err), move |err| eprintln!("An error occurred on the input stream: {}", err),
None None
).unwrap(); ),
cpal::SampleFormat::I16 => device.build_input_stream(
&config.into(),
{
move |data: &[i16], _| input_callback(data, channels.into(), sample_rate, virtual_devices.clone())
},
move |err| eprintln!("An error occurred on the input stream: {}", err),
None
),
cpal::SampleFormat::I32 => device.build_input_stream(
&config.into(),
{
move |data: &[i32], _| input_callback(data, channels.into(), sample_rate, virtual_devices.clone())
},
move |err| eprintln!("An error occurred on the input stream: {}", err),
None
),
cpal::SampleFormat::F32 => device.build_input_stream(
&config.into(),
{
move |data: &[f32], _| input_callback(data, channels.into(), sample_rate, virtual_devices.clone())
},
move |err| eprintln!("An error occurred on the input stream: {}", err),
None
),
sample_format => {
eprintln!("Unsupported sample format: {:?}", sample_format);
return;
}
}.unwrap();
stream.play().unwrap(); stream.play().unwrap();
streams.push(stream); streams.push(stream);
} }
@ -171,34 +196,52 @@ pub fn run(run: Run) {
.find(|device| device.name().unwrap() == local.name) .find(|device| device.name().unwrap() == local.name)
.unwrap(); .unwrap();
let config = device.default_output_config().unwrap(); let config = device.default_output_config().unwrap();
println!("output config: {:?}", config);
let channels = config.channels(); let channels = config.channels();
let virtual_device = virtual_devices.iter().filter(|device| device.lock().unwrap().name == output_route.input.virtual_device).map(|d| d.clone()).collect::<Vec<_>>()[0].clone(); let sample_rate = config.sample_rate().0;
let virtual_device = virtual_devices.iter().filter(|device| device.lock().unwrap().name == output_route.input.virtual_device).cloned().collect::<Vec<_>>()[0].clone();
let index = virtual_device.lock().unwrap().add_output(); let index = virtual_device.lock().unwrap().add_output();
let stream = device.build_output_stream(
let stream = match config.sample_format() {
cpal::SampleFormat::I8 => device.build_output_stream(
&config.into(), &config.into(),
{ {
move |data, _| { move |data: &mut [i8], _| output_callback(data, channels.into(), sample_rate, virtual_device.clone(), index)
println!("Data length: {}", data.len());
let mut audio_data = vec![];
for i in 0..channels {
audio_data.push(virtual_device.lock().unwrap().take_output(index, i as u8, data.len() / channels as usize).unwrap_or_default());
}
let mut audio_data = to_flat_audio_data(&audio_data);
let data_len = data.len();
let audio_data_len = audio_data.len();
if data_len > audio_data_len {
audio_data.extend(vec![0.0; data_len - audio_data_len]);
}
data.clone_from_slice(&audio_data);
println!("Data: {:?}", data);
}
}, },
move |err| eprintln!("An error occurred on the output stream: {}", err), move |err| eprintln!("An error occurred on the output stream: {}", err),
None None
).unwrap(); ),
cpal::SampleFormat::I16 => device.build_output_stream(
&config.into(),
{
move |data: &mut [i16], _| output_callback(data, channels.into(), sample_rate, virtual_device.clone(), index)
},
move |err| eprintln!("An error occurred on the output stream: {}", err),
None
),
cpal::SampleFormat::I32 => device.build_output_stream(
&config.into(),
{
move |data: &mut [i32], _| output_callback(data, channels.into(), sample_rate, virtual_device.clone(), index)
},
move |err| eprintln!("An error occurred on the output stream: {}", err),
None
),
cpal::SampleFormat::F32 => device.build_output_stream(
&config.into(),
{
move |data: &mut [f32], _| output_callback(data, channels.into(), sample_rate, virtual_device.clone(), index)
},
move |err| eprintln!("An error occurred on the output stream: {}", err),
None
),
sample_format => {
eprintln!("Unsupported sample format: {:?}", sample_format);
return;
}
}.unwrap();
stream.play().unwrap(); stream.play().unwrap();
streams.push(stream); streams.push(stream);
} }
@ -210,3 +253,38 @@ pub fn run(run: Run) {
std::thread::sleep(std::time::Duration::from_secs(10)); std::thread::sleep(std::time::Duration::from_secs(10));
} }
fn input_callback<T>(data: &[T], channels: usize, sample_rate: u32, virtual_device: Arc<Mutex<VirtualDevice>>)
where
T: Clone + num::cast::ToPrimitive
{
let data: Vec<f32> = data.iter().map(|d| d.to_f32().unwrap()).collect();
let audio_data = reshape_audio_data(&data, channels);
let audio_data = crate::audio::resampling::resampling(sample_rate, virtual_device.lock().unwrap().sample_rate, audio_data);
for (i, buffer) in audio_data.iter().enumerate() {
virtual_device.lock().unwrap().write_input(i as u8, buffer.clone());
}
}
fn output_callback<T>(data: &mut [T], channels: usize, sample_rate: u32, virtual_device: Arc<Mutex<VirtualDevice>>, index: usize)
where
T: Clone + num::cast::FromPrimitive
{
let mut audio_data = vec![];
for i in 0..channels {
audio_data.push(virtual_device.lock().unwrap().take_output(index, i as u8, data.len() / channels).unwrap_or(vec![0.; data.len() / channels]));
}
let audio_data = crate::audio::resampling::resampling(virtual_device.lock().unwrap().sample_rate, sample_rate, audio_data);
let mut audio_data = to_flat_audio_data(&audio_data);
let data_len = data.len();
let audio_data_len = audio_data.len();
if data_len > audio_data_len {
audio_data.extend(vec![0.0; data_len - audio_data_len]);
}
let audio_data: Vec<T> = audio_data.iter().map(|d| T::from_f32(*d).unwrap()).collect();
data.clone_from_slice(&audio_data);
}