From 335ba978dbaf203f3603a815147fd75dbf205723 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Sun, 27 Apr 2025 20:00:44 +0200 Subject: move cache to own crate --- stream/src/stream_info.rs | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'stream/src/stream_info.rs') diff --git a/stream/src/stream_info.rs b/stream/src/stream_info.rs index ba6cc98..6f7824e 100644 --- a/stream/src/stream_info.rs +++ b/stream/src/stream_info.rs @@ -3,15 +3,11 @@ which is licensed under the GNU Affero General Public License (version 3); see /COPYING. Copyright (C) 2025 metamuffin */ -use crate::SMediaInfo; +use crate::{SMediaInfo, CONF}; use anyhow::Result; use ebml_struct::matroska::TrackEntry; -use jellybase::{ - common::stream::{ - StreamContainer, StreamFormatInfo, StreamInfo, StreamSegmentInfo, StreamTrackInfo, - TrackKind, - }, - CONF, +use jellycommon::stream::{ + StreamContainer, StreamFormatInfo, StreamInfo, StreamSegmentInfo, StreamTrackInfo, TrackKind, }; use jellyremuxer::{ metadata::{matroska_metadata, MatroskaMetadata}, @@ -119,11 +115,11 @@ fn stream_formats(t: &TrackEntry, remux_bitrate: f64) -> Vec { // most codecs use chroma subsampling that requires even dims let h = ((w * sh) / sw) & !1; // clear last bit to ensure even height. for (cid, enable) in [ - ("V_AV1", CONF.transcoder.offer_av1), - ("V_VP8", CONF.transcoder.offer_vp8), - ("V_VP9", CONF.transcoder.offer_vp9), - ("V_MPEG4/ISO/AVC", CONF.transcoder.offer_avc), - ("V_MPEGH/ISO/HEVC", CONF.transcoder.offer_hevc), + ("V_AV1", CONF.offer_av1), + ("V_VP8", CONF.offer_vp8), + ("V_VP9", CONF.offer_vp9), + ("V_MPEG4/ISO/AVC", CONF.offer_avc), + ("V_MPEGH/ISO/HEVC", CONF.offer_hevc), ] { if enable { formats.push(StreamFormatInfo { -- cgit v1.2.3-70-g09d2