aboutsummaryrefslogtreecommitdiff
path: root/stream
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2024-01-29 15:03:18 +0100
committermetamuffin <metamuffin@disroot.org>2024-01-29 15:03:18 +0100
commitc0ba30314a06de10c9b98ac130676dcbc9f287fa (patch)
treee35631ed3181f89ae962e9125cc5073f12967924 /stream
parent4ad7aa6042c64a6e7cfbe2693a4bbeda0514357b (diff)
downloadjellything-c0ba30314a06de10c9b98ac130676dcbc9f287fa.tar
jellything-c0ba30314a06de10c9b98ac130676dcbc9f287fa.tar.bz2
jellything-c0ba30314a06de10c9b98ac130676dcbc9f287fa.tar.zst
rename stream spec param
Diffstat (limited to 'stream')
-rw-r--r--stream/src/fragment.rs4
-rw-r--r--stream/src/hls.rs4
-rw-r--r--stream/src/jhls.rs2
-rw-r--r--stream/src/lib.rs8
-rw-r--r--stream/src/webvtt.rs2
5 files changed, 10 insertions, 10 deletions
diff --git a/stream/src/fragment.rs b/stream/src/fragment.rs
index f08114c..16bb703 100644
--- a/stream/src/fragment.rs
+++ b/stream/src/fragment.rs
@@ -22,10 +22,10 @@ pub async fn fragment_stream(
mut b: DuplexStream,
perms: &PermissionSet,
) -> Result<()> {
- if spec.tracks.len() != 1 {
+ if spec.track.len() != 1 {
bail!("unsupported number of tracks for segment, must be exactly one");
}
- let track = spec.tracks[0];
+ let track = spec.track[0];
let n = spec.index.ok_or(anyhow!("segment index missing"))?;
let local_track = local_tracks
diff --git a/stream/src/hls.rs b/stream/src/hls.rs
index 74f554b..b0e2e31 100644
--- a/stream/src/hls.rs
+++ b/stream/src/hls.rs
@@ -31,7 +31,7 @@ pub async fn hls_master_stream(
let uri = format!(
"stream?{}",
StreamSpec {
- tracks: vec![i],
+ track: vec![i],
format: StreamFormat::HlsVariant,
..Default::default()
}
@@ -56,7 +56,7 @@ pub async fn hls_variant_stream(
mut b: DuplexStream,
) -> Result<()> {
let local_track = local_tracks.get(0).ok_or(anyhow!("no track"))?.to_owned();
- let track_index = spec.tracks[0];
+ let track_index = spec.track[0];
let media_info = node.public.media.to_owned().ok_or(anyhow!("no media?"))?;
let frags = spawn_blocking(move || {
jellyremuxer::fragment::fragment_index(
diff --git a/stream/src/jhls.rs b/stream/src/jhls.rs
index 1313c7a..ac1a3e5 100644
--- a/stream/src/jhls.rs
+++ b/stream/src/jhls.rs
@@ -30,7 +30,7 @@ pub async fn jhls_index(
&CONF.media_path,
&node.public,
&local_track,
- spec.tracks[0],
+ spec.track[0],
)
})
.await??;
diff --git a/stream/src/lib.rs b/stream/src/lib.rs
index 4d96f8c..b62bf1c 100644
--- a/stream/src/lib.rs
+++ b/stream/src/lib.rs
@@ -64,7 +64,7 @@ pub async fn stream(
.ok_or(anyhow!("node has no media"))?;
let local_tracks = spec
- .tracks
+ .track
.iter()
.map(|i| {
anyhow::Ok(
@@ -111,7 +111,7 @@ async fn remux_stream(
CONF.media_path.to_owned(),
node.public,
local_tracks,
- spec.tracks,
+ spec.track,
spec.webm.unwrap_or(false),
)
});
@@ -125,11 +125,11 @@ async fn original_stream(
range: Range<usize>,
b: DuplexStream,
) -> Result<()> {
- if spec.tracks.len() != 1 {
+ if spec.track.len() != 1 {
bail!("invalid amout of source \"tracks\". original only allows for exactly one.")
}
- let source = local_tracks[spec.tracks[0]].clone();
+ let source = local_tracks[spec.track[0]].clone();
let mut file = File::open(CONF.media_path.join(source.path))
.await
.context("opening source")?;
diff --git a/stream/src/webvtt.rs b/stream/src/webvtt.rs
index ec26398..e9d03bf 100644
--- a/stream/src/webvtt.rs
+++ b/stream/src/webvtt.rs
@@ -21,7 +21,7 @@ pub async fn vtt_stream(
// TODO should use fragments too? big films take too long...
- let tracki = *spec.tracks.get(0).ok_or(anyhow!("no track selected"))?;
+ let tracki = *spec.track.get(0).ok_or(anyhow!("no track selected"))?;
let local_track = local_tracks.get(0).ok_or(anyhow!("no tracks"))?.clone();
let track = &node.public.media.unwrap().tracks[tracki];
let cp = local_track.codec_private.clone();