mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2024-11-22 03:21:00 +00:00
Code Issues Projects Releases Wiki Activity

uriplaylistbin: stop using an iterator to manage the playlist

Browse source 
Will make it easier to update the playlist while playing.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1492>
This commit is contained in:
Guillaume Desmottes 2024-02-14 14:50:16 +01:00
parent 42158cbcb0
commit 00b56ca845
1 changed files with 21 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
utils/uriplaylistbin/src/uriplaylistbin/imp.rs
View file

@ -121,63 +121,40 @@ struct ItemInner {
}
struct Playlist {
items: Box<dyn Iterator<Item = Item> + Send>,
uris: Vec<String>,
iterations: u32,
next_index: usize,
}
impl Playlist {
fn new(uris: Vec<String>, iterations: u32) -> Self {
Self {
items: Self::create_items(uris.clone(), iterations),
uris,
}
}
fn create_items(
uris: Vec<String>,
iterations: u32,
) -> Box<dyn Iterator<Item = Item> + Send + Sync> {
fn infinite_iter(uris: Vec<String>) -> Box<dyn Iterator<Item = Item> + Send + Sync> {
Box::new(
uris.into_iter()
.cycle()
.enumerate()
.map(|(index, uri)| Item::new(uri, index)),
)
}
fn finite_iter(
uris: Vec<String>,
iterations: u32,
) -> Box<dyn Iterator<Item = Item> + Send + Sync> {
let n = (iterations as usize)
.checked_mul(uris.len())
.unwrap_or(usize::MAX);
Box::new(
uris.into_iter()
.cycle()
.take(n)
.enumerate()
.map(|(index, uri)| Item::new(uri, index)),
)
}
if iterations == 0 {
infinite_iter(uris)
} else {
finite_iter(uris, iterations)
iterations,
next_index: 0,
}
}
fn next(&mut self) -> Option<Item> {
let item = match self.items.next() {
None => return None,
Some(item) => item,
};
let uris_len = self.uris.len();
let (iteration, uri_index) = (
(self.next_index / uris_len) as u32,
(self.next_index % uris_len),
);
if item.index() == usize::MAX {
if self.iterations != 0 && iteration >= self.iterations {
// playlist is done
return None;
}
let uri = self.uris[uri_index].clone();
let item = Item::new(uri, self.next_index);
self.next_index += 1;
if self.next_index == usize::MAX {
// prevent overflow with infinite playlist
self.items = Self::create_items(self.uris.clone(), 0);
self.next_index = 0;
}
Some(item)