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-25 13:01:07 +00:00
Code Issues Projects Releases Wiki Activity

video/gtk4: Clean up imports a bit

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1708>
This commit is contained in:
Sebastian Dröge 2024-08-23 11:09:34 +03:00 committed by GStreamer Marge Bot
parent 3fd3a32b6f
commit 7e912b0dde
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
video/gtk4/src/sink/imp.rs
View file

@ -24,8 +24,8 @@ use gst_video::subclass::prelude::*;
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use std::sync::{ use std::sync::{
atomic::{AtomicBool, Ordering}, atomic::{self, AtomicBool},
Mutex, MutexGuard, Mutex,
}; };
use crate::utils; use crate::utils;
@ -202,7 +202,7 @@ impl ObjectImpl for PaintableSink {
let mut settings = self.settings.lock().unwrap(); let mut settings = self.settings.lock().unwrap();
let value = value.get().expect("type checked upstream"); let value = value.get().expect("type checked upstream");
if settings.window_width != value { if settings.window_width != value {
self.window_resized.store(true, Ordering::SeqCst); self.window_resized.store(true, atomic::Ordering::SeqCst);
} }
settings.window_width = value; settings.window_width = value;
} }
@ -210,7 +210,7 @@ impl ObjectImpl for PaintableSink {
let mut settings = self.settings.lock().unwrap(); let mut settings = self.settings.lock().unwrap();
let value = value.get().expect("type checked upstream"); let value = value.get().expect("type checked upstream");
if settings.window_height != value { if settings.window_height != value {
self.window_resized.store(true, Ordering::SeqCst); self.window_resized.store(true, atomic::Ordering::SeqCst);
} }
settings.window_height = value; settings.window_height = value;
} }
@ -523,7 +523,7 @@ impl BaseSinkImpl for PaintableSink {
settings.window_height settings.window_height
); );
self.window_resized.store(false, Ordering::SeqCst); self.window_resized.store(false, atomic::Ordering::SeqCst);
Some( Some(
gst::Structure::builder("GstVideoOverlayCompositionMeta") gst::Structure::builder("GstVideoOverlayCompositionMeta")
@ -621,7 +621,7 @@ impl VideoSinkImpl for PaintableSink {
fn show_frame(&self, buffer: &gst::Buffer) -> Result<gst::FlowSuccess, gst::FlowError> { fn show_frame(&self, buffer: &gst::Buffer) -> Result<gst::FlowSuccess, gst::FlowError> {
gst::trace!(CAT, imp = self, "Rendering buffer {:?}", buffer); gst::trace!(CAT, imp = self, "Rendering buffer {:?}", buffer);
if self.window_resized.swap(false, Ordering::SeqCst) { if self.window_resized.swap(false, atomic::Ordering::SeqCst) {
gst::debug!(CAT, imp = self, "Window size changed, needs to reconfigure"); gst::debug!(CAT, imp = self, "Window size changed, needs to reconfigure");
let obj = self.obj(); let obj = self.obj();
let sink = obj.sink_pad(); let sink = obj.sink_pad();
@ -819,7 +819,7 @@ impl PaintableSink {
}); });
} }
fn create_paintable(&self, paintable_storage: &mut MutexGuard<Option<ThreadGuard<Paintable>>>) { fn create_paintable(&self, paintable_storage: &mut Option<ThreadGuard<Paintable>>) {
{ {
self.initialize_gl_context(); self.initialize_gl_context();
} }
@ -828,10 +828,7 @@ impl PaintableSink {
self.initialize_paintable(paintable_storage); self.initialize_paintable(paintable_storage);
} }
fn initialize_paintable( fn initialize_paintable(&self, paintable_storage: &mut Option<ThreadGuard<Paintable>>) {
&self,
paintable_storage: &mut MutexGuard<Option<ThreadGuard<Paintable>>>,
) {
gst::debug!(CAT, imp = self, "Initializing paintable"); gst::debug!(CAT, imp = self, "Initializing paintable");
// The channel for the SinkEvents // The channel for the SinkEvents
@ -862,7 +859,7 @@ impl PaintableSink {
ThreadGuard::new(Paintable::new(gdk_context)) ThreadGuard::new(Paintable::new(gdk_context))
}); });
**paintable_storage = Some(paintable); *paintable_storage = Some(paintable);
*self.sender.lock().unwrap() = Some(sender); *self.sender.lock().unwrap() = Some(sender);
} }