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

fallbackswitch: Minor cleanup

Browse source
This commit is contained in:
Sebastian Dröge 2019-09-18 13:50:48 +03:00 committed by Sebastian Dröge
parent 187cd9f8b1
commit 05d379bd3d
1 changed files with 23 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
gst-plugin-fallbackswitch/src/fallbackswitch.rs
View file

@ -123,13 +123,14 @@ impl FallbackSwitch {
return Err(gst::FlowError::Error); return Err(gst::FlowError::Error);
} }
let segment = match self.sinkpad.get_segment().downcast::<gst::ClockTime>() { let segment = self
Ok(segment) => segment, .sinkpad
Err(_) => { .get_segment()
.downcast::<gst::ClockTime>()
.map_err(|_| {
gst_error!(self.cat, obj: agg, "Only TIME segments supported"); gst_error!(self.cat, obj: agg, "Only TIME segments supported");
return Err(gst::FlowError::Error); gst::FlowError::Error
} })?;
};
let mut active_sinkpad = self.active_sinkpad.lock().unwrap(); let mut active_sinkpad = self.active_sinkpad.lock().unwrap();
let pad_change = &*active_sinkpad != self.sinkpad.upcast_ref::<gst::Pad>(); let pad_change = &*active_sinkpad != self.sinkpad.upcast_ref::<gst::Pad>();
@ -143,13 +144,14 @@ impl FallbackSwitch {
// Drop all older buffers from the fallback sinkpad // Drop all older buffers from the fallback sinkpad
if let Some(fallback_sinkpad) = fallback_sinkpad { if let Some(fallback_sinkpad) = fallback_sinkpad {
let fallback_segment = match self.sinkpad.get_segment().downcast::<gst::ClockTime>() { let fallback_segment = self
Ok(segment) => segment, .sinkpad
Err(_) => { .get_segment()
.downcast::<gst::ClockTime>()
.map_err(|_| {
gst_error!(self.cat, obj: agg, "Only TIME segments supported"); gst_error!(self.cat, obj: agg, "Only TIME segments supported");
return Err(gst::FlowError::Error); gst::FlowError::Error
} })?;
};
while let Some(fallback_buffer) = fallback_sinkpad.peek_buffer() { while let Some(fallback_buffer) = fallback_sinkpad.peek_buffer() {
let fallback_pts = fallback_buffer.get_pts(); let fallback_pts = fallback_buffer.get_pts();
@ -186,16 +188,9 @@ impl FallbackSwitch {
// If we have a fallback sinkpad and timeout, try to get a fallback buffer from here // If we have a fallback sinkpad and timeout, try to get a fallback buffer from here
// and drop all too old buffers in the process // and drop all too old buffers in the process
loop { loop {
let buffer = if let Some(buffer) = fallback_sinkpad.pop_buffer() { let buffer = fallback_sinkpad
buffer .pop_buffer()
} else { .ok_or(gst_base::AGGREGATOR_FLOW_NEED_DATA)?;
gst_debug!(
self.cat,
obj: agg,
"Got no buffer on sinkpad and fallback sinkpad"
);
return Err(gst_base::AGGREGATOR_FLOW_NEED_DATA);
};
gst_debug!( gst_debug!(
self.cat, self.cat,
@ -209,14 +204,13 @@ impl FallbackSwitch {
return Err(gst::FlowError::Error); return Err(gst::FlowError::Error);
} }
let fallback_segment = match fallback_sinkpad.get_segment().downcast::<gst::ClockTime>() let fallback_segment = fallback_sinkpad
{ .get_segment()
Ok(segment) => segment, .downcast::<gst::ClockTime>()
Err(_) => { .map_err(|_| {
gst_error!(self.cat, obj: agg, "Only TIME segments supported"); gst_error!(self.cat, obj: agg, "Only TIME segments supported");
return Err(gst::FlowError::Error); gst::FlowError::Error
} })?;
};
let running_time = fallback_segment.to_running_time(buffer.get_pts()); let running_time = fallback_segment.to_running_time(buffer.get_pts());
// If we never had a real buffer, initialize with the running time of the fallback // If we never had a real buffer, initialize with the running time of the fallback