mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-21 09:14:34 +00:00
some general ideas to debug later
This commit is contained in:
parent
f8979d6341
commit
61611caddd
2 changed files with 91 additions and 5 deletions
|
|
@ -39,6 +39,38 @@ impl Codec {
|
||||||
Message::new_scalar(Opcode::Setup8kStereo.to_usize().unwrap(), 0, 0, 0, 0)
|
Message::new_scalar(Opcode::Setup8kStereo.to_usize().unwrap(), 0, 0, 0, 0)
|
||||||
).map(|_| ())
|
).map(|_| ())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn free_frames(&mut self) -> Result<(play, rec), xous::Error> {
|
||||||
|
let response = send_message(self.conn,
|
||||||
|
Message::new_blocking_scalar(Opcode::FreeFrames.to_usize().unwrap(), 0, 0, 0, 0))?;
|
||||||
|
if let xous::Result::Scalar2(play_free, rec_avail) = response {
|
||||||
|
Ok(
|
||||||
|
(play_free, rec_avail)
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
log::error!("unexpected return value: {:#?}", response);
|
||||||
|
Err(xous::Error::InternalError)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn swap_frames(&mut self, frames: &mut FrameRing::<FIFO_DEPTH, 4>) -> Result<(), xous::Error> {
|
||||||
|
let mut buf = Buffer::into_buf(*frames).or(Err(xous::Error::InternalError))?;
|
||||||
|
buf.lend_mut(self.conn, Opcode::SwapFrames.to_u32().unwrap()).or(Err(xous::Error::InternalError))?;
|
||||||
|
|
||||||
|
frames = buf.to_original::<FrameRing::<FIFO_DEPTH, 4>, _>().unwrap();
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn resume(&mut self) -> Result<(), xous::Error> {
|
||||||
|
send_message(self.conn,
|
||||||
|
Message::new_scalar(Opcode::ResumeStream.to_usize().unwrap(), 0, 0, 0, 0)
|
||||||
|
).map(|_| ())
|
||||||
|
}
|
||||||
|
pub fn pause(&mut self) -> Result<(), xous::Error> {
|
||||||
|
send_message(self.conn,
|
||||||
|
Message::new_scalar(Opcode::PauseStream.to_usize().unwrap(), 0, 0, 0, 0)
|
||||||
|
).map(|_| ())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Drop for Codec {
|
impl Drop for Codec {
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ use crate::{ShellCmdApi,CommonEnv};
|
||||||
use xous_ipc::String;
|
use xous_ipc::String;
|
||||||
|
|
||||||
use core::convert::TryFrom;
|
use core::convert::TryFrom;
|
||||||
|
use codec::*;
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct Audio {
|
pub struct Audio {
|
||||||
|
|
@ -11,6 +11,7 @@ pub struct Audio {
|
||||||
header: Header,
|
header: Header,
|
||||||
raw_data: *const u32,
|
raw_data: *const u32,
|
||||||
raw_len_bytes: u32,
|
raw_len_bytes: u32,
|
||||||
|
play_ptr_bytes: usize,
|
||||||
}
|
}
|
||||||
impl Audio {
|
impl Audio {
|
||||||
pub fn new(xns: &xous_names::XousNames) -> Self {
|
pub fn new(xns: &xous_names::XousNames) -> Self {
|
||||||
|
|
@ -26,13 +27,18 @@ impl Audio {
|
||||||
for i in 0..16 {
|
for i in 0..16 {
|
||||||
unsafe{ raw_header[i] = (*samples)[i] };
|
unsafe{ raw_header[i] = (*samples)[i] };
|
||||||
}
|
}
|
||||||
|
|
||||||
codec.setup_8k_stream();
|
codec.setup_8k_stream();
|
||||||
|
let callback_conn = xns.request_connection_blocking(crate::SERVER_NAME_SHELLCHAT).unwrap();
|
||||||
|
codec.hook_frame_callback(0xDEAD_BEEF, callback_conn).unwrap(); // any non-handled IDs get routed to our callback port
|
||||||
|
|
||||||
Audio {
|
Audio {
|
||||||
codec,
|
codec,
|
||||||
sample,
|
sample,
|
||||||
header: Header::from(raw_header),
|
header: Header::from(raw_header),
|
||||||
raw_data: (sample.as_ptr() + 44) as *const u32,
|
raw_data: (sample.as_ptr() + 44) as *const u32,
|
||||||
raw_len_bytes: unsafe{*((sample.as_ptr() + 40) as *const u32)},
|
raw_len_bytes: unsafe{*((sample.as_ptr() + 40) as *const u32)},
|
||||||
|
play_ptr_bytes: 0,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -51,12 +57,29 @@ impl<'a> ShellCmdApi<'a> for Audio {
|
||||||
if let Some(sub_cmd) = tokens.next() {
|
if let Some(sub_cmd) = tokens.next() {
|
||||||
match sub_cmd {
|
match sub_cmd {
|
||||||
"play" => {
|
"play" => {
|
||||||
write!(ret, "TODO").unwrap();
|
write!(ret, "Playing sample...").unwrap();
|
||||||
// need to set up the callback handler
|
|
||||||
// load the initial sample data
|
// load the initial sample data
|
||||||
// start the playing
|
let (play_free, _) = self.codec.free_frames().unwrap();
|
||||||
|
|
||||||
// for now, we'll just discard the recorded data...
|
let frames: FrameRing::<codec::FIFO_DEPTH, 4> = FrameRing::new();
|
||||||
|
let frame_to_push = if frames.writeable_count() < play_free {
|
||||||
|
frames.writeable_count();
|
||||||
|
} else {
|
||||||
|
play_free;
|
||||||
|
};
|
||||||
|
for i in 0..frame_to_push {
|
||||||
|
let frame = [u32; codec::FIFO_DEPTH];
|
||||||
|
for i in 0..codec::FIFO_DEPTH {
|
||||||
|
frame[i] = unsafe{*(raw_data + i)};
|
||||||
|
}
|
||||||
|
self.play_ptr_bytes += codec::FIFO_DEPTH * 4;
|
||||||
|
frames.nq_frame(frame).unwrap();
|
||||||
|
}
|
||||||
|
self.codec.swap_frames(frames).unwrap();
|
||||||
|
// start the playing
|
||||||
|
self.codec.resume().unwrap();
|
||||||
|
|
||||||
|
// we'll get a callback that demands the next data...
|
||||||
}
|
}
|
||||||
"info" => {
|
"info" => {
|
||||||
write!(ret, "Loaded sample is {}kHz, {} channels, {} format, {} bytes", self.header.sampling_rate, self.header.channel_count, self.header.audio_format, self.raw_len_bytes).unwrap();
|
write!(ret, "Loaded sample is {}kHz, {} channels, {} format, {} bytes", self.header.sampling_rate, self.header.channel_count, self.header.audio_format, self.raw_len_bytes).unwrap();
|
||||||
|
|
@ -69,6 +92,37 @@ impl<'a> ShellCmdApi<'a> for Audio {
|
||||||
|
|
||||||
Ok(Some(ret))
|
Ok(Some(ret))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn callback(&mut self, msg: &MessageEnvelope, env: &mut CommonEnv) -> Result<Option<String::<1024>>, xous::Error> {
|
||||||
|
use core::fmt::Write;
|
||||||
|
|
||||||
|
xous::msg_scalar_unpack!(msg, free_play, avail_rec, _, _, {
|
||||||
|
if self.play_ptr_bytes + codec::FIFO_DEPTH *4 < self.raw_len_bytes {
|
||||||
|
let frames: FrameRing::<codec::FIFO_DEPTH, 4> = FrameRing::new();
|
||||||
|
let frame_to_push = if frames.writeable_count() < play_free {
|
||||||
|
frames.writeable_count();
|
||||||
|
} else {
|
||||||
|
play_free;
|
||||||
|
};
|
||||||
|
for i in 0..frame_to_push {
|
||||||
|
let frame = [u32; codec::FIFO_DEPTH];
|
||||||
|
for i in 0..codec::FIFO_DEPTH {
|
||||||
|
frame[i] = unsafe{*(raw_data + i)};
|
||||||
|
}
|
||||||
|
self.play_ptr_bytes += codec::FIFO_DEPTH * 4;
|
||||||
|
frames.nq_frame(frame).unwrap();
|
||||||
|
}
|
||||||
|
self.codec.swap_frames(frames).unwrap();
|
||||||
|
|
||||||
|
Ok(None)
|
||||||
|
} else {
|
||||||
|
self.codec.pause().unwrap(); // this should stop callbacks from occurring too.
|
||||||
|
let mut ret = String::<1024>::new();
|
||||||
|
write!(ret, "{}", "Playback finished").unwrap();
|
||||||
|
Ok(ret)
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue