aboutsummaryrefslogtreecommitdiff
path: root/transcoder/src/fragment.rs
diff options
context:
space:
mode:
Diffstat (limited to 'transcoder/src/fragment.rs')
-rw-r--r--transcoder/src/fragment.rs16
1 files changed, 5 insertions, 11 deletions
diff --git a/transcoder/src/fragment.rs b/transcoder/src/fragment.rs
index 027e80f..dbb8f6d 100644
--- a/transcoder/src/fragment.rs
+++ b/transcoder/src/fragment.rs
@@ -3,16 +3,10 @@
which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
Copyright (C) 2025 metamuffin <metamuffin.org>
*/
-use crate::LOCAL_VIDEO_TRANSCODING_TASKS;
+use crate::{Config, CONF, LOCAL_VIDEO_TRANSCODING_TASKS};
use anyhow::Result;
-use jellybase::{
- cache::{async_cache_file, CachePath},
- common::{
- config::TranscoderConfig,
- stream::{StreamFormatInfo, TrackKind},
- },
- CONF,
-};
+use jellycache::{async_cache_file, CachePath};
+use jellycommon::stream::{StreamFormatInfo, TrackKind};
use jellyremuxer::metadata::MatroskaTrackEntry;
use log::info;
use std::fmt::Write;
@@ -32,7 +26,7 @@ pub async fn transcode(
input_key: &str,
input: impl FnOnce(ChildStdin),
) -> anyhow::Result<CachePath> {
- let command = transcode_command(kind, orig_metadata, format, &CONF.transcoder).unwrap();
+ let command = transcode_command(kind, orig_metadata, format, &*CONF).unwrap();
async_cache_file("frag-tc", (input_key, &command), async |mut output| {
let _permit = LOCAL_VIDEO_TRANSCODING_TASKS.acquire().await?;
info!("encoding with {command:?}");
@@ -60,7 +54,7 @@ fn transcode_command(
kind: TrackKind,
orig_metadata: &MatroskaTrackEntry,
format: &StreamFormatInfo,
- config: &TranscoderConfig,
+ config: &Config,
) -> Result<String> {
let br = format.bitrate as u64;
let w = format.width.unwrap_or(0);