diff options
| author | metamuffin <metamuffin@disroot.org> | 2023-12-22 09:02:46 +0100 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2023-12-22 09:02:46 +0100 |
| commit | b92983fb0cab2a284301b930d2b15ec0109dd93e (patch) | |
| tree | f7fb1b900b3fa5ced46de392a47756c3ca5cc398 /remuxer/src | |
| parent | 9a52852f736692e5319da49478e16bfba30fbd39 (diff) | |
| parent | 826c61c9612e855b19c3adb0e93d80bbfb4dc903 (diff) | |
| download | jellything-b92983fb0cab2a284301b930d2b15ec0109dd93e.tar jellything-b92983fb0cab2a284301b930d2b15ec0109dd93e.tar.bz2 jellything-b92983fb0cab2a284301b930d2b15ec0109dd93e.tar.zst | |
Merge branch 'master' of codeberg.org:metamuffin/jellything
Diffstat (limited to 'remuxer/src')
| -rw-r--r-- | remuxer/src/import/mod.rs | 1 | ||||
| -rw-r--r-- | remuxer/src/remux.rs | 2 | ||||
| -rw-r--r-- | remuxer/src/snippet.rs | 5 |
3 files changed, 6 insertions, 2 deletions
diff --git a/remuxer/src/import/mod.rs b/remuxer/src/import/mod.rs index cf37b78..92e601e 100644 --- a/remuxer/src/import/mod.rs +++ b/remuxer/src/import/mod.rs @@ -325,6 +325,7 @@ fn import_read_segment(segment: &mut Unflatten) -> Result<MatroskaMetadata> { _ => bail!("invalid track type"), }; m.tracks.push(SourceTrack { + federated: vec![], default_duration, name: name.unwrap_or_else(|| "unnamed".to_string()), codec: codec.unwrap(), diff --git a/remuxer/src/remux.rs b/remuxer/src/remux.rs index 0e7877d..b705572 100644 --- a/remuxer/src/remux.rs +++ b/remuxer/src/remux.rs @@ -108,7 +108,7 @@ pub fn remux_stream_into( output.write_tag(&MatroskaTag::Info(Master::Collected(vec![ MatroskaTag::TimestampScale(1_000_000), MatroskaTag::Duration(item.media.unwrap().duration * 1000.0), - MatroskaTag::Title(item.title.clone()), + MatroskaTag::Title(item.title.unwrap_or_default().clone()), MatroskaTag::MuxingApp("jellyremux".to_string()), MatroskaTag::WritingApp("jellything".to_string()), ])))?; diff --git a/remuxer/src/snippet.rs b/remuxer/src/snippet.rs index afda1f3..cd45f8b 100644 --- a/remuxer/src/snippet.rs +++ b/remuxer/src/snippet.rs @@ -110,7 +110,10 @@ pub fn write_snippet_into( output.write_tag(&ebml_header(webm))?; output.write_tag(&MatroskaTag::Segment(Master::Start))?; output.write_tag(&ebml_segment_info( - format!("{} (track {track}; snippet {n})", item.title), + format!( + "{} (track {track}; snippet {n})", + item.title.clone().unwrap_or_default() + ), (last_block.pts - start_block.pts) as f64 / 1000., ))?; output.write_tag(&MatroskaTag::Tags(Master::Collected(vec![])))?; |