Compare commits
4 Commits
3b45f4309f
...
10d3cd62c5
| Author | SHA1 | Date |
|---|---|---|
_
|
10d3cd62c5 | |
|
_
|
f2484dda91 | |
|
_
|
70e5182dfc | |
|
_
|
f7c38d88de |
|
|
@ -87,9 +87,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "1.2.1"
|
||||
version = "1.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
|
||||
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
||||
|
||||
[[package]]
|
||||
name = "bumpalo"
|
||||
|
|
@ -156,6 +156,15 @@ dependencies = [
|
|||
"libloading",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cmake"
|
||||
version = "0.1.46"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b7b858541263efe664aead4a5209a4ae5c5d2811167d4ed4ee0944503f8d2089"
|
||||
dependencies = [
|
||||
"cc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "combine"
|
||||
version = "4.6.2"
|
||||
|
|
@ -287,12 +296,43 @@ dependencies = [
|
|||
"vcpkg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "fltk"
|
||||
version = "1.2.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9480f6742b6ba50cbfb8e016c987f8d3e2faa79c0624e22f934d80c747c62e18"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"fltk-sys",
|
||||
"paste",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "fltk-sys"
|
||||
version = "1.2.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b6dc0e345a8288be36989fccd9796685b35dc63378c08fd7548100e1109a4ccb"
|
||||
dependencies = [
|
||||
"cmake",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "fnv"
|
||||
version = "1.0.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
|
||||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.2.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
|
||||
dependencies = [
|
||||
"cfg-if 1.0.0",
|
||||
"libc",
|
||||
"wasi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "glob"
|
||||
version = "0.3.0"
|
||||
|
|
@ -431,15 +471,6 @@ version = "2.4.1"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
|
||||
|
||||
[[package]]
|
||||
name = "memoffset"
|
||||
version = "0.6.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "music_player"
|
||||
version = "0.1.0"
|
||||
|
|
@ -448,6 +479,8 @@ dependencies = [
|
|||
"byteorder",
|
||||
"cpal",
|
||||
"ffmpeg-next",
|
||||
"fltk",
|
||||
"rand",
|
||||
"tracing",
|
||||
"tracing-subscriber",
|
||||
]
|
||||
|
|
@ -526,15 +559,14 @@ checksum = "c44922cb3dbb1c70b5e5f443d63b64363a898564d739ba5198e3a9138442868d"
|
|||
|
||||
[[package]]
|
||||
name = "nix"
|
||||
version = "0.20.2"
|
||||
version = "0.20.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f5e06129fb611568ef4e868c14b326274959aa70ff7776e9d55323531c374945"
|
||||
checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"cc",
|
||||
"cfg-if 1.0.0",
|
||||
"libc",
|
||||
"memoffset",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -653,6 +685,12 @@ dependencies = [
|
|||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "paste"
|
||||
version = "1.0.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5"
|
||||
|
||||
[[package]]
|
||||
name = "peeking_take_while"
|
||||
version = "0.1.2"
|
||||
|
|
@ -671,6 +709,12 @@ version = "0.3.22"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f"
|
||||
|
||||
[[package]]
|
||||
name = "ppv-lite86"
|
||||
version = "0.2.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba"
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro-crate"
|
||||
version = "0.1.5"
|
||||
|
|
@ -708,6 +752,46 @@ dependencies = [
|
|||
"proc-macro2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand"
|
||||
version = "0.8.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"rand_chacha",
|
||||
"rand_core",
|
||||
"rand_hc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_chacha"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
|
||||
dependencies = [
|
||||
"ppv-lite86",
|
||||
"rand_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_core"
|
||||
version = "0.6.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_hc"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
|
||||
dependencies = [
|
||||
"rand_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "redox_syscall"
|
||||
version = "0.2.10"
|
||||
|
|
@ -940,6 +1024,12 @@ dependencies = [
|
|||
"winapi-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasi"
|
||||
version = "0.10.2+wasi-snapshot-preview1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen"
|
||||
version = "0.2.78"
|
||||
|
|
|
|||
|
|
@ -10,5 +10,7 @@ anyhow = "1.0.45"
|
|||
byteorder = "1.4.3"
|
||||
cpal = "0.13.4"
|
||||
ffmpeg-next = "4.4.0"
|
||||
fltk = "1.2.15"
|
||||
rand = "0.8.4"
|
||||
tracing = "0.1.29"
|
||||
tracing-subscriber = { version = "0.3.1", features = ["env-filter"] }
|
||||
|
|
|
|||
|
|
@ -91,9 +91,9 @@ impl PcmBuffers {
|
|||
}
|
||||
|
||||
pub struct Decoder {
|
||||
pub input_ctx: DemuxContext,
|
||||
pub decoder: DecodeContext,
|
||||
pub resampler: ResamplingContext,
|
||||
input_ctx: DemuxContext,
|
||||
decoder: DecodeContext,
|
||||
resampler: ResamplingContext,
|
||||
|
||||
best_stream_idx: usize,
|
||||
dummy_frame: Option <FfAudioFrame>,
|
||||
|
|
|
|||
561
src/main.rs
561
src/main.rs
|
|
@ -5,12 +5,12 @@ use std::{
|
|||
Arc,
|
||||
Condvar,
|
||||
Mutex,
|
||||
mpsc,
|
||||
},
|
||||
thread::{
|
||||
self,
|
||||
sleep,
|
||||
},
|
||||
time::{Duration, Instant},
|
||||
time::{Instant},
|
||||
};
|
||||
|
||||
use anyhow::{
|
||||
|
|
@ -22,10 +22,23 @@ use anyhow::{
|
|||
use cpal::traits::{
|
||||
DeviceTrait,
|
||||
HostTrait,
|
||||
StreamTrait,
|
||||
};
|
||||
|
||||
use fltk::{
|
||||
app,
|
||||
button::Button,
|
||||
enums::CallbackTrigger,
|
||||
frame::Frame,
|
||||
group::Flex,
|
||||
prelude::*,
|
||||
window::Window,
|
||||
};
|
||||
|
||||
mod decoder;
|
||||
|
||||
const BUFFER_SIZE: usize = 5_000;
|
||||
|
||||
fn main () -> Result <()> {
|
||||
let args: Vec <_> = std::env::args ().collect ();
|
||||
|
||||
|
|
@ -33,6 +46,7 @@ fn main () -> Result <()> {
|
|||
None => bail! ("First argument must be a subcommand like `play`"),
|
||||
Some ("debug-dump") => cmd_debug_dump (&args [1..]),
|
||||
Some ("debug-pipe") => cmd_debug_pipe (&args [1..]),
|
||||
Some ("gui") => cmd_gui (&args [1..]),
|
||||
Some ("play") => cmd_play (&args [1..]),
|
||||
Some (_) => bail! ("Unrecognized subcommand"),
|
||||
}
|
||||
|
|
@ -81,10 +95,230 @@ fn cmd_debug_pipe (args: &[String]) -> Result <()> {
|
|||
#[derive (Default)]
|
||||
pub struct SharedState {
|
||||
pub pcm_buffers: decoder::PcmBuffers,
|
||||
pub quit: bool,
|
||||
}
|
||||
|
||||
struct Gui {
|
||||
intend_to_play: bool,
|
||||
can_decode: bool,
|
||||
audio_is_streaming: bool,
|
||||
trying_to_stream: bool,
|
||||
|
||||
but_pause: Button,
|
||||
but_play: Button,
|
||||
}
|
||||
|
||||
fn set_active <W: WidgetExt> (w: &mut W, b: bool) {
|
||||
if b {
|
||||
w.activate ();
|
||||
}
|
||||
else {
|
||||
w.deactivate ();
|
||||
}
|
||||
}
|
||||
|
||||
impl Gui {
|
||||
pub fn sync (&mut self) {
|
||||
set_active (
|
||||
&mut self.but_pause,
|
||||
self.intend_to_play,
|
||||
);
|
||||
set_active (
|
||||
&mut self.but_play,
|
||||
! self.intend_to_play &&
|
||||
self.can_decode
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
#[derive (Clone, Copy, Debug)]
|
||||
enum Message {
|
||||
AudioStreamStatus (bool),
|
||||
DecoderStatus (bool),
|
||||
RawPlay,
|
||||
RawPause,
|
||||
RawSet,
|
||||
RawSkip,
|
||||
}
|
||||
|
||||
fn cmd_gui (args: &[String]) -> Result <()> {
|
||||
use std::io::BufRead;
|
||||
|
||||
tracing_subscriber::fmt::init ();
|
||||
|
||||
let playlist = {
|
||||
let mut files = Vec::with_capacity (2000);
|
||||
let file = File::open ("/home/user/music/playlist.m3u")?;
|
||||
let reader = std::io::BufReader::new (file);
|
||||
|
||||
for line in reader.lines () {
|
||||
files.push (line?);
|
||||
}
|
||||
|
||||
files
|
||||
};
|
||||
|
||||
let filenames: Vec <_> = args.iter ()
|
||||
.skip (1)
|
||||
.map (|s| s.to_string ())
|
||||
.collect ();
|
||||
|
||||
let (fltk_tx, fltk_rx) = app::channel::<Message> ();
|
||||
|
||||
let app = app::App::default ();
|
||||
let window_title = "Music Player".to_string ();
|
||||
let mut wind = Window::new (100, 100, 600, 600, None)
|
||||
.with_label (&window_title);
|
||||
wind.make_resizable (true);
|
||||
|
||||
let mut col = Flex::default ().column ().size_of_parent ();
|
||||
|
||||
{
|
||||
let mut row = Flex::default ().row ();
|
||||
|
||||
let mut label = Frame::default ().with_label ("Audio output");
|
||||
let mut but_audio_play = Button::default ().with_label ("Play");
|
||||
let mut but_audio_pause = Button::default ().with_label ("Pause");
|
||||
|
||||
row.set_size (&mut label, 100);
|
||||
row.set_size (&mut but_audio_play, 100);
|
||||
row.set_size (&mut but_audio_pause, 100);
|
||||
|
||||
but_audio_play.set_trigger (CallbackTrigger::Release);
|
||||
but_audio_pause.set_trigger (CallbackTrigger::Release);
|
||||
|
||||
but_audio_play.emit (fltk_tx, Message::RawPlay);
|
||||
but_audio_pause.emit (fltk_tx, Message::RawPause);
|
||||
|
||||
row.end ();
|
||||
|
||||
col.add (&row);
|
||||
col.set_size (&mut row, 30);
|
||||
}
|
||||
|
||||
{
|
||||
let mut row = Flex::default ().row ();
|
||||
|
||||
let mut label = Frame::default ().with_label ("Decoder");
|
||||
let mut but_set = Button::default ().with_label ("Set");
|
||||
let mut but_skip = Button::default ().with_label ("Skip");
|
||||
|
||||
row.set_size (&mut label, 100);
|
||||
row.set_size (&mut but_set, 100);
|
||||
row.set_size (&mut but_skip, 100);
|
||||
|
||||
but_set.set_trigger (CallbackTrigger::Release);
|
||||
but_skip.set_trigger (CallbackTrigger::Release);
|
||||
|
||||
but_set.emit (fltk_tx, Message::RawSet);
|
||||
but_skip.emit (fltk_tx, Message::RawSkip);
|
||||
|
||||
row.end ();
|
||||
|
||||
col.add (&row);
|
||||
col.set_size (&mut row, 30);
|
||||
}
|
||||
|
||||
col.end ();
|
||||
|
||||
wind.end ();
|
||||
wind.show ();
|
||||
/*
|
||||
let mut gui = Gui {
|
||||
can_decode: false,
|
||||
audio_is_streaming: false,
|
||||
intend_to_play: false,
|
||||
trying_to_stream: false,
|
||||
but_pause,
|
||||
but_play,
|
||||
};
|
||||
|
||||
gui.sync ();
|
||||
*/
|
||||
let mut shared_state = SharedState::default ();
|
||||
let silence = vec! [0; 12_000 * 4 * 2];
|
||||
shared_state.pcm_buffers.produce_bytes (silence);
|
||||
|
||||
let shared_state = Arc::new ((Mutex::new (shared_state), Condvar::new ()));
|
||||
|
||||
let thread_decoder = DecoderThread::new (
|
||||
Arc::clone (&shared_state),
|
||||
fltk_tx.clone (),
|
||||
);
|
||||
let mut audio_output = AudioOutput::new (
|
||||
Arc::clone (&shared_state),
|
||||
thread_decoder.tx.clone (),
|
||||
fltk_tx.clone (),
|
||||
)?;
|
||||
|
||||
// Doesn't work.
|
||||
// audio_output.pause ()?;
|
||||
|
||||
/*
|
||||
for filename in filenames {
|
||||
//gui.can_decode = true;
|
||||
thread_decoder.tx.send (MessageToDecoder::QueueFile (filename))?;
|
||||
}
|
||||
*/
|
||||
|
||||
// let mut play_queue = vec! [];
|
||||
|
||||
let mut current_file = None;
|
||||
|
||||
while app.wait () {
|
||||
let msg = match fltk_rx.recv () {
|
||||
None => continue,
|
||||
Some (x) => x,
|
||||
};
|
||||
|
||||
match msg {
|
||||
Message::AudioStreamStatus (x) => {
|
||||
|
||||
},
|
||||
Message::DecoderStatus (x) => {
|
||||
if ! x {
|
||||
tracing::info! ("Decoder ran dry");
|
||||
current_file = None;
|
||||
}
|
||||
},
|
||||
Message::RawPlay => {
|
||||
audio_output.play ()?;
|
||||
},
|
||||
Message::RawPause => {
|
||||
audio_output.pause ()?;
|
||||
},
|
||||
Message::RawSet => {
|
||||
use rand::Rng;
|
||||
let idx = rand::thread_rng ().gen_range (0..playlist.len ());
|
||||
let filename = &playlist [idx];
|
||||
tracing::info! ("Set decoder to {}", filename);
|
||||
thread_decoder.tx.send (MessageToDecoder::SetFile (Some (format! ("/home/user/music/{}", filename))))?;
|
||||
current_file = Some (filename);
|
||||
},
|
||||
Message::RawSkip => {
|
||||
thread_decoder.tx.send (MessageToDecoder::SetFile (None))?;
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
tracing::info! ("Received FLTK quit signal");
|
||||
|
||||
audio_output.pause ()?;
|
||||
|
||||
tracing::debug! ("Joining decoder thread...");
|
||||
thread_decoder.tx.send (MessageToDecoder::Quit)?;
|
||||
thread_decoder.join ()?;
|
||||
|
||||
tracing::debug! ("Joining PCM thread...");
|
||||
drop (audio_output);
|
||||
|
||||
tracing::info! ("Exiting cleanly.");
|
||||
|
||||
Ok (())
|
||||
}
|
||||
|
||||
fn cmd_play (args: &[String]) -> Result <()> {
|
||||
unimplemented! ();
|
||||
/*
|
||||
tracing_subscriber::fmt::init ();
|
||||
|
||||
let filenames: Vec <_> = args.iter ()
|
||||
|
|
@ -92,124 +326,233 @@ fn cmd_play (args: &[String]) -> Result <()> {
|
|||
.map (|s| s.to_string ())
|
||||
.collect ();
|
||||
|
||||
let pair = Arc::new ((Mutex::new (SharedState::default ()), Condvar::new ()));
|
||||
let pair2 = Arc::clone (&pair);
|
||||
let pair3 = Arc::clone (&pair);
|
||||
|
||||
let thread_decoder = thread::spawn (move|| {
|
||||
let (lock, cvar) = &*pair2;
|
||||
|
||||
'many_files: for filename in &filenames {
|
||||
let mut decoder = decoder::Decoder::new (&filename)?;
|
||||
|
||||
'one_file: loop {
|
||||
// tracing::trace! ("decode thread parking");
|
||||
|
||||
let mut decoder_state = cvar.wait_while (lock.lock ().unwrap (), |decoder_state| {
|
||||
decoder_state.pcm_buffers.samples_available () >= 12_000 &&
|
||||
! decoder_state.quit
|
||||
}).unwrap ();
|
||||
|
||||
if decoder_state.quit {
|
||||
break 'many_files;
|
||||
}
|
||||
|
||||
//dbg! (resampler.delay ());
|
||||
|
||||
let pcm_buffers = &mut decoder_state.pcm_buffers;
|
||||
|
||||
while pcm_buffers.samples_available () < 12_000 {
|
||||
// tracing::trace! ("Decoder is trying to work...");
|
||||
match decoder.next ()? {
|
||||
Some (frame) => pcm_buffers.produce_bytes (frame.data ().into ()),
|
||||
None => {
|
||||
tracing::info! ("Finished decoding file");
|
||||
break 'one_file;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Ok::<_, anyhow::Error> (())
|
||||
});
|
||||
|
||||
let host = cpal::default_host ();
|
||||
let device = host.default_output_device ().ok_or_else (|| anyhow! ("can't open cpal device"))?;
|
||||
|
||||
let mut supported_configs_range = device.supported_output_configs ()?
|
||||
.filter (|c| c.channels () == 2 && c.sample_format () == cpal::SampleFormat::F32);
|
||||
|
||||
let config = supported_configs_range.next ()
|
||||
.ok_or_else (|| anyhow! ("can't get stereo f32 audio output"))?
|
||||
.with_sample_rate (cpal::SampleRate (decoder::SAMPLE_RATE))
|
||||
.config ();
|
||||
// let (decoder_tx, decoder_rx) = mpsc::sync_channel (1);
|
||||
let (main_tx, main_rx) = mpsc::sync_channel (1);
|
||||
|
||||
let shared_state = Arc::new ((Mutex::new (SharedState::default ()), Condvar::new ()));
|
||||
let pcm_quit = Arc::new ((Mutex::new (false), Condvar::new ()));
|
||||
let pcm_quit2 = Arc::clone (&pcm_quit);
|
||||
|
||||
let stream = device.build_output_stream (
|
||||
&config,
|
||||
move |data: &mut [f32], _: &cpal::OutputCallbackInfo| {
|
||||
let (lock, cvar) = &*pair;
|
||||
|
||||
let time_start = Instant::now ();
|
||||
let mut decoder_state = match lock.lock () {
|
||||
Ok (x) => x,
|
||||
Err (_) => return,
|
||||
};
|
||||
let time_stop = Instant::now ();
|
||||
let dur = time_stop - time_start;
|
||||
if dur.as_micros () > 2 {
|
||||
dbg! (dur.as_micros ());
|
||||
}
|
||||
|
||||
let pcm_buffers = &mut decoder_state.pcm_buffers;
|
||||
|
||||
if ! pcm_buffers.consume_exact (data) {
|
||||
tracing::warn! ("PCM buffer underflow");
|
||||
|
||||
for x in data {
|
||||
*x = 0.0;
|
||||
}
|
||||
|
||||
let (lock, cvar) = &*pcm_quit;
|
||||
|
||||
let mut pcm_quit = lock.lock ().unwrap ();
|
||||
*pcm_quit = true;
|
||||
cvar.notify_one ();
|
||||
}
|
||||
|
||||
cvar.notify_one ();
|
||||
},
|
||||
move |_err| {
|
||||
// react to errors here.
|
||||
},
|
||||
let thread_decoder = DecoderThread::new (
|
||||
Arc::clone (&shared_state),
|
||||
main_tx.clone (),
|
||||
);
|
||||
let audio_output = AudioOutput::new (
|
||||
Arc::clone (&pcm_quit),
|
||||
Arc::clone (&shared_state),
|
||||
thread_decoder.tx.clone (),
|
||||
)?;
|
||||
|
||||
// sleep (std::time::Duration::from_secs (3 * 60 + 40));
|
||||
|
||||
tracing::debug! ("Joining decoder thread...");
|
||||
|
||||
if false {
|
||||
let mut decoder_state = pair3.0.lock ().unwrap ();
|
||||
decoder_state.quit = true;
|
||||
pair3.1.notify_one ();
|
||||
for filename in filenames {
|
||||
thread_decoder.tx.send (MessageToDecoder::QueueFile (filename))?;
|
||||
}
|
||||
|
||||
thread_decoder.join ().unwrap ()?;
|
||||
while let Ok (msg) = main_rx.recv () { match msg {
|
||||
MessageToMain::DecoderEmpty => break,
|
||||
}}
|
||||
|
||||
tracing::debug! ("Asking decoder to quit...");
|
||||
thread_decoder.tx.send (MessageToDecoder::Quit)?;
|
||||
tracing::debug! ("Joining decoder thread...");
|
||||
thread_decoder.join ()?;
|
||||
|
||||
tracing::debug! ("Joining PCM thread...");
|
||||
|
||||
let (lock, cvar) = &*pcm_quit2;
|
||||
let _ = cvar.wait (lock.lock ().unwrap ()).unwrap ();
|
||||
|
||||
drop (stream);
|
||||
|
||||
sleep (Duration::from_secs (1));
|
||||
drop (audio_output);
|
||||
|
||||
tracing::info! ("Exiting cleanly.");
|
||||
Ok (())
|
||||
*/
|
||||
}
|
||||
|
||||
struct DecoderThread {
|
||||
join_handle: thread::JoinHandle <Result <()>>,
|
||||
pub tx: mpsc::SyncSender <MessageToDecoder>,
|
||||
}
|
||||
|
||||
enum MessageToDecoder {
|
||||
NeedPcm,
|
||||
SetFile (Option <String>),
|
||||
Quit,
|
||||
}
|
||||
|
||||
impl DecoderThread {
|
||||
pub fn new (
|
||||
shared_state: Arc <(Mutex <SharedState>, Condvar)>,
|
||||
main_tx: fltk::app::Sender <Message>,
|
||||
) -> Self
|
||||
{
|
||||
let (tx, rx) = mpsc::sync_channel (4);
|
||||
|
||||
let self_tx = tx.clone ();
|
||||
|
||||
let join_handle = thread::spawn (move|| {
|
||||
let mut decoder: Option <decoder::Decoder> = None;
|
||||
|
||||
'thread: while let Ok (msg) = rx.recv () { match msg {
|
||||
MessageToDecoder::NeedPcm => {
|
||||
// tracing::trace! ("DecoderThread recv'd NeedPcm");
|
||||
let mut bytes_produced = 0;
|
||||
let mut status = false;
|
||||
|
||||
'pipeline: while bytes_produced < BUFFER_SIZE * 4 * 2 {
|
||||
// tracing::trace! ("Pumping multi-file decode pipeline");
|
||||
let frame = if let Some (decoder) = decoder.as_mut () {
|
||||
decoder.next ()?
|
||||
}
|
||||
else {
|
||||
None
|
||||
};
|
||||
|
||||
if let Some (frame) = frame {
|
||||
// tracing::trace! ("Decoded bytes");
|
||||
status = true;
|
||||
let mut shared_state = shared_state.0.lock ().unwrap ();
|
||||
bytes_produced += frame.data ().len ();
|
||||
shared_state.pcm_buffers.produce_bytes (frame.data ().into ());
|
||||
continue 'pipeline;
|
||||
}
|
||||
else if decoder.is_some () {
|
||||
decoder = None;
|
||||
main_tx.send (Message::DecoderStatus (false));
|
||||
}
|
||||
|
||||
{
|
||||
// tracing::trace! ("Decoder thread is producing silence");
|
||||
let frame = vec! [0; 2_000 * 4 * 2];
|
||||
{
|
||||
let mut shared_state = shared_state.0.lock ().unwrap ();
|
||||
|
||||
bytes_produced += frame.len ();
|
||||
shared_state.pcm_buffers.produce_bytes (frame);
|
||||
// tracing::trace! ("PCM buffer: {}", shared_state.pcm_buffers.samples_available ());
|
||||
}
|
||||
status = false;
|
||||
continue 'pipeline;
|
||||
}
|
||||
}
|
||||
// tracing::trace! ("Left NeedPcm handler");
|
||||
// main_tx.send (Message::DecoderStatus (status));
|
||||
},
|
||||
MessageToDecoder::SetFile (x) => {
|
||||
if let Some (x) = x.as_ref () {
|
||||
decoder = Some (decoder::Decoder::new (x)?);
|
||||
}
|
||||
else {
|
||||
decoder = None;
|
||||
}
|
||||
// main_tx.send (Message::DecoderStatus (x.is_some ()));
|
||||
let new_buffers = decoder::PcmBuffers::default ();
|
||||
self_tx.send (MessageToDecoder::NeedPcm)?;
|
||||
|
||||
let mut shared_state = shared_state.0.lock ().unwrap ();
|
||||
shared_state.pcm_buffers = new_buffers;
|
||||
},
|
||||
MessageToDecoder::Quit => {
|
||||
tracing::debug! ("DecoderThread recv'd Quit");
|
||||
break 'thread;
|
||||
},
|
||||
}}
|
||||
|
||||
tracing::info! ("Decoder thread quit gracefully");
|
||||
|
||||
Ok::<_, anyhow::Error> (())
|
||||
});
|
||||
|
||||
Self {
|
||||
join_handle,
|
||||
tx,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn join (self) -> Result <()> {
|
||||
self.join_handle.join ().unwrap ()
|
||||
}
|
||||
}
|
||||
|
||||
struct AudioOutput {
|
||||
_host: cpal::Host,
|
||||
_device: cpal::Device,
|
||||
stream: cpal::Stream,
|
||||
}
|
||||
|
||||
impl AudioOutput {
|
||||
pub fn new (
|
||||
shared_state: Arc <(Mutex <SharedState>, Condvar)>,
|
||||
decoder_tx: mpsc::SyncSender <MessageToDecoder>,
|
||||
main_tx: fltk::app::Sender <Message>,
|
||||
) -> Result <Self>
|
||||
{
|
||||
let host = cpal::default_host ();
|
||||
let device = host.default_output_device ().ok_or_else (|| anyhow! ("can't open cpal device"))?;
|
||||
|
||||
let mut supported_configs_range = device.supported_output_configs ()?
|
||||
.filter (|c| c.channels () == 2 && c.sample_format () == cpal::SampleFormat::F32);
|
||||
|
||||
let config = supported_configs_range.next ()
|
||||
.ok_or_else (|| anyhow! ("can't get stereo f32 audio output"))?
|
||||
.with_sample_rate (cpal::SampleRate (decoder::SAMPLE_RATE))
|
||||
.config ();
|
||||
|
||||
let stream = device.build_output_stream (
|
||||
&config,
|
||||
move |data: &mut [f32], _: &cpal::OutputCallbackInfo| {
|
||||
let (lock, _) = &*shared_state;
|
||||
|
||||
let time_start = Instant::now ();
|
||||
let need_pcm;
|
||||
let status;
|
||||
{
|
||||
let mut decoder_state = match lock.lock () {
|
||||
Ok (x) => x,
|
||||
Err (_) => return,
|
||||
};
|
||||
let time_stop = Instant::now ();
|
||||
let dur = time_stop - time_start;
|
||||
if dur.as_micros () > 100 {
|
||||
tracing::warn! ("PCM thread waited {} us for a lock", dur.as_micros ());
|
||||
}
|
||||
|
||||
let pcm_buffers = &mut decoder_state.pcm_buffers;
|
||||
|
||||
if ! pcm_buffers.consume_exact (data) {
|
||||
tracing::warn! ("PCM buffer underflow");
|
||||
status = false;
|
||||
|
||||
for x in data {
|
||||
*x = 0.0;
|
||||
}
|
||||
}
|
||||
else {
|
||||
status = true;
|
||||
}
|
||||
|
||||
need_pcm = pcm_buffers.samples_available () < BUFFER_SIZE;
|
||||
}
|
||||
|
||||
if need_pcm {
|
||||
decoder_tx.try_send (MessageToDecoder::NeedPcm).ok ();
|
||||
// tracing::trace! ("AudioOutput sent NeedPcm");
|
||||
}
|
||||
// main_tx.send (Message::AudioStreamStatus (status));
|
||||
},
|
||||
move |err| {
|
||||
tracing::error! ("{:?}", err);
|
||||
},
|
||||
)?;
|
||||
|
||||
Ok (Self {
|
||||
_host: host,
|
||||
_device: device,
|
||||
stream,
|
||||
})
|
||||
}
|
||||
|
||||
pub fn play (&mut self) -> Result <()> {
|
||||
Ok (self.stream.play ()?)
|
||||
}
|
||||
|
||||
pub fn pause (&mut self) -> Result <()> {
|
||||
Ok (self.stream.pause ()?)
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg (test)]
|
||||
|
|
|
|||
Loading…
Reference in New Issue