diff options
| author | metamuffin <metamuffin@disroot.org> | 2025-04-30 11:24:14 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2025-04-30 11:24:14 +0200 |
| commit | d6a039a10ac3c81d410beb9b648d29524ca1e278 (patch) | |
| tree | fa521277e3ea94f796e21071f4d2b372c5b9830c /stream | |
| parent | a2ef3f6ec4c830611fde1a2e935588ccbbc61c03 (diff) | |
| download | jellything-d6a039a10ac3c81d410beb9b648d29524ca1e278.tar jellything-d6a039a10ac3c81d410beb9b648d29524ca1e278.tar.bz2 jellything-d6a039a10ac3c81d410beb9b648d29524ca1e278.tar.zst | |
smaller fixes and remove useless deps
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/Cargo.toml | 2 | ||||
| -rw-r--r-- | stream/src/stream_info.rs | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/stream/Cargo.toml b/stream/Cargo.toml index ad6f098..33741d7 100644 --- a/stream/Cargo.toml +++ b/stream/Cargo.toml @@ -8,8 +8,6 @@ jellycommon = { path = "../common" } jellycache = { path = "../cache" } jellytranscoder = { path = "../transcoder" } jellyremuxer = { path = "../remuxer" } -jellymatroska = { path = "../matroska" } -ebml-struct = { git = "https://codeberg.org/metamuffin/ebml-struct" } log = { workspace = true } anyhow = { workspace = true } diff --git a/stream/src/stream_info.rs b/stream/src/stream_info.rs index 6f7824e..920ce69 100644 --- a/stream/src/stream_info.rs +++ b/stream/src/stream_info.rs @@ -5,12 +5,11 @@ */ use crate::{SMediaInfo, CONF}; use anyhow::Result; -use ebml_struct::matroska::TrackEntry; use jellycommon::stream::{ StreamContainer, StreamFormatInfo, StreamInfo, StreamSegmentInfo, StreamTrackInfo, TrackKind, }; use jellyremuxer::{ - metadata::{matroska_metadata, MatroskaMetadata}, + metadata::{matroska_metadata, MatroskaMetadata, MatroskaTrackEntry}, seek_index::get_track_sizes, }; use std::{collections::BTreeMap, path::PathBuf, sync::Arc}; @@ -83,7 +82,7 @@ pub(crate) async fn stream_info(info: Arc<SMediaInfo>) -> Result<(InternalStream )) } -fn stream_formats(t: &TrackEntry, remux_bitrate: f64) -> Vec<StreamFormatInfo> { +fn stream_formats(t: &MatroskaTrackEntry, remux_bitrate: f64) -> Vec<StreamFormatInfo> { let mut formats = Vec::new(); formats.push(StreamFormatInfo { codec: t.codec_id.to_string(), |