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-11-26 13:31:00 +00:00
Code Issues Projects Releases Wiki Activity

Send force-keyunit events later

Browse source 
We must not unlock the main stream's mutex until everything is handled
correctly, otherwise the other streams might continue in an inconsistent
state.

As a side-effect, this will only ever request a keyframe if there
currently isn't one.
This commit is contained in:
Sebastian Dröge 2017-12-10 13:18:43 +02:00
parent 86d1676a67
commit 73d0615f10
1 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
gst-plugin-togglerecord/src/togglerecord.rs
View file

@ -391,18 +391,6 @@ impl ToggleRecord {
_ => false,
};
if settings_changed {
drop(rec_state);
drop(state);
gst_debug!(self.cat, obj: pad, "Requesting a new keyframe");
stream.sinkpad.push_event(
gst_video::new_upstream_force_key_unit_event(gst::CLOCK_TIME_NONE, true, 0).build(),
);
state = stream.state.lock().unwrap();
rec_state = self.state.lock().unwrap();
}
match rec_state.recording_state {
RecordingState::Recording => {
// Remember where we stopped last, in case of EOS
@ -415,6 +403,20 @@ impl ToggleRecord {
// Remember where we stopped last, in case of EOS
rec_state.last_recording_stop = current_running_time_end;
gst_log!(self.cat, obj: pad, "Passing non-keyframe buffer (stopping)");
drop(rec_state);
drop(state);
if settings_changed {
gst_debug!(self.cat, obj: pad, "Requesting a new keyframe");
stream.sinkpad.push_event(
gst_video::new_upstream_force_key_unit_event(
gst::CLOCK_TIME_NONE,
true,
0,
).build(),
);
}
return HandleResult::Pass;
}
@ -478,6 +480,20 @@ impl ToggleRecord {
obj: pad,
"Dropping non-keyframe buffer (starting)"
);
drop(rec_state);
drop(state);
if settings_changed {
gst_debug!(self.cat, obj: pad, "Requesting a new keyframe");
stream.sinkpad.push_event(
gst_video::new_upstream_force_key_unit_event(
gst::CLOCK_TIME_NONE,
true,
0,
).build(),
);
}
return HandleResult::Drop;
}