Implement all samples formats
This commit is contained in:
parent
d3d6dd94db
commit
f4ac8a5492
2 changed files with 111 additions and 54 deletions
63
src/lib.rs
63
src/lib.rs
|
|
@ -4,7 +4,10 @@
|
|||
#[cfg(all(not(windows), not(unix)))]
|
||||
use this_platform_is_not_supported;
|
||||
|
||||
pub use samples_formats::{SampleFormat, Sample};
|
||||
|
||||
mod conversions;
|
||||
mod samples_formats;
|
||||
|
||||
#[cfg(unix)]
|
||||
#[path="alsa/mod.rs"]
|
||||
|
|
@ -46,59 +49,6 @@ struct RequiredConversion<T> {
|
|||
to_channels: ChannelsCount,
|
||||
}
|
||||
|
||||
/// Format that each sample has.
|
||||
#[deriving(Clone, Copy, Show, PartialEq, Eq)]
|
||||
pub enum SampleFormat {
|
||||
/// The value 0 corresponds to 0.
|
||||
I16,
|
||||
/// The value 0 corresponds to 32768.
|
||||
U16,
|
||||
}
|
||||
|
||||
impl SampleFormat {
|
||||
fn get_sample_size(&self) -> uint {
|
||||
match self {
|
||||
&SampleFormat::I16 => std::mem::size_of::<i16>(),
|
||||
&SampleFormat::U16 => std::mem::size_of::<u16>(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Trait for containers that contain PCM data.
|
||||
#[unstable = "Will be rewritten with associated types"]
|
||||
pub trait Sample: Copy {
|
||||
fn get_format(Option<Self>) -> SampleFormat;
|
||||
|
||||
/// Turns the data into a `Vec<u16>` where each element is a sample.
|
||||
fn to_vec_u16(&[Self]) -> Vec<u16>;
|
||||
}
|
||||
|
||||
impl Sample for u16 {
|
||||
fn get_format(_: Option<u16>) -> SampleFormat {
|
||||
SampleFormat::U16
|
||||
}
|
||||
|
||||
fn to_vec_u16(input: &[u16]) -> Vec<u16> {
|
||||
input.to_vec()
|
||||
}
|
||||
}
|
||||
|
||||
impl Sample for i16 {
|
||||
fn get_format(_: Option<i16>) -> SampleFormat {
|
||||
SampleFormat::I16
|
||||
}
|
||||
|
||||
fn to_vec_u16(input: &[i16]) -> Vec<u16> {
|
||||
input.iter().map(|&value| {
|
||||
if value < 0 {
|
||||
(value + 32767) as u16
|
||||
} else {
|
||||
(value as u16) + 32768
|
||||
}
|
||||
}).collect()
|
||||
}
|
||||
}
|
||||
|
||||
impl Channel {
|
||||
pub fn new() -> Channel {
|
||||
let channel = cpal_impl::Channel::new();
|
||||
|
|
@ -243,12 +193,17 @@ impl<'a, T> Drop for Buffer<'a, T> where T: Sample {
|
|||
|
||||
match conversion.to_format {
|
||||
SampleFormat::I16 => {
|
||||
unimplemented!()
|
||||
let buffer = Sample::to_vec_i16(buffer.as_slice());
|
||||
write_to_buf!(buffer, output, i16);
|
||||
},
|
||||
SampleFormat::U16 => {
|
||||
let buffer = Sample::to_vec_u16(buffer.as_slice());
|
||||
write_to_buf!(buffer, output, u16);
|
||||
},
|
||||
SampleFormat::F32 => {
|
||||
let buffer = Sample::to_vec_f32(buffer.as_slice());
|
||||
write_to_buf!(buffer, output, f32);
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue