diff options
Diffstat (limited to 'common/src/stream.rs')
| -rw-r--r-- | common/src/stream.rs | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/common/src/stream.rs b/common/src/stream.rs index af19062..e6fe767 100644 --- a/common/src/stream.rs +++ b/common/src/stream.rs @@ -26,7 +26,8 @@ pub struct StreamSpec { pub enum StreamFormat { #[cfg_attr(feature = "rocket", field(value = "original"))] Original, #[cfg_attr(feature = "rocket", field(value = "matroska"))] Matroska, - #[cfg_attr(feature = "rocket", field(value = "hls"))] Hls, + #[cfg_attr(feature = "rocket", field(value = "hlsmaster"))] HlsMaster, + #[cfg_attr(feature = "rocket", field(value = "hlsvariant"))] HlsVariant, #[cfg_attr(feature = "rocket", field(value = "jhls"))] Jhls, #[cfg_attr(feature = "rocket", field(value = "hlsseg"))] Segment, } @@ -49,10 +50,10 @@ impl StreamSpec { pub fn to_query(&self) -> String { use std::fmt::Write; let mut u = String::new(); - writeln!(u, "format={}", self.format.ident()).unwrap(); + write!(u, "format={}", self.format.ident()).unwrap(); if !self.tracks.is_empty() { - writeln!( + write!( u, "&tracks={}", self.tracks @@ -64,19 +65,19 @@ impl StreamSpec { .unwrap(); } if let Some(abr) = self.abr { - writeln!(u, "&abr={abr}").unwrap(); + write!(u, "&abr={abr}").unwrap(); } if let Some(vbr) = self.vbr { - writeln!(u, "&vbr={vbr}").unwrap(); + write!(u, "&vbr={vbr}").unwrap(); } if let Some(index) = self.index { - writeln!(u, "&index={index}").unwrap(); + write!(u, "&index={index}").unwrap(); } if let Some(webm) = self.webm { - writeln!(u, "&webm={webm}").unwrap(); + write!(u, "&webm={webm}").unwrap(); } if let Some(width) = self.width { - writeln!(u, "&width={width}").unwrap(); + write!(u, "&width={width}").unwrap(); } u } @@ -87,7 +88,8 @@ impl StreamFormat { match self { StreamFormat::Original => "original", StreamFormat::Matroska => "matroska", - StreamFormat::Hls => "hls", + StreamFormat::HlsMaster => "hlsmaster", + StreamFormat::HlsVariant => "hlsvariant", StreamFormat::Jhls => "jhls", StreamFormat::Segment => "hlsseg", } |