Files
songbird/src/tracks/queue.rs
Kyle Simpson 8cc7a22b0b Driver/Input: Migrate audio backend to Symphonia (#89)
This extensive PR rewrites the internal mixing logic of the driver to use symphonia for parsing and decoding audio data, and rubato to resample audio. Existing logic to decode DCA and Opus formats/data have been reworked as plugins for symphonia. The main benefit is that we no longer need to keep yt-dlp and ffmpeg processes alive, saving a lot of memory and CPU: all decoding can be done in Rust! In exchange, we now need to do a lot of the HTTP handling and resumption ourselves, but this is still a huge net positive.

`Input`s have been completely reworked such that all default (non-cached) sources are lazy by default, and are no longer covered by a special-case `Restartable`. These now span a gamut from a `Compose` (lazy), to a live source, to a fully `Parsed` source. As mixing is still sync, this includes adapters for `AsyncRead`/`AsyncSeek`, and HTTP streams.

`Track`s have been reworked so that they only contain initialisation state for each track. `TrackHandles` are only created once a `Track`/`Input` has been handed over to the driver, replacing `create_player` and related functions. `TrackHandle::action` now acts on a `View` of (im)mutable state, and can request seeks/readying via `Action`.

Per-track event handling has also been improved -- we can now determine and propagate the reason behind individual track errors due to the new backend. Some `TrackHandle` commands (seek etc.) benefit from this, and now use internal callbacks to signal completion.

Due to associated PRs on felixmcfelix/songbird from avid testers, this includes general clippy tweaks, API additions, and other repo-wide cleanup. Thanks go out to the below co-authors.

Co-authored-by: Gnome! <45660393+GnomedDev@users.noreply.github.com>
Co-authored-by: Alakh <36898190+alakhpc@users.noreply.github.com>
2023-11-19 23:58:34 +00:00

500 lines
15 KiB
Rust

use crate::{
driver::Driver,
events::{Event, EventContext, EventData, EventHandler, TrackEvent},
input::Input,
tracks::{Track, TrackHandle, TrackResult},
};
use async_trait::async_trait;
use parking_lot::Mutex;
use std::{collections::VecDeque, ops::Deref, sync::Arc, time::Duration};
use tracing::{info, warn};
/// A simple queue for several audio sources, designed to
/// play in sequence.
///
/// This makes use of [`TrackEvent`]s to determine when the current
/// song or audio file has finished before playing the next entry.
///
/// One of these is automatically included via [`Driver::queue`] when
/// the `"builtin-queue"` feature is enabled.
///
/// `examples/serenity/voice_events_queue` demonstrates how a user might manage,
/// track and use this to run a song queue in many guilds in parallel.
/// This code is trivial to extend if extra functionality is needed.
///
/// # Example
///
/// ```rust,no_run
/// use songbird::{
/// driver::Driver,
/// id::GuildId,
/// input::File,
/// tracks::TrackQueue,
/// };
/// use std::collections::HashMap;
/// use std::num::NonZeroU64;
///
/// # async {
/// let guild = GuildId(NonZeroU64::new(1).unwrap());
/// // A Call is also valid here!
/// let mut driver: Driver = Default::default();
///
/// let mut queues: HashMap<GuildId, TrackQueue> = Default::default();
///
/// let source = File::new("../audio/my-favourite-song.mp3");
///
/// // We need to ensure that this guild has a TrackQueue created for it.
/// let queue = queues.entry(guild)
/// .or_default();
///
/// // Queueing a track is this easy!
/// queue.add_source(source.into(), &mut driver);
/// # };
/// ```
///
/// [`TrackEvent`]: crate::events::TrackEvent
/// [`Driver::queue`]: crate::driver::Driver
#[derive(Clone, Debug, Default)]
pub struct TrackQueue {
// NOTE: the choice of a parking lot mutex is quite deliberate
inner: Arc<Mutex<TrackQueueCore>>,
}
/// Reference to a track which is known to be part of a queue.
///
/// Instances *should not* be moved from one queue to another.
#[derive(Debug)]
pub struct Queued(TrackHandle);
impl Deref for Queued {
type Target = TrackHandle;
fn deref(&self) -> &Self::Target {
&self.0
}
}
impl Queued {
/// Clones the inner handle
#[must_use]
pub fn handle(&self) -> TrackHandle {
self.0.clone()
}
}
#[derive(Debug, Default)]
/// Inner portion of a [`TrackQueue`].
///
/// This abstracts away thread-safety from the user,
/// and offers a convenient location to store further state if required.
///
/// [`TrackQueue`]: TrackQueue
struct TrackQueueCore {
tracks: VecDeque<Queued>,
}
struct QueueHandler {
remote_lock: Arc<Mutex<TrackQueueCore>>,
}
#[async_trait]
impl EventHandler for QueueHandler {
async fn act(&self, ctx: &EventContext<'_>) -> Option<Event> {
let mut inner = self.remote_lock.lock();
// Due to possibility that users might remove, reorder,
// or dequeue+stop tracks, we need to verify that the FIRST
// track is the one who has ended.
match ctx {
EventContext::Track(ts) => {
// This slice should have exactly one entry.
// If the ended track has same id as the queue head, then
// we can progress the queue.
if inner.tracks.front()?.uuid() != ts.first()?.1.uuid() {
return None;
}
},
_ => return None,
}
let _old = inner.tracks.pop_front();
info!("Queued track ended: {:?}.", ctx);
info!("{} tracks remain.", inner.tracks.len());
// Keep going until we find one track which works, or we run out.
while let Some(new) = inner.tracks.front() {
if new.play().is_err() {
// Discard files which cannot be used for whatever reason.
warn!("Track in Queue couldn't be played...");
inner.tracks.pop_front();
} else {
break;
}
}
None
}
}
struct SongPreloader {
remote_lock: Arc<Mutex<TrackQueueCore>>,
}
#[async_trait]
impl EventHandler for SongPreloader {
async fn act(&self, _ctx: &EventContext<'_>) -> Option<Event> {
let inner = self.remote_lock.lock();
if let Some(track) = inner.tracks.get(1) {
// This is the sync-version so that we can fire and ignore
// the request ASAP.
drop(track.0.make_playable());
}
None
}
}
impl TrackQueue {
/// Create a new, empty, track queue.
#[must_use]
pub fn new() -> Self {
Self {
inner: Arc::new(Mutex::new(TrackQueueCore {
tracks: VecDeque::new(),
})),
}
}
/// Adds an audio source to the queue, to be played in the channel managed by `driver`.
///
/// This method will preload the next track 5 seconds before the current track ends, if
/// the [`AuxMetadata`] can be successfully queried for a [`Duration`].
///
/// [`AuxMetadata`]: crate::input::AuxMetadata
pub async fn add_source(&self, input: Input, driver: &mut Driver) -> TrackHandle {
self.add(input.into(), driver).await
}
/// Adds a [`Track`] object to the queue, to be played in the channel managed by `driver`.
///
/// This allows additional configuration or event handlers to be added
/// before enqueueing the audio track. [`Track`]s will be paused pre-emptively.
///
/// This method will preload the next track 5 seconds before the current track ends, if
/// the [`AuxMetadata`] can be successfully queried for a [`Duration`].
///
/// [`AuxMetadata`]: crate::input::AuxMetadata
pub async fn add(&self, mut track: Track, driver: &mut Driver) -> TrackHandle {
let preload_time = Self::get_preload_time(&mut track).await;
self.add_with_preload(track, driver, preload_time)
}
pub(crate) async fn get_preload_time(track: &mut Track) -> Option<Duration> {
let meta = match track.input {
Input::Lazy(ref mut rec) => rec.aux_metadata().await.ok(),
Input::Live(_, Some(ref mut rec)) => rec.aux_metadata().await.ok(),
Input::Live(_, None) => None,
};
meta.and_then(|meta| meta.duration)
.map(|d| d.saturating_sub(Duration::from_secs(5)))
}
/// Add an existing [`Track`] to the queue, using a known time to preload the next track.
///
/// `preload_time` can be specified to enable gapless playback: this is the
/// playback position *in this track* when the the driver will begin to load the next track.
/// The standard [`Self::add`] method use [`AuxMetadata`] to set this to 5 seconds before
/// a track ends.
///
/// A `None` value will not ready the next track until this track ends, disabling preload.
///
/// [`AuxMetadata`]: crate::input::AuxMetadata
#[inline]
pub fn add_with_preload(
&self,
mut track: Track,
driver: &mut Driver,
preload_time: Option<Duration>,
) -> TrackHandle {
// Attempts to start loading the next track before this one ends.
// Idea is to provide as close to gapless playback as possible,
// while minimising memory use.
info!("Track added to queue.");
let remote_lock = self.inner.clone();
track.events.add_event(
EventData::new(Event::Track(TrackEvent::End), QueueHandler { remote_lock }),
Duration::ZERO,
);
if let Some(time) = preload_time {
let remote_lock = self.inner.clone();
track.events.add_event(
EventData::new(Event::Delayed(time), SongPreloader { remote_lock }),
Duration::ZERO,
);
}
let (should_play, handle) = {
let mut inner = self.inner.lock();
let handle = driver.play(track.pause());
inner.tracks.push_back(Queued(handle.clone()));
(inner.tracks.len() == 1, handle)
};
if should_play {
drop(handle.play());
}
handle
}
/// Returns a handle to the currently playing track.
#[must_use]
pub fn current(&self) -> Option<TrackHandle> {
let inner = self.inner.lock();
inner.tracks.front().map(Queued::handle)
}
/// Attempts to remove a track from the specified index.
///
/// The returned entry can be readded to *this* queue via [`modify_queue`].
///
/// [`modify_queue`]: TrackQueue::modify_queue
#[must_use]
pub fn dequeue(&self, index: usize) -> Option<Queued> {
self.modify_queue(|vq| vq.remove(index))
}
/// Returns the number of tracks currently in the queue.
#[must_use]
pub fn len(&self) -> usize {
let inner = self.inner.lock();
inner.tracks.len()
}
/// Returns whether there are no tracks currently in the queue.
#[must_use]
pub fn is_empty(&self) -> bool {
let inner = self.inner.lock();
inner.tracks.is_empty()
}
/// Allows modification of the inner queue (i.e., deletion, reordering).
///
/// Users must be careful to `stop` removed tracks, so as to prevent
/// resource leaks.
pub fn modify_queue<F, O>(&self, func: F) -> O
where
F: FnOnce(&mut VecDeque<Queued>) -> O,
{
let mut inner = self.inner.lock();
func(&mut inner.tracks)
}
/// Pause the track at the head of the queue.
pub fn pause(&self) -> TrackResult<()> {
let inner = self.inner.lock();
if let Some(handle) = inner.tracks.front() {
handle.pause()
} else {
Ok(())
}
}
/// Resume the track at the head of the queue.
pub fn resume(&self) -> TrackResult<()> {
let inner = self.inner.lock();
if let Some(handle) = inner.tracks.front() {
handle.play()
} else {
Ok(())
}
}
/// Stop the currently playing track, and clears the queue.
pub fn stop(&self) {
let mut inner = self.inner.lock();
for track in inner.tracks.drain(..) {
// Errors when removing tracks don't really make
// a difference: an error just implies it's already gone.
drop(track.stop());
}
}
/// Skip to the next track in the queue, if it exists.
pub fn skip(&self) -> TrackResult<()> {
let inner = self.inner.lock();
inner.stop_current()
}
/// Returns a list of currently queued tracks.
///
/// Does not allow for modification of the queue, instead returns a snapshot of the queue at the time of calling.
///
/// Use [`modify_queue`] for direct modification of the queue.
///
/// [`modify_queue`]: TrackQueue::modify_queue
#[must_use]
pub fn current_queue(&self) -> Vec<TrackHandle> {
let inner = self.inner.lock();
inner.tracks.iter().map(Queued::handle).collect()
}
}
impl TrackQueueCore {
/// Skip to the next track in the queue, if it exists.
fn stop_current(&self) -> TrackResult<()> {
if let Some(handle) = self.tracks.front() {
handle.stop()
} else {
Ok(())
}
}
}
#[cfg(all(test, feature = "builtin-queue"))]
mod tests {
use crate::{
driver::Driver,
input::{File, HttpRequest},
tracks::PlayMode,
Config,
};
use reqwest::Client;
use std::time::Duration;
#[tokio::test]
#[ntest::timeout(20_000)]
async fn next_track_plays_on_end() {
let (t_handle, config) = Config::test_cfg(true);
let mut driver = Driver::new(config.clone());
let file1 = File::new("resources/ting.wav");
let file2 = file1.clone();
let h1 = driver.enqueue_input(file1.into()).await;
let h2 = driver.enqueue_input(file2.into()).await;
// Get h1 in place, playing. Wait for IO to ready.
// Fast wait here since it's all local I/O, no network.
t_handle
.ready_track(&h1, Some(Duration::from_millis(1)))
.await;
t_handle
.ready_track(&h2, Some(Duration::from_millis(1)))
.await;
// playout
t_handle.tick(1);
t_handle.wait(1);
let h1a = h1.get_info();
let h2a = h2.get_info();
// allow get_info to fire for h2.
t_handle.tick(2);
// post-conditions:
// 1) track 1 is done & dropped (commands fail).
// 2) track 2 is playing.
assert!(h1a.await.is_err());
assert_eq!(h2a.await.unwrap().playing, PlayMode::Play);
}
#[tokio::test]
#[ntest::timeout(10_000)]
async fn next_track_plays_on_skip() {
let (t_handle, config) = Config::test_cfg(true);
let mut driver = Driver::new(config.clone());
let file1 = File::new("resources/ting.wav");
let file2 = file1.clone();
let h1 = driver.enqueue_input(file1.into()).await;
let h2 = driver.enqueue_input(file2.into()).await;
// Get h1 in place, playing. Wait for IO to ready.
// Fast wait here since it's all local I/O, no network.
t_handle
.ready_track(&h1, Some(Duration::from_millis(1)))
.await;
assert!(driver.queue().skip().is_ok());
t_handle
.ready_track(&h2, Some(Duration::from_millis(1)))
.await;
// playout
t_handle.skip(1).await;
let h1a = h1.get_info();
let h2a = h2.get_info();
// allow get_info to fire for h2.
t_handle.tick(2);
// post-conditions:
// 1) track 1 is done & dropped (commands fail).
// 2) track 2 is playing.
assert!(h1a.await.is_err());
assert_eq!(h2a.await.unwrap().playing, PlayMode::Play);
}
#[tokio::test]
#[ntest::timeout(10_000)]
async fn next_track_plays_on_err() {
let (t_handle, config) = Config::test_cfg(true);
let mut driver = Driver::new(config.clone());
// File 1 is HTML with no valid audio -- this will fail to play.
let file1 = HttpRequest::new(
Client::new(),
"http://github.com/serenity-rs/songbird/".into(),
);
let file2 = File::new("resources/ting.wav");
let h1 = driver.enqueue_input(file1.into()).await;
let h2 = driver.enqueue_input(file2.into()).await;
// Get h1 in place, playing. Wait for IO to ready.
// Fast wait here since it's all local I/O, no network.
// t_handle
// .ready_track(&h1, Some(Duration::from_millis(1)))
// .await;
t_handle
.ready_track(&h2, Some(Duration::from_millis(1)))
.await;
// playout
t_handle.tick(1);
t_handle.wait(1);
let h1a = h1.get_info();
let h2a = h2.get_info();
// allow get_info to fire for h2.
t_handle.tick(2);
// post-conditions:
// 1) track 1 is done & dropped (commands fail).
// 2) track 2 is playing.
assert!(h1a.await.is_err());
assert_eq!(h2a.await.unwrap().playing, PlayMode::Play);
}
}