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-19 08:36:27 +00:00
Code Issues Projects Releases Wiki Activity

togglerecord: move the next pad id to its own variable

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1935>
This commit is contained in:
Guillaume Desmottes 2024-11-29 11:59:47 +01:00 committed by GStreamer Marge Bot
parent 3f5396af58
commit 95fc407de3
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -131,7 +131,8 @@ enum RecordingState {
#[derive(Debug)] #[derive(Debug)]
struct State { struct State {
other_streams: (Vec<Stream>, u32), other_streams: Vec<Stream>,
next_pad_id: u32,
pads: HashMap<gst::Pad, Stream>, pads: HashMap<gst::Pad, Stream>,
recording_state: RecordingState, recording_state: RecordingState,
@ -158,7 +159,8 @@ struct State {
impl State { impl State {
fn new(pads: HashMap<gst::Pad, Stream>) -> Self { fn new(pads: HashMap<gst::Pad, Stream>) -> Self {
Self { Self {
other_streams: (Vec::new(), 0), other_streams: Vec::new(),
next_pad_id: 0,
pads, pads,
recording_state: RecordingState::Stopped, recording_state: RecordingState::Stopped,
last_recording_start: None, last_recording_start: None,
@ -400,7 +402,7 @@ impl ToggleRecord {
} }
state.segment_pending = true; state.segment_pending = true;
state.discont_pending = true; state.discont_pending = true;
for other_stream in &rec_state.other_streams.0 { for other_stream in &rec_state.other_streams {
// safe from deadlock as `state` is a lock on the main stream which is not in `other_streams` // safe from deadlock as `state` is a lock on the main stream which is not in `other_streams`
let mut other_state = other_stream.state.lock(); let mut other_state = other_stream.state.lock();
other_state.segment_pending = true; other_state.segment_pending = true;
@ -564,7 +566,7 @@ impl ToggleRecord {
// instead. // instead.
while !state.flushing while !state.flushing
&& !rec_state.other_streams.0.iter().all(|s| { && !rec_state.other_streams.iter().all(|s| {
// safe from deadlock as `state` is a lock on the main stream which is not in `other_streams` // safe from deadlock as `state` is a lock on the main stream which is not in `other_streams`
let s = s.state.lock(); let s = s.state.lock();
s.eos s.eos
@ -673,7 +675,7 @@ impl ToggleRecord {
state.segment_pending = true; state.segment_pending = true;
state.discont_pending = true; state.discont_pending = true;
for other_stream in &rec_state.other_streams.0 { for other_stream in &rec_state.other_streams {
// safe from deadlock as `state` is a lock on the main stream which is not in `other_streams` // safe from deadlock as `state` is a lock on the main stream which is not in `other_streams`
let mut other_state = other_stream.state.lock(); let mut other_state = other_stream.state.lock();
other_state.segment_pending = true; other_state.segment_pending = true;
@ -685,7 +687,7 @@ impl ToggleRecord {
// go EOS instead. // go EOS instead.
while !state.flushing while !state.flushing
&& !rec_state.other_streams.0.iter().all(|s| { && !rec_state.other_streams.iter().all(|s| {
let s = s.state.lock(); let s = s.state.lock();
s.eos s.eos
|| s.current_running_time || s.current_running_time
@ -1229,7 +1231,7 @@ impl ToggleRecord {
let mut all_others_eos = true; let mut all_others_eos = true;
// Check eos state of all secondary streams // Check eos state of all secondary streams
rec_state.other_streams.0.iter().all(|s| { rec_state.other_streams.iter().all(|s| {
if s == stream { if s == stream {
return true; return true;
} }
@ -1274,7 +1276,7 @@ impl ToggleRecord {
let mut all_others_not_eos = false; let mut all_others_not_eos = false;
// Check eos state of all secondary streams // Check eos state of all secondary streams
rec_state.other_streams.0.iter().any(|s| { rec_state.other_streams.iter().any(|s| {
if s == stream { if s == stream {
return false; return false;
} }
@ -2163,7 +2165,6 @@ impl ElementImpl for ToggleRecord {
for s in rec_state for s in rec_state
.other_streams .other_streams
.0
.iter() .iter()
.chain(iter::once(&self.main_stream)) .chain(iter::once(&self.main_stream))
{ {
@ -2177,7 +2178,7 @@ impl ElementImpl for ToggleRecord {
gst::StateChange::PausedToReady => { gst::StateChange::PausedToReady => {
let rec_state = self.state.lock(); let rec_state = self.state.lock();
for s in &rec_state.other_streams.0 { for s in &rec_state.other_streams {
let mut state = s.state.lock(); let mut state = s.state.lock();
state.flushing = true; state.flushing = true;
} }
@ -2196,7 +2197,6 @@ impl ElementImpl for ToggleRecord {
for s in rec_state for s in rec_state
.other_streams .other_streams
.0
.iter() .iter()
.chain(iter::once(&self.main_stream)) .chain(iter::once(&self.main_stream))
{ {
@ -2220,8 +2220,8 @@ impl ElementImpl for ToggleRecord {
_caps: Option<&gst::Caps>, _caps: Option<&gst::Caps>,
) -> Option<gst::Pad> { ) -> Option<gst::Pad> {
let mut rec_state = self.state.lock(); let mut rec_state = self.state.lock();
let id = rec_state.other_streams.1; let id = rec_state.next_pad_id;
rec_state.other_streams.1 += 1; rec_state.next_pad_id += 1;
let templ = self.obj().pad_template("sink_%u").unwrap(); let templ = self.obj().pad_template("sink_%u").unwrap();
let sinkpad = gst::Pad::builder_from_template(&templ) let sinkpad = gst::Pad::builder_from_template(&templ)
@ -2292,7 +2292,7 @@ impl ElementImpl for ToggleRecord {
.insert(stream.sinkpad.clone(), stream.clone()); .insert(stream.sinkpad.clone(), stream.clone());
rec_state.pads.insert(stream.srcpad.clone(), stream.clone()); rec_state.pads.insert(stream.srcpad.clone(), stream.clone());
rec_state.other_streams.0.push(stream); rec_state.other_streams.push(stream);
drop(rec_state); drop(rec_state);
@ -2314,8 +2314,8 @@ impl ElementImpl for ToggleRecord {
rec_state.pads.remove(&stream.srcpad).unwrap(); rec_state.pads.remove(&stream.srcpad).unwrap();
// TODO: Replace with Vec::remove_item() once stable // TODO: Replace with Vec::remove_item() once stable
let pos = rec_state.other_streams.0.iter().position(|x| *x == stream); let pos = rec_state.other_streams.iter().position(|x| *x == stream);
pos.map(|pos| rec_state.other_streams.0.swap_remove(pos)); pos.map(|pos| rec_state.other_streams.swap_remove(pos));
drop(rec_state); drop(rec_state);