From e99bde7a00a161ff5dd91eaf1ce546a9d98cef05 Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Fri, 12 Sep 2025 13:54:04 +0200
Subject: move stream types to own crate; removes a common dep

---
 transcoder/Cargo.toml       | 2 +-
 transcoder/src/fragment.rs  | 2 +-
 transcoder/src/subtitles.rs | 9 ++++++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'transcoder')

diff --git a/transcoder/Cargo.toml b/transcoder/Cargo.toml
index f35b101..06dc1aa 100644
--- a/transcoder/Cargo.toml
+++ b/transcoder/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 jellyremuxer = { path = "../remuxer" }
 jellycache = { path = "../cache" }
-jellycommon = { path = "../common" }
+jellystream-types = { path = "../stream/types" }
 log = { workspace = true }
 # TODO: change this back to crates.io when pr is merged
 image = "0.25.5"
diff --git a/transcoder/src/fragment.rs b/transcoder/src/fragment.rs
index dbb8f6d..a71094d 100644
--- a/transcoder/src/fragment.rs
+++ b/transcoder/src/fragment.rs
@@ -6,8 +6,8 @@
 use crate::{Config, CONF, LOCAL_VIDEO_TRANSCODING_TASKS};
 use anyhow::Result;
 use jellycache::{async_cache_file, CachePath};
-use jellycommon::stream::{StreamFormatInfo, TrackKind};
 use jellyremuxer::metadata::MatroskaTrackEntry;
+use jellystream_types::{StreamFormatInfo, TrackKind};
 use log::info;
 use std::fmt::Write;
 use std::process::Stdio;
diff --git a/transcoder/src/subtitles.rs b/transcoder/src/subtitles.rs
index d7e7b29..1325b62 100644
--- a/transcoder/src/subtitles.rs
+++ b/transcoder/src/subtitles.rs
@@ -4,9 +4,16 @@
     Copyright (C) 2025 metamuffin <metamuffin.org>
 */
 use anyhow::{anyhow, bail, Context};
-use jellycommon::jhls::SubtitleCue;
+use serde::{Deserialize, Serialize};
 use std::fmt::Write;
 
+#[derive(Debug, Serialize, Deserialize)]
+pub struct SubtitleCue {
+    pub start: f64,
+    pub end: f64,
+    pub content: String,
+}
+
 pub fn parse_subtitles(
     codec: &str,
     codec_private: Option<Vec<u8>>,
-- 
cgit v1.2.3-70-g09d2