diff options
| author | metamuffin <metamuffin@disroot.org> | 2026-03-05 15:04:47 +0100 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2026-03-05 15:04:47 +0100 |
| commit | 3fd3df27b1611867d8a2a224a7849bd4505406fa (patch) | |
| tree | 26669ddc088c8c2d1b9ea1fcdab12c708fb3a248 /stream/src | |
| parent | bc5f0f8ee3532f078674758212b222e009846e3a (diff) | |
| download | jellything-3fd3df27b1611867d8a2a224a7849bd4505406fa.tar jellything-3fd3df27b1611867d8a2a224a7849bd4505406fa.tar.bz2 jellything-3fd3df27b1611867d8a2a224a7849bd4505406fa.tar.zst | |
rename mpeg4 mp4
Diffstat (limited to 'stream/src')
| -rw-r--r-- | stream/src/dash.rs | 4 | ||||
| -rw-r--r-- | stream/src/fragment.rs | 2 | ||||
| -rw-r--r-- | stream/src/hls.rs | 2 | ||||
| -rw-r--r-- | stream/src/stream_info.rs | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/stream/src/dash.rs b/stream/src/dash.rs index b9b9b3a..53db3c4 100644 --- a/stream/src/dash.rs +++ b/stream/src/dash.rs @@ -147,8 +147,8 @@ pub fn dash(sinfo: &SMediaInfo) -> Result<Box<dyn Read + Send + Sync>> { fn choose_container(format: &StreamFormatInfo) -> StreamContainer { if format.containers.contains(&StreamContainer::WebM) { StreamContainer::WebM - } else if format.containers.contains(&StreamContainer::MPEG4) { - StreamContainer::MPEG4 + } else if format.containers.contains(&StreamContainer::MP4) { + StreamContainer::MP4 } else { StreamContainer::Matroska } diff --git a/stream/src/fragment.rs b/stream/src/fragment.rs index 57561b2..ff50cf3 100644 --- a/stream/src/fragment.rs +++ b/stream/src/fragment.rs @@ -220,7 +220,7 @@ fn map_container(container: StreamContainer) -> ContainerFormat { StreamContainer::WebM => ContainerFormat::Webm, StreamContainer::Matroska => ContainerFormat::Matroska, StreamContainer::WebVTT => todo!(), - StreamContainer::MPEG4 => ContainerFormat::MP4, + StreamContainer::MP4 => ContainerFormat::MP4, StreamContainer::JVTT => todo!(), } } diff --git a/stream/src/hls.rs b/stream/src/hls.rs index 571d2b3..70a0d3c 100644 --- a/stream/src/hls.rs +++ b/stream/src/hls.rs @@ -70,7 +70,7 @@ pub fn hls_variant_stream( StreamSpec::Fragment { track, index, - container: StreamContainer::MPEG4, + container: StreamContainer::MP4, format, } .to_query() diff --git a/stream/src/stream_info.rs b/stream/src/stream_info.rs index adebda8..c1f09ce 100644 --- a/stream/src/stream_info.rs +++ b/stream/src/stream_info.rs @@ -184,7 +184,7 @@ fn containers_by_codec(codec: &str) -> Vec<StreamContainer> { use StreamContainer::*; match codec { "V_VP8" | "V_VP9" | "V_AV1" | "A_OPUS" | "A_VORBIS" => vec![Matroska, WebM], - "V_MPEG4/ISO/AVC" | "V_MPEGH/ISO/HEVC" | "A_AAC" => vec![Matroska, MPEG4], + "V_MPEG4/ISO/AVC" | "V_MPEGH/ISO/HEVC" | "A_AAC" => vec![Matroska, MP4], "S_TEXT/UTF8" | "S_TEXT/WEBVTT" => vec![Matroska, WebVTT, WebM, JVTT], _ => vec![Matroska], } |