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

togglerecord: Clip segment before calculating timestamp/duration

Browse source 
Clipping happens in buffer time space and data.clip can modify the
buffer timestamp and duration. Move it before we calculate them in order
to make it actually have some effect.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1265>
This commit is contained in:
Vivia Nikolaidou 2023-06-30 14:21:29 +03:00 committed by GStreamer Marge Bot
parent 1ed9992775
commit 9d7af671c5
1 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
utils/togglerecord/src/togglerecord/imp.rs
View file

@ -415,6 +415,14 @@ impl ToggleRecord {
) -> Result<HandleResult<T>, gst::FlowError> { ) -> Result<HandleResult<T>, gst::FlowError> {
let mut state = stream.state.lock(); let mut state = stream.state.lock();
let data = match data.clip(&state, &state.in_segment) {
Some(data) => data,
None => {
gst::log!(CAT, obj: pad, "Dropping raw data outside segment");
return Ok(HandleResult::Drop);
}
};
let mut dts_or_pts = data.dts_or_pts().ok_or_else(|| { let mut dts_or_pts = data.dts_or_pts().ok_or_else(|| {
gst::element_imp_error!( gst::element_imp_error!(
self, self,
@ -426,14 +434,6 @@ impl ToggleRecord {
let mut dts_or_pts_end = dts_or_pts + data.duration(&state).unwrap_or(gst::ClockTime::ZERO); let mut dts_or_pts_end = dts_or_pts + data.duration(&state).unwrap_or(gst::ClockTime::ZERO);
let data = match data.clip(&state, &state.in_segment) {
Some(data) => data,
None => {
gst::log!(CAT, obj: pad, "Dropping raw data outside segment");
return Ok(HandleResult::Drop);
}
};
// This will only do anything for non-raw data // This will only do anything for non-raw data
dts_or_pts = state.in_segment.start().unwrap().max(dts_or_pts); dts_or_pts = state.in_segment.start().unwrap().max(dts_or_pts);
dts_or_pts_end = state.in_segment.start().unwrap().max(dts_or_pts_end); dts_or_pts_end = state.in_segment.start().unwrap().max(dts_or_pts_end);
@ -444,17 +444,6 @@ impl ToggleRecord {
let current_running_time = state.in_segment.to_running_time(dts_or_pts); let current_running_time = state.in_segment.to_running_time(dts_or_pts);
let current_running_time_end = state.in_segment.to_running_time(dts_or_pts_end); let current_running_time_end = state.in_segment.to_running_time(dts_or_pts_end);
let (current_running_time, current_running_time_end) = state
.in_segment
.clip(current_running_time, current_running_time_end)
.ok_or_else(|| {
gst::element_imp_error!(
self,
gst::StreamError::Format,
["Received a buffer in the main stream without a valid running time"]
);
gst::FlowError::Error
})?;
state.current_running_time = current_running_time state.current_running_time = current_running_time
.opt_max(state.current_running_time) .opt_max(state.current_running_time)