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-23 02:26:35 +00:00
Code Issues Projects Releases Wiki Activity

fallbackswitch: add support for buffers without pts

Browse source 
Re-use the previously seen PTS.

Fix #186
This commit is contained in:
Guillaume Desmottes 2022-02-28 13:52:05 +01:00
parent 526f34d98b
commit 31864c9a9d
1 changed files with 60 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
utils/fallbackswitch/src/fallbackswitch/imp.rs
View file

@ -229,11 +229,6 @@ impl FallbackSwitch {
buffer
);
if buffer.pts().is_none() {
gst::error!(CAT, obj: preferred_pad, "Only buffers with PTS supported");
return Err(gst::FlowError::Error);
}
let segment = preferred_pad
.segment()
.downcast::<gst::ClockTime>()
@ -242,12 +237,29 @@ impl FallbackSwitch {
gst::FlowError::Error
})?;
let running_time = segment.to_running_time(buffer.dts_or_pts());
let running_time = if buffer.pts().is_none() {
// re-use ts from previous buffer
let running_time = state
.primary
.last_sinkpad_time
.max(state.fallback.last_sinkpad_time);
gst::debug!(
CAT,
obj: preferred_pad,
"Buffer does not have PTS, re-use ts from previous buffer: {}",
running_time.display()
);
running_time
} else {
segment.to_running_time(buffer.pts())
};
{
// FIXME: This will not work correctly for negative DTS
let buffer = buffer.make_mut();
buffer.set_pts(segment.to_running_time(buffer.pts()));
buffer.set_pts(running_time);
buffer.set_dts(segment.to_running_time(buffer.dts()));
}
@ -361,11 +373,6 @@ impl FallbackSwitch {
buffer
);
if buffer.pts().is_none() {
gst::error!(CAT, obj: backup_pad, "Only buffers with PTS supported");
return Err(gst::FlowError::Error);
}
let backup_segment =
backup_pad
.segment()
@ -374,12 +381,30 @@ impl FallbackSwitch {
gst::error!(CAT, obj: backup_pad, "Only TIME segments supported");
gst::FlowError::Error
})?;
let running_time = backup_segment.to_running_time(buffer.dts_or_pts());
let running_time = if buffer.pts().is_none() {
// re-use ts from previous buffer
let running_time = state
.primary
.last_sinkpad_time
.max(state.fallback.last_sinkpad_time);
gst::debug!(
CAT,
obj: backup_pad,
"Buffer does not have PTS, re-use ts from previous buffer: {}",
running_time.display()
);
running_time
} else {
backup_segment.to_running_time(buffer.pts())
};
{
// FIXME: This will not work correctly for negative DTS
let buffer = buffer.make_mut();
buffer.set_pts(backup_segment.to_running_time(buffer.pts()));
buffer.set_pts(running_time);
buffer.set_dts(backup_segment.to_running_time(buffer.dts()));
}
@ -1047,12 +1072,6 @@ impl AggregatorImpl for FallbackSwitch {
.as_ref()
.and_then(|p| p.peek_buffer().map(|buffer| (buffer, p)))
{
if buffer.pts().is_none() {
gst::error!(CAT, obj: agg, "Only buffers with PTS supported");
// Trigger aggregate immediately to error out immediately
return Some(gst::ClockTime::ZERO);
}
let segment = match backup_sinkpad.segment().downcast::<gst::ClockTime>() {
Ok(segment) => segment,
Err(_) => {
@ -1062,7 +1081,26 @@ impl AggregatorImpl for FallbackSwitch {
}
};
let running_time = segment.to_running_time(buffer.dts_or_pts());
let running_time = if buffer.pts().is_none() {
// re-use ts from previous buffer
let state = self.output_state.lock().unwrap();
let running_time = state
.primary
.last_sinkpad_time
.max(state.fallback.last_sinkpad_time);
gst::debug!(
CAT,
obj: agg,
"Buffer does not have PTS, re-use ts from previous buffer: {}",
running_time.display(),
);
running_time
} else {
segment.to_running_time(buffer.pts())
};
gst::debug!(
CAT,
obj: agg,
@ -1095,7 +1133,7 @@ impl AggregatorImpl for FallbackSwitch {
let pts = buffer.pts();
if pts.is_none() {
gst::error!(CAT, obj: agg, "Only buffers with PTS supported");
gst::debug!(CAT, obj: agg, "Only clipping buffers with PTS supported");
return Some(buffer);
}