mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2024-11-25 13:01:07 +00:00
Code Issues Projects Releases Wiki Activity

mp4mux: Don't write gap edit lists if their duration would be zero

Browse source 
The track might start later than the earliest track by less than one
timescale units, in which case writing an empty gap edit list would be
useless and confusing.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1014>
This commit is contained in:
Sebastian Dröge 2022-12-15 18:45:19 +02:00
parent f8024f072f
commit ed429d570e
1 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
mux/mp4/src/mp4mux/boxes.rs
View file

@ -1646,24 +1646,30 @@ fn write_elst(
let min_earliest_pts = header.streams.iter().map(|s| s.earliest_pts).min().unwrap();
if min_earliest_pts != stream.earliest_pts {
// Entry count
v.extend(2u32.to_be_bytes());
// First entry for the gap
// Edit duration
let gap = (stream.earliest_pts - min_earliest_pts)
.nseconds()
.mul_div_round(timescale as u64, gst::ClockTime::SECOND.nseconds())
.context("too big gap")?;
v.extend(gap.to_be_bytes());
// Media time
v.extend((-1i64).to_be_bytes());
if gap > 0 {
// Entry count
v.extend(2u32.to_be_bytes());
// Media rate
v.extend(1u16.to_be_bytes());
v.extend(0u16.to_be_bytes());
// First entry for the gap
// Edit duration
v.extend(gap.to_be_bytes());
// Media time
v.extend((-1i64).to_be_bytes());
// Media rate
v.extend(1u16.to_be_bytes());
v.extend(0u16.to_be_bytes());
} else {
// Entry count
v.extend(1u32.to_be_bytes());
}
} else {
// Entry count
v.extend(1u32.to_be_bytes());