Skip to content

Asio support for int24 #927

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
est31 merged 6 commits into from
Feb 16, 2025
Merged

Asio support for int24 #927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5315cbd
added new sample format i24
nico-franco-gomez Nov 13, 2024
5361c2a
added output callback for i24
nico-franco-gomez Nov 13, 2024
9757d9d
added input callback i24
nico-franco-gomez Nov 13, 2024
c79edf3
minor cleanup
nico-franco-gomez Nov 13, 2024
95022fa
added i24 to examples
nico-franco-gomez Nov 13, 2024
271d158
avoided allocations in callback
nico-franco-gomez Nov 13, 2024
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
4 changes: 2 additions & 2 deletions examples/android.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ extern crate cpal;

use cpal::{
traits::{DeviceTrait, HostTrait, StreamTrait},
SizedSample,
SizedSample, I24,
};
use cpal::{FromSample, Sample};

Expand All @@ -22,7 +22,7 @@ fn main() {
match config.sample_format() {
cpal::SampleFormat::I8 => run::<i8>(&device, &config.into()).unwrap(),
cpal::SampleFormat::I16 => run::<i16>(&device, &config.into()).unwrap(),
// cpal::SampleFormat::I24 => run::<I24>(&device, &config.into()).unwrap(),
cpal::SampleFormat::I24 => run::<I24>(&device, &config.into()).unwrap(),
cpal::SampleFormat::I32 => run::<i32>(&device, &config.into()).unwrap(),
// cpal::SampleFormat::I48 => run::<I48>(&device, &config.into()).unwrap(),
cpal::SampleFormat::I64 => run::<i64>(&device, &config.into()).unwrap(),
Expand Down
4 changes: 2 additions & 2 deletions examples/beep.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use clap::Parser;
use cpal::{
traits::{DeviceTrait, HostTrait, StreamTrait},
FromSample, Sample, SizedSample,
FromSample, Sample, SizedSample, I24,
};

#[derive(Parser, Debug)]
Expand Down Expand Up @@ -78,7 +78,7 @@ fn main() -> anyhow::Result<()> {
match config.sample_format() {
cpal::SampleFormat::I8 => run::<i8>(&device, &config.into()),
cpal::SampleFormat::I16 => run::<i16>(&device, &config.into()),
// cpal::SampleFormat::I24 => run::<I24>(&device, &config.into()),
cpal::SampleFormat::I24 => run::<I24>(&device, &config.into()),
cpal::SampleFormat::I32 => run::<i32>(&device, &config.into()),
// cpal::SampleFormat::I48 => run::<I48>(&device, &config.into()),
cpal::SampleFormat::I64 => run::<i64>(&device, &config.into()),
Expand Down
3 changes: 2 additions & 1 deletion examples/synth_tones.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ extern crate cpal;

use cpal::{
traits::{DeviceTrait, HostTrait, StreamTrait},
SizedSample,
SizedSample, I24,
};
use cpal::{FromSample, Sample};

Expand Down Expand Up @@ -98,6 +98,7 @@ where
match config.sample_format() {
cpal::SampleFormat::I8 => make_stream::<i8>(&device, &config.into()),
cpal::SampleFormat::I16 => make_stream::<i16>(&device, &config.into()),
cpal::SampleFormat::I24 => make_stream::<I24>(&device, &config.into()),
cpal::SampleFormat::I32 => make_stream::<i32>(&device, &config.into()),
cpal::SampleFormat::I64 => make_stream::<i64>(&device, &config.into()),
cpal::SampleFormat::U8 => make_stream::<u8>(&device, &config.into()),
Expand Down
8 changes: 6 additions & 2 deletions src/host/asio/device.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,10 +209,14 @@ pub(crate) fn convert_data_type(ty: &sys::AsioSampleType) -> Option<SampleFormat
let fmt = match *ty {
sys::AsioSampleType::ASIOSTInt16MSB => SampleFormat::I16,
sys::AsioSampleType::ASIOSTInt16LSB => SampleFormat::I16,
sys::AsioSampleType::ASIOSTFloat32MSB => SampleFormat::F32,
sys::AsioSampleType::ASIOSTFloat32LSB => SampleFormat::F32,
sys::AsioSampleType::ASIOSTInt24MSB => SampleFormat::I24,
sys::AsioSampleType::ASIOSTInt24LSB => SampleFormat::I24,
sys::AsioSampleType::ASIOSTInt32MSB => SampleFormat::I32,
sys::AsioSampleType::ASIOSTInt32LSB => SampleFormat::I32,
sys::AsioSampleType::ASIOSTFloat32MSB => SampleFormat::F32,
sys::AsioSampleType::ASIOSTFloat32LSB => SampleFormat::F32,
sys::AsioSampleType::ASIOSTFloat64MSB => SampleFormat::F64,
sys::AsioSampleType::ASIOSTFloat64LSB => SampleFormat::F64,
_ => return None,
};
Some(fmt)
Expand Down
Loading