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-02-16 21:05:15 +00:00
Code Issues Projects Releases Wiki Activity

rtpav1: Reset state on FlushStop/Eos in all conditions and reset all of the state

Browse source
This commit is contained in:
Sebastian Dröge 2022-09-28 11:01:52 +03:00 committed by Sebastian Dröge
parent 6772e49712
commit 5774d9c9ee
2 changed files with 39 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
net/rtpav1/src/depay/imp.rs
View file

@ -151,6 +151,18 @@ impl ElementImpl for RTPAv1Depay {
}
impl RTPBaseDepayloadImpl for RTPAv1Depay {
fn handle_event(&self, element: &Self::Type, event: gst::Event) -> bool {
match event.view() {
gst::EventView::Eos(_) | gst::EventView::FlushStop(_) => {
let mut state = self.state.lock().unwrap();
self.reset(element, &mut state);
}
_ => (),
}
self.parent_handle_event(element, event)
}
fn process_rtp_packet(
&self,
element: &Self::Type,

43
net/rtpav1/src/pay/imp.rs
View file

@ -10,9 +10,9 @@
use gst::{
glib,
subclass::{prelude::*, ElementMetadata},
Buffer, BufferFlags, Caps, ClockTime, DebugCategory, DebugColorFlags, Event, EventType,
FlowError, FlowSuccess, IntRange, LoggableError, PadDirection, PadPresence, PadTemplate,
ResourceError, StateChange, StateChangeError, StateChangeSuccess,
Buffer, BufferFlags, Caps, ClockTime, DebugCategory, DebugColorFlags, Event, FlowError,
FlowSuccess, IntRange, LoggableError, PadDirection, PadPresence, PadTemplate, ResourceError,
StateChange, StateChangeError, StateChangeSuccess,
};
use gst_rtp::{prelude::*, rtp_buffer::RTPBuffer, subclass::prelude::*, RTPBasePayload};
use std::{
@ -104,7 +104,7 @@ impl RTPAv1Pay {
fn reset(&self, element: &<Self as ObjectSubclass>::Type, state: &mut State) {
gst::debug!(CAT, obj: element, "resetting state");
state.obus.clear();
*state = State::default();
}
/// Parses new OBUs, stores them in the state,
@ -609,23 +609,34 @@ impl RTPBasePayloadImpl for RTPAv1Pay {
fn sink_event(&self, element: &Self::Type, event: Event) -> bool {
gst::log!(CAT, obj: element, "sink event: {}", event.type_());
if matches!(event.type_(), EventType::Eos) {
// flush all remaining OBUs
let mut list = gst::BufferList::new();
{
let mut state = self.state.lock().unwrap();
let list = list.get_mut().unwrap();
match event.view() {
gst::EventView::Eos(_) => {
// flush all remaining OBUs
let mut list = gst::BufferList::new();
{
let mut state = self.state.lock().unwrap();
let list = list.get_mut().unwrap();
while let Some(packet_data) = self.consider_new_packet(element, &mut state, true) {
match self.generate_new_packet(element, &mut state, packet_data) {
Ok(buffer) => list.add(buffer),
Err(_) => break,
while let Some(packet_data) =
self.consider_new_packet(element, &mut state, true)
{
match self.generate_new_packet(element, &mut state, packet_data) {
Ok(buffer) => list.add(buffer),
Err(_) => break,
}
}
self.reset(element, &mut state);
}
if !list.is_empty() {
let _ = element.push_list(list);
}
}
if !list.is_empty() {
let _ = element.push_list(list);
gst::EventView::FlushStop(_) => {
let mut state = self.state.lock().unwrap();
self.reset(element, &mut state);
}
_ => (),
}
self.parent_sink_event(element, event)