aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2024-01-29 13:29:10 +0100
committermetamuffin <metamuffin@disroot.org>2024-01-29 13:29:10 +0100
commitba33c4019c2cc62f2a8c18c4b7354c3b52758b95 (patch)
tree0c7f75625298a14a17e27b9e7bb61d2826e44186
parent2676e755286d117b100d379fce84ec3da6d8ae98 (diff)
downloadjellything-ba33c4019c2cc62f2a8c18c4b7354c3b52758b95.tar
jellything-ba33c4019c2cc62f2a8c18c4b7354c3b52758b95.tar.bz2
jellything-ba33c4019c2cc62f2a8c18c4b7354c3b52758b95.tar.zst
forgot some renaming
-rw-r--r--remuxer/src/fragment.rs26
-rw-r--r--transcoder/src/fragment.rs4
2 files changed, 15 insertions, 15 deletions
diff --git a/remuxer/src/fragment.rs b/remuxer/src/fragment.rs
index 660e2d9..0460083 100644
--- a/remuxer/src/fragment.rs
+++ b/remuxer/src/fragment.rs
@@ -47,29 +47,29 @@ pub fn fragment_index(
};
let average_kf_interval = media_info.duration / n_kf as f64;
- let kf_per_snip = (FRAGMENT_LENGTH / average_kf_interval).ceil() as usize;
+ let kf_per_frag = (FRAGMENT_LENGTH / average_kf_interval).ceil() as usize;
debug!("average keyframe interval: {average_kf_interval}");
- debug!(" => keyframes per frag {kf_per_snip}");
+ debug!(" => keyframes per frag {kf_per_frag}");
- let n_snips = n_kf.div_ceil(kf_per_snip);
- Ok((0..n_snips)
+ let n_frags = n_kf.div_ceil(kf_per_frag);
+ Ok((0..n_frags)
.map(|i| {
let start = index.blocks[if force_kf {
- i * kf_per_snip
+ i * kf_per_frag
} else {
- index.keyframes[i * kf_per_snip]
+ index.keyframes[i * kf_per_frag]
}]
.pts as f64
/ 1000.;
let end = if force_kf {
- let n = (i + 1) * kf_per_snip;
+ let n = (i + 1) * kf_per_frag;
if n >= index.blocks.len() {
None
} else {
Some(n)
}
} else {
- index.keyframes.get((i + 1) * kf_per_snip).copied()
+ index.keyframes.get((i + 1) * kf_per_frag).copied()
}
.map(|i| index.blocks[i].pts as f64 / 1000.)
.unwrap_or(media_info.duration);
@@ -119,21 +119,21 @@ pub fn write_fragment_into(
};
let average_kf_interval = media_info.duration / n_kf as f64;
- let kf_per_snip = (FRAGMENT_LENGTH / average_kf_interval).ceil() as usize;
+ let kf_per_frag = (FRAGMENT_LENGTH / average_kf_interval).ceil() as usize;
debug!("average keyframe interval: {average_kf_interval}");
- debug!(" => keyframes per frag {kf_per_snip}");
+ debug!(" => keyframes per frag {kf_per_frag}");
let (start_block_index, end_block_index) = if force_kf {
- (n * kf_per_snip, (n + 1) * kf_per_snip)
+ (n * kf_per_frag, (n + 1) * kf_per_frag)
} else {
(
*index
.keyframes
- .get(n * kf_per_snip)
+ .get(n * kf_per_frag)
.ok_or(anyhow!("fragment index out of range"))?,
*index
.keyframes
- .get((n + 1) * kf_per_snip)
+ .get((n + 1) * kf_per_frag)
.unwrap_or(&index.blocks.len()),
)
};
diff --git a/transcoder/src/fragment.rs b/transcoder/src/fragment.rs
index 90512c4..7695a48 100644
--- a/transcoder/src/fragment.rs
+++ b/transcoder/src/fragment.rs
@@ -23,10 +23,10 @@ pub async fn transcode(
input: impl FnOnce(ChildStdin),
) -> anyhow::Result<CachePath> {
Ok(async_cache_file(
- &["snip-tc", key, &format!("{enc:?}")],
+ &["frag-tc", key, &format!("{enc:?}")],
move |mut output| async move {
let _permit = LOCAL_VIDEO_TRANSCODING_TASKS.acquire().await?;
- debug!("transcoding snippet with {enc:?}");
+ debug!("transcoding fragment with {enc:?}");
let mut args = Vec::new();
match enc {