Remove the conversion system

This commit is contained in:
Pierre Krieger 2015-08-20 14:38:25 +02:00
parent e641ac93d8
commit ca72d1d67e
8 changed files with 82 additions and 525 deletions

View file

@ -1,3 +0,0 @@
## License
The `music.ogg` file in this directory is under cc-by-sa.

View file

@ -4,17 +4,33 @@ fn main() {
let mut channel = cpal::Voice::new();
// Produce a sinusoid of maximum amplitude.
let max = std::u16::MAX as f32;
let mut data_source = (0u64..).map(|t| t as f32 * 0.03)
.map(|t| ((t.sin() * 0.5 + 0.5) * max) as u16);
.map(|t| t.sin());
loop {
{
let mut buffer = channel.append_data(1, cpal::SamplesRate(44100), 32768);
match channel.append_data(32768) {
cpal::UnknownTypeBuffer::U16(mut buffer) => {
for (sample, value) in buffer.chunks_mut(2).zip(&mut data_source) {
let value = ((value * 0.5 + 0.5) * std::u16::MAX as f32) as u16;
sample[0] = value;
sample[1] = value;
}
},
for (sample, value) in buffer.iter_mut().zip(&mut data_source) {
*sample = value;
}
cpal::UnknownTypeBuffer::I16(mut buffer) => {
for (sample, value) in buffer.chunks_mut(2).zip(&mut data_source) {
let value = (value * std::i16::MAX as f32) as i16;
sample[0] = value;
sample[1] = value;
}
},
cpal::UnknownTypeBuffer::F32(mut buffer) => {
for (sample, value) in buffer.chunks_mut(2).zip(&mut data_source) {
sample[0] = value;
sample[1] = value;
}
},
}
channel.play();

Binary file not shown.

View file

@ -1,47 +0,0 @@
extern crate cpal;
extern crate vorbis;
use std::io::Cursor;
fn main() {
let mut channel = cpal::Voice::new();
channel.play();
let mut decoder = vorbis::Decoder::new(Cursor::new(&include_bytes!("music.ogg")[..]))
.unwrap();
'main: for packet in decoder.packets() {
let packet = packet.unwrap();
let vorbis::Packet { channels, rate, data, .. } = packet;
let mut data = &data[..];
loop {
if data.len() == 0 {
continue 'main;
}
{
let mut buffer = channel.append_data(channels, cpal::SamplesRate(rate as u32),
data.len());
let mut buffer = buffer.iter_mut();
loop {
let next_sample = match data.get(0) {
Some(s) => *s,
None => continue 'main
};
if let Some(output) = buffer.next() {
*output = next_sample;
data = &data[1..];
} else {
break;
}
}
}
channel.play();
}
}
}