rafaelcaricio/gstreamer-rs
1
0
Fork 0
forked from mirrors/gstreamer-rs
Code Pull requests Activity

Pad: allow handling Events in PadProbes

Browse source
This commit is contained in:
François Laignel 2020-11-18 14:16:59 +01:00 committed by Sebastian Dröge
parent 7d8f95971c
commit 3e8ecf4806
1 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
gstreamer/src/pad.rs
View file

@ -1133,8 +1133,14 @@ unsafe fn update_probe_info(
assert_eq!(data_type, Some(Buffer::static_type())); assert_eq!(data_type, Some(Buffer::static_type()));
// Buffer not consumed by probe; consume it here // Buffer not consumed by probe; consume it here
} }
None if data_type == Some(Buffer::static_type()) => { Some(PadProbeData::Event(_)) => {
// Buffer consumed by probe assert_eq!(data_type, Some(Event::static_type()));
// Event not consumed by probe; consume it here
}
None if data_type == Some(Buffer::static_type())
|| data_type == Some(Event::static_type()) =>
{
// Buffer or Event consumed by probe
} }
other => panic!( other => panic!(
"Bad data for {:?} pad probe returning Handled: {:?}", "Bad data for {:?} pad probe returning Handled: {:?}",
@ -1999,6 +2005,19 @@ mod tests {
}); });
} }
{
let events = events.clone();
pad.add_probe(::PadProbeType::EVENT_UPSTREAM, move |_, info| {
if let Some(PadProbeData::Event(event)) = info.data.take() {
let mut events = events.lock().unwrap();
events.push(event);
} else {
unreachable!();
}
::PadProbeReturn::Handled
});
}
{ {
let buffers = buffers.clone(); let buffers = buffers.clone();
let flow_override = flow_override; let flow_override = flow_override;
@ -2020,6 +2039,7 @@ mod tests {
pad.set_active(true).unwrap(); pad.set_active(true).unwrap();
assert!(pad.send_event(::event::Latency::new(::ClockTime::from_nseconds(10))));
assert!(pad.push_event(::event::StreamStart::new("test"))); assert!(pad.push_event(::event::StreamStart::new("test")));
let segment = ::FormattedSegment::<::ClockTime>::new(); let segment = ::FormattedSegment::<::ClockTime>::new();
assert!(pad.push_event(::event::Segment::new(segment.as_ref()))); assert!(pad.push_event(::event::Segment::new(segment.as_ref())));
@ -2029,11 +2049,12 @@ mod tests {
let events = events.lock().unwrap(); let events = events.lock().unwrap();
let buffers = buffers.lock().unwrap(); let buffers = buffers.lock().unwrap();
assert_eq!(events.len(), 2); assert_eq!(events.len(), 3);
assert_eq!(buffers.len(), 2); assert_eq!(buffers.len(), 2);
assert_eq!(events[0].get_type(), ::EventType::StreamStart); assert_eq!(events[0].get_type(), ::EventType::Latency);
assert_eq!(events[1].get_type(), ::EventType::Segment); assert_eq!(events[1].get_type(), ::EventType::StreamStart);
assert_eq!(events[2].get_type(), ::EventType::Segment);
assert!( assert!(
buffers.iter().all(|b| b.is_writable()), buffers.iter().all(|b| b.is_writable()),