things

1 files changed, 7 insertions, 31 deletions

diff --git a/stream/src/lib.rs b/stream/src/lib.rs
index 18ad2a7..4df87ae 100644
--- a/stream/src/lib.rs
+++ b/stream/src/lib.rs
@@ -10,10 +10,10 @@ pub mod hls;
 pub mod stream_info;
 pub mod webvtt;
 
-use anyhow::{anyhow, Context, Result};
+use anyhow::{anyhow, bail, Context, Result};
 use fragment::fragment_stream;
 use fragment_index::fragment_index_stream;
-use hls::{hls_master_stream, hls_variant_stream};
+use hls::{hls_multivariant_stream, hls_supermultivariant_stream, hls_variant_stream};
 use jellybase::common::{
     stream::{StreamContainer, StreamSpec},
     Node,
@@ -24,7 +24,6 @@ use tokio::{
     fs::File,
     io::{duplex, AsyncReadExt, AsyncSeekExt, AsyncWriteExt, DuplexStream},
 };
-use tokio_util::io::SyncIoBridge;
 
 #[derive(Debug)]
 pub struct SMediaInfo {
@@ -71,13 +70,12 @@ pub async fn stream(
     let (a, b) = duplex(4096);
 
     match spec {
-        StreamSpec::Whep { track, seek } => todo!(),
-        StreamSpec::WhepControl { token } => todo!(),
-        StreamSpec::Remux { tracks, container } => todo!(),
         StreamSpec::Original { track } => original_stream(info, track, range, b).await?,
-        StreamSpec::HlsSuperMultiVariant { container } => todo!(),
+        StreamSpec::HlsSuperMultiVariant { container } => {
+            hls_supermultivariant_stream(b, info, container).await?;
+        }
         StreamSpec::HlsMultiVariant { segment, container } => {
-            hls_master_stream(b, info, segment, container).await?
+            hls_multivariant_stream(b, info, segment, container).await?
         }
         StreamSpec::HlsVariant {
             segment,
@@ -96,34 +94,12 @@ pub async fn stream(
             container,
             format,
         } => fragment_stream(b, info, track, segment, index, format, container).await?,
+        _ => bail!("todo"),
     }
 
     Ok(a)
 }
 
-async fn remux_stream(
-    node: Arc<Node>,
-    spec: StreamSpec,
-    range: Range<usize>,
-    b: DuplexStream,
-) -> Result<()> {
-    let b = SyncIoBridge::new(b);
-
-    // tokio::task::spawn_blocking(move || {
-    //     jellyremuxer::remux_stream_into(
-    //         b,
-    //         range,
-    //         CONF.media_path.to_owned(),
-    //         &node,
-    //         local_tracks,
-    //         spec.track,
-    //         spec.webm.unwrap_or(false),
-    //     )
-    // });
-
-    Ok(())
-}
-
 async fn original_stream(
     info: Arc<SMediaInfo>,
     track: usize,