Cleanup and add tests for convert_samples_rate
This commit is contained in:
parent
4239fae948
commit
aa83f64443
3 changed files with 65 additions and 18 deletions
|
|
@ -4,34 +4,48 @@ This module contains function that will convert from one PCM format to another.
|
|||
This includes conversion between samples formats, channels or sample rates.
|
||||
|
||||
*/
|
||||
pub fn convert_samples_rate<T>(input: &[T], from: ::SamplesRate, to: ::SamplesRate) -> Vec<T>
|
||||
where T: Copy
|
||||
use samples_formats::Sample;
|
||||
|
||||
/// Converts between samples rates while preserving the pitch.
|
||||
pub fn convert_samples_rate<T>(input: &[T], from: ::SamplesRate, to: ::SamplesRate,
|
||||
channels: ::ChannelsCount) -> Vec<T>
|
||||
where T: Sample
|
||||
{
|
||||
let from = from.0;
|
||||
let to = to.0;
|
||||
|
||||
// if `from` is a multiple of `to` (for example `from` is 44100 and `to` is 22050),
|
||||
// then we simply skip some samples
|
||||
if from % to == 0 {
|
||||
if from % to == 0 {
|
||||
let mut result = Vec::new();
|
||||
for element in input.chunks((from / to) as uint) {
|
||||
result.push(element[0]);
|
||||
for element in input.chunks(channels as uint * (from / to) as uint) {
|
||||
for i in range(0, channels) {
|
||||
result.push(element[i as uint]);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
// if `to` is a multiple of `from` (for example `to` is 44100 and `from` is 22050)
|
||||
// TODO: dumb algorithm
|
||||
// FIXME: doesn't take channels into account
|
||||
if to % from == 0 {
|
||||
// if `to` is twice `from` (for example `to` is 44100 and `from` is 22050)
|
||||
// TODO: more generic
|
||||
if to == from * 2 {
|
||||
let mut result = Vec::new();
|
||||
for element in input.windows(2) {
|
||||
for _ in range(0, (to / from) as uint) {
|
||||
result.push(element[0]);
|
||||
let mut previous: Option<Vec<T>> = None;
|
||||
for element in input.chunks(channels as uint) {
|
||||
if let Some(previous) = previous.take() {
|
||||
for (prev, curr) in previous.into_iter().zip(element.iter()) {
|
||||
result.push(prev.interpolate(*curr));
|
||||
}
|
||||
for curr in element.iter() {
|
||||
result.push(*curr);
|
||||
}
|
||||
} else {
|
||||
for e in element.iter() {
|
||||
result.push(*e);
|
||||
}
|
||||
}
|
||||
}
|
||||
for _ in range(0, (to / from) as uint) {
|
||||
result.push(*input.last().unwrap());
|
||||
|
||||
previous = Some(element.to_vec());
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
|
@ -50,7 +64,7 @@ pub fn convert_samples_rate<T>(input: &[T], from: ::SamplesRate, to: ::SamplesRa
|
|||
///
|
||||
/// Panics if `from` is 0, `to` is 0, or if the data length is not a multiple of `from`.
|
||||
pub fn convert_channels<T>(input: &[T], from: ::ChannelsCount, to: ::ChannelsCount) -> Vec<T>
|
||||
where T: Copy
|
||||
where T: Sample
|
||||
{
|
||||
assert!(from != 0);
|
||||
assert!(to != 0);
|
||||
|
|
@ -78,6 +92,7 @@ pub fn convert_channels<T>(input: &[T], from: ::ChannelsCount, to: ::ChannelsCou
|
|||
#[cfg(test)]
|
||||
mod test {
|
||||
use super::convert_channels;
|
||||
use super::convert_samples_rate;
|
||||
|
||||
#[test]
|
||||
fn remove_channels() {
|
||||
|
|
@ -102,4 +117,20 @@ mod test {
|
|||
fn convert_channels_wrong_data_len() {
|
||||
convert_channels(&[1u16, 2, 3], 2, 1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn half_samples_rate() {
|
||||
let result = convert_samples_rate(&[1u16, 16, 2, 17, 3, 18, 4, 19],
|
||||
::SamplesRate(44100), ::SamplesRate(22050), 2);
|
||||
|
||||
assert_eq!(result.as_slice(), [1, 16, 3, 18]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn double_samples_rate() {
|
||||
let result = convert_samples_rate(&[2u16, 16, 4, 18, 6, 20, 8, 22],
|
||||
::SamplesRate(22050), ::SamplesRate(44100), 2);
|
||||
|
||||
assert_eq!(result.as_slice(), [2, 16, 3, 17, 4, 18, 5, 19, 6, 20, 7, 21, 8, 22]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue