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-10-31 22:58:51 +00:00
Code Issues Projects Releases Wiki Activity

rav1eenc: Use AtomicRefCell instead of Mutex for the state

Browse source 
It's only accessed from the streaming thread.
This commit is contained in:
Sebastian Dröge 2022-02-14 14:36:50 +02:00
parent 001fdd4d03
commit 03787ef857
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
video/rav1e/Cargo.toml
View file

@ -13,6 +13,7 @@ gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/g
gst-video = { package = "gstreamer-video", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_12"] } gst-video = { package = "gstreamer-video", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_12"] }
rav1e = { version = "0.5", default-features = false } rav1e = { version = "0.5", default-features = false }
once_cell = "1.0" once_cell = "1.0"
atomic_refcell = "0.1"
[dev-dependencies] [dev-dependencies]
gst-check = { package = "gstreamer-check", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } gst-check = { package = "gstreamer-check", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }

13
video/rav1e/src/rav1enc/imp.rs
View file

@ -8,6 +8,7 @@
// //
// SPDX-License-Identifier: MIT/Apache-2.0 // SPDX-License-Identifier: MIT/Apache-2.0
use atomic_refcell::AtomicRefCell;
use gst::glib; use gst::glib;
use gst::gst_debug; use gst::gst_debug;
use gst::subclass::prelude::*; use gst::subclass::prelude::*;
@ -220,7 +221,7 @@ struct State {
#[derive(Default)] #[derive(Default)]
pub struct Rav1Enc { pub struct Rav1Enc {
state: Mutex<Option<State>>, state: AtomicRefCell<Option<State>>,
settings: Mutex<Settings>, settings: Mutex<Settings>,
} }
@ -608,7 +609,7 @@ impl ElementImpl for Rav1Enc {
impl VideoEncoderImpl for Rav1Enc { impl VideoEncoderImpl for Rav1Enc {
fn stop(&self, _element: &Self::Type) -> Result<(), gst::ErrorMessage> { fn stop(&self, _element: &Self::Type) -> Result<(), gst::ErrorMessage> {
*self.state.lock().unwrap() = None; *self.state.borrow_mut() = None;
Ok(()) Ok(())
} }
@ -860,7 +861,7 @@ impl VideoEncoderImpl for Rav1Enc {
let container_sequence_header = let container_sequence_header =
gst::Buffer::from_mut_slice(context.container_sequence_header()); gst::Buffer::from_mut_slice(context.container_sequence_header());
*self.state.lock().unwrap() = Some(State { *self.state.borrow_mut() = Some(State {
context, context,
video_info, video_info,
}); });
@ -885,7 +886,7 @@ impl VideoEncoderImpl for Rav1Enc {
fn flush(&self, element: &Self::Type) -> bool { fn flush(&self, element: &Self::Type) -> bool {
gst_debug!(CAT, obj: element, "Flushing"); gst_debug!(CAT, obj: element, "Flushing");
let mut state_guard = self.state.lock().unwrap(); let mut state_guard = self.state.borrow_mut();
if let Some(ref mut state) = *state_guard { if let Some(ref mut state) = *state_guard {
state.context.flush(); state.context.flush();
while let Ok(_) | Err(data::EncoderStatus::Encoded) = state.context.receive_packet() { while let Ok(_) | Err(data::EncoderStatus::Encoded) = state.context.receive_packet() {
@ -899,7 +900,7 @@ impl VideoEncoderImpl for Rav1Enc {
fn finish(&self, element: &Self::Type) -> Result<gst::FlowSuccess, gst::FlowError> { fn finish(&self, element: &Self::Type) -> Result<gst::FlowSuccess, gst::FlowError> {
gst_debug!(CAT, obj: element, "Finishing"); gst_debug!(CAT, obj: element, "Finishing");
let mut state_guard = self.state.lock().unwrap(); let mut state_guard = self.state.borrow_mut();
if let Some(ref mut state) = *state_guard { if let Some(ref mut state) = *state_guard {
state.context.flush(); state.context.flush();
self.output_frames(element, state)?; self.output_frames(element, state)?;
@ -913,7 +914,7 @@ impl VideoEncoderImpl for Rav1Enc {
element: &Self::Type, element: &Self::Type,
frame: gst_video::VideoCodecFrame, frame: gst_video::VideoCodecFrame,
) -> Result<gst::FlowSuccess, gst::FlowError> { ) -> Result<gst::FlowSuccess, gst::FlowError> {
let mut state_guard = self.state.lock().unwrap(); let mut state_guard = self.state.borrow_mut();
let state = state_guard.as_mut().ok_or(gst::FlowError::NotNegotiated)?; let state = state_guard.as_mut().ok_or(gst::FlowError::NotNegotiated)?;
self.output_frames(element, state)?; self.output_frames(element, state)?;