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-12-22 18:16:28 +00:00
Code Issues Projects Releases Wiki Activity

fmp4mux: Use saturing_sub() in more places

Browse source 
On unclean input, PTS/DTS might go backwards a bit and in those cases
calculate a duration of 0 instead of panicking.
This commit is contained in:
Sebastian Dröge 2022-05-19 13:26:34 +03:00
parent 6bca5a9962
commit d6fa921822
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
generic/fmp4/src/fmp4mux/imp.rs
View file

@ -414,7 +414,7 @@ impl FMP4Mux {
CAT, CAT,
obj: &stream.sinkpad, obj: &stream.sinkpad,
"Queued full GOPs duration updated to {}", "Queued full GOPs duration updated to {}",
prev_gop.end_pts - first_gop.earliest_pts, prev_gop.end_pts.saturating_sub(first_gop.earliest_pts),
); );
} }
@ -423,7 +423,7 @@ impl FMP4Mux {
obj: &stream.sinkpad, obj: &stream.sinkpad,
"Queued duration updated to {}", "Queued duration updated to {}",
Option::zip(stream.queued_gops.front(), stream.queued_gops.back()) Option::zip(stream.queued_gops.front(), stream.queued_gops.back())
.map(|(end, start)| end.end_pts - start.start_pts) .map(|(end, start)| end.end_pts.saturating_sub(start.start_pts))
.unwrap_or(gst::ClockTime::ZERO) .unwrap_or(gst::ClockTime::ZERO)
); );
@ -589,7 +589,7 @@ impl FMP4Mux {
CAT, CAT,
obj: &stream.sinkpad, obj: &stream.sinkpad,
"Draining {} worth of buffers starting at PTS {} DTS {}, DTS offset {}", "Draining {} worth of buffers starting at PTS {} DTS {}, DTS offset {}",
end_pts - earliest_pts, end_pts.saturating_sub(earliest_pts),
earliest_pts, earliest_pts,
start_dts.display(), start_dts.display(),
dts_offset.display(), dts_offset.display(),
@ -603,7 +603,7 @@ impl FMP4Mux {
CAT, CAT,
obj: &stream.sinkpad, obj: &stream.sinkpad,
"Queued full GOPs duration updated to {}", "Queued full GOPs duration updated to {}",
prev_gop.end_pts - first_gop.earliest_pts, prev_gop.end_pts.saturating_sub(first_gop.earliest_pts),
); );
} }
@ -612,7 +612,7 @@ impl FMP4Mux {
obj: &stream.sinkpad, obj: &stream.sinkpad,
"Queued duration updated to {}", "Queued duration updated to {}",
Option::zip(stream.queued_gops.front(), stream.queued_gops.back()) Option::zip(stream.queued_gops.front(), stream.queued_gops.back())
.map(|(end, start)| end.end_pts - start.start_pts) .map(|(end, start)| end.end_pts.saturating_sub(start.start_pts))
.unwrap_or(gst::ClockTime::ZERO) .unwrap_or(gst::ClockTime::ZERO)
); );