diff options
Diffstat (limited to 'remuxer/src')
| -rw-r--r-- | remuxer/src/fragment.rs (renamed from remuxer/src/snippet.rs) | 22 | ||||
| -rw-r--r-- | remuxer/src/lib.rs | 4 |
2 files changed, 13 insertions, 13 deletions
diff --git a/remuxer/src/snippet.rs b/remuxer/src/fragment.rs index 1378e70..660e2d9 100644 --- a/remuxer/src/snippet.rs +++ b/remuxer/src/fragment.rs @@ -19,9 +19,9 @@ use std::{ path::Path, }; -const SNIPPET_LENGTH: f64 = 2.; +const FRAGMENT_LENGTH: f64 = 2.; -pub fn snippet_index( +pub fn fragment_index( path_base: &Path, item: &NodePublic, local_track: &LocalTrack, @@ -47,9 +47,9 @@ pub fn snippet_index( }; let average_kf_interval = media_info.duration / n_kf as f64; - let kf_per_snip = (SNIPPET_LENGTH / average_kf_interval).ceil() as usize; + let kf_per_snip = (FRAGMENT_LENGTH / average_kf_interval).ceil() as usize; debug!("average keyframe interval: {average_kf_interval}"); - debug!(" => keyframes per snippet {kf_per_snip}"); + debug!(" => keyframes per frag {kf_per_snip}"); let n_snips = n_kf.div_ceil(kf_per_snip); Ok((0..n_snips) @@ -78,7 +78,7 @@ pub fn snippet_index( .collect()) } -pub fn write_snippet_into( +pub fn write_fragment_into( writer: impl Write, path_base: &Path, item: &NodePublic, @@ -87,7 +87,7 @@ pub fn write_snippet_into( webm: bool, n: usize, ) -> anyhow::Result<()> { - info!("writing snippet {n} of {:?} (track {track})", item.title); + info!("writing fragment {n} of {:?} (track {track})", item.title); let mut output = EbmlWriter::new(BufWriter::new(writer), 0); let media_info = item.media.as_ref().unwrap(); let info = media_info @@ -119,9 +119,9 @@ pub fn write_snippet_into( }; let average_kf_interval = media_info.duration / n_kf as f64; - let kf_per_snip = (SNIPPET_LENGTH / average_kf_interval).ceil() as usize; + let kf_per_snip = (FRAGMENT_LENGTH / average_kf_interval).ceil() as usize; debug!("average keyframe interval: {average_kf_interval}"); - debug!(" => keyframes per snippet {kf_per_snip}"); + debug!(" => keyframes per frag {kf_per_snip}"); let (start_block_index, end_block_index) = if force_kf { (n * kf_per_snip, (n + 1) * kf_per_snip) @@ -130,7 +130,7 @@ pub fn write_snippet_into( *index .keyframes .get(n * kf_per_snip) - .ok_or(anyhow!("snippet index out of range"))?, + .ok_or(anyhow!("fragment index out of range"))?, *index .keyframes .get((n + 1) * kf_per_snip) @@ -152,7 +152,7 @@ pub fn write_snippet_into( output.write_tag(&MatroskaTag::Segment(Master::Start))?; output.write_tag(&ebml_segment_info( format!( - "{} (track {track}; snippet {n})", + "{} (track {track}; frag {n})", item.title.clone().unwrap_or_default() ), (last_block_pts - start_block.pts) as f64 / 1000., @@ -165,7 +165,7 @@ pub fn write_snippet_into( let mut reader = SegmentExtractIter::new(&mut reader, local_track.track as u64); { - // TODO this one caused snippets to get dropped by MSE for no reason + // TODO this one caused fragments to get dropped by MSE for no reason // for i in start_block_index..end_block_index { // let index_block = &index.blocks[i]; // let mut block = reader.next()?; diff --git a/remuxer/src/lib.rs b/remuxer/src/lib.rs index b49dedc..49af2e7 100644 --- a/remuxer/src/lib.rs +++ b/remuxer/src/lib.rs @@ -8,11 +8,11 @@ pub mod import; pub mod remux; pub mod seek_index; pub mod segment_extractor; -pub mod snippet; +pub mod fragment; pub mod trim_writer; pub use remux::remux_stream_into; -pub use snippet::write_snippet_into; +pub use fragment::write_fragment_into; use jellycommon::{SourceTrack, SourceTrackKind}; use jellymatroska::{Master, MatroskaTag}; |