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-06-02 21:39:23 +00:00
Code Issues Projects Releases Wiki Activity

onvifmetadataparse: Simplify some code

Browse source
This commit is contained in:
Sebastian Dröge 2022-09-16 14:52:24 +03:00
parent 49602e1e01
commit f2893aae0b
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
net/onvif/src/onvifmetadataparse/imp.rs
View file

@ -230,7 +230,7 @@ impl OnvifMetadataParse {
} }
}; };
let initial_utc_time = match gst::Signed::Positive(utc_time).checked_sub(diff) { let initial_utc_time = match utc_time.into_positive().checked_sub(diff) {
Some(gst::Signed::Positive(initial_utc_time)) => initial_utc_time, Some(gst::Signed::Positive(initial_utc_time)) => initial_utc_time,
Some(gst::Signed::Negative(initial_utc_time)) => { Some(gst::Signed::Negative(initial_utc_time)) => {
gst::warning!( gst::warning!(
@ -283,9 +283,7 @@ impl OnvifMetadataParse {
} }
}) })
{ {
if running_time.saturating_sub(front_running_time) if running_time.saturating_sub(front_running_time) >= state.configured_latency {
>= gst::Signed::Positive(state.configured_latency)
{
gst::warning!( gst::warning!(
CAT, CAT,
obj: pad, obj: pad,
@ -950,9 +948,7 @@ impl OnvifMetadataParse {
if let Some(utc_time_running_time_mapping) = utc_time_running_time_mapping { if let Some(utc_time_running_time_mapping) = utc_time_running_time_mapping {
let current_running_time = in_segment let current_running_time = in_segment
.to_running_time_full(in_segment.position()) .to_running_time_full(in_segment.position())
.unwrap_or(gst::Signed::Negative(gst::ClockTime::from_nseconds( .unwrap_or(gst::Signed::Negative(gst::ClockTime::MAX));
u64::MAX,
)));
let current_utc_time = running_time_to_utc_time( let current_utc_time = running_time_to_utc_time(
*utc_time_running_time_mapping, *utc_time_running_time_mapping,
current_running_time, current_running_time,
@ -1320,7 +1316,7 @@ impl OnvifMetadataParse {
now now
}; };
drain_running_time = Some(gst::Signed::Positive(now)); drain_running_time = Some(now.into_positive());
} }
} else { } else {
let current_running_time = state let current_running_time = state