mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git
synced 2024-11-29 13:01:05 +00:00
gstreamer-check: Simplify borrowing of sink/src harnesses
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1183>
This commit is contained in:
parent
1e793f3b65
commit
315704fe67
1 changed files with 19 additions and 22 deletions
|
@ -1,6 +1,6 @@
|
||||||
// Take a look at the license at the top of the repository in the LICENSE file.
|
// Take a look at the license at the top of the repository in the LICENSE file.
|
||||||
|
|
||||||
use std::{marker::PhantomData, mem, ops, path, ptr};
|
use std::{mem, ops, path, ptr};
|
||||||
|
|
||||||
use glib::translate::*;
|
use glib::translate::*;
|
||||||
use gst::prelude::*;
|
use gst::prelude::*;
|
||||||
|
@ -9,6 +9,7 @@ use crate::TestClock;
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
#[doc(alias = "GstHarness")]
|
#[doc(alias = "GstHarness")]
|
||||||
|
#[repr(transparent)]
|
||||||
pub struct Harness(ptr::NonNull<ffi::GstHarness>);
|
pub struct Harness(ptr::NonNull<ffi::GstHarness>);
|
||||||
|
|
||||||
impl Drop for Harness {
|
impl Drop for Harness {
|
||||||
|
@ -753,13 +754,12 @@ impl Harness {
|
||||||
#[doc(alias = "get_sink_harness")]
|
#[doc(alias = "get_sink_harness")]
|
||||||
pub fn sink_harness(&self) -> Option<Ref> {
|
pub fn sink_harness(&self) -> Option<Ref> {
|
||||||
unsafe {
|
unsafe {
|
||||||
let sink_harness = (*self.0.as_ptr()).sink_harness;
|
if (*self.0.as_ptr()).sink_harness.is_null() {
|
||||||
if sink_harness.is_null() {
|
|
||||||
None
|
None
|
||||||
} else {
|
} else {
|
||||||
Some(Ref(
|
Some(Ref(
|
||||||
mem::ManuallyDrop::new(Harness(ptr::NonNull::new_unchecked(sink_harness))),
|
&*((&(*self.0.as_ptr()).sink_harness) as *const *mut ffi::GstHarness
|
||||||
PhantomData,
|
as *const Harness),
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -768,13 +768,12 @@ impl Harness {
|
||||||
#[doc(alias = "get_src_harness")]
|
#[doc(alias = "get_src_harness")]
|
||||||
pub fn src_harness(&self) -> Option<Ref> {
|
pub fn src_harness(&self) -> Option<Ref> {
|
||||||
unsafe {
|
unsafe {
|
||||||
let src_harness = (*self.0.as_ptr()).src_harness;
|
if (*self.0.as_ptr()).src_harness.is_null() {
|
||||||
if src_harness.is_null() {
|
|
||||||
None
|
None
|
||||||
} else {
|
} else {
|
||||||
Some(Ref(
|
Some(Ref(
|
||||||
mem::ManuallyDrop::new(Harness(ptr::NonNull::new_unchecked(src_harness))),
|
&*((&(*self.0.as_ptr()).src_harness) as *const *mut ffi::GstHarness
|
||||||
PhantomData,
|
as *const Harness),
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -783,13 +782,12 @@ impl Harness {
|
||||||
#[doc(alias = "get_mut_sink_harness")]
|
#[doc(alias = "get_mut_sink_harness")]
|
||||||
pub fn sink_harness_mut(&mut self) -> Option<RefMut> {
|
pub fn sink_harness_mut(&mut self) -> Option<RefMut> {
|
||||||
unsafe {
|
unsafe {
|
||||||
let sink_harness = (*self.0.as_ptr()).sink_harness;
|
if (*self.0.as_ptr()).sink_harness.is_null() {
|
||||||
if sink_harness.is_null() {
|
|
||||||
None
|
None
|
||||||
} else {
|
} else {
|
||||||
Some(RefMut(
|
Some(RefMut(
|
||||||
mem::ManuallyDrop::new(Harness(ptr::NonNull::new_unchecked(sink_harness))),
|
&mut *((&mut (*self.0.as_ptr()).sink_harness) as *mut *mut ffi::GstHarness
|
||||||
PhantomData,
|
as *mut Harness),
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -798,13 +796,12 @@ impl Harness {
|
||||||
#[doc(alias = "get_mut_src_harness")]
|
#[doc(alias = "get_mut_src_harness")]
|
||||||
pub fn src_harness_mut(&mut self) -> Option<RefMut> {
|
pub fn src_harness_mut(&mut self) -> Option<RefMut> {
|
||||||
unsafe {
|
unsafe {
|
||||||
let src_harness = (*self.0.as_ptr()).src_harness;
|
if (*self.0.as_ptr()).src_harness.is_null() {
|
||||||
if src_harness.is_null() {
|
|
||||||
None
|
None
|
||||||
} else {
|
} else {
|
||||||
Some(RefMut(
|
Some(RefMut(
|
||||||
mem::ManuallyDrop::new(Harness(ptr::NonNull::new_unchecked(src_harness))),
|
&mut *((&mut (*self.0.as_ptr()).src_harness) as *mut *mut ffi::GstHarness
|
||||||
PhantomData,
|
as *mut Harness),
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -812,30 +809,30 @@ impl Harness {
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct Ref<'a>(mem::ManuallyDrop<Harness>, PhantomData<&'a Harness>);
|
pub struct Ref<'a>(&'a Harness);
|
||||||
|
|
||||||
impl<'a> ops::Deref for Ref<'a> {
|
impl<'a> ops::Deref for Ref<'a> {
|
||||||
type Target = Harness;
|
type Target = Harness;
|
||||||
|
|
||||||
fn deref(&self) -> &Harness {
|
fn deref(&self) -> &Harness {
|
||||||
&self.0
|
self.0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct RefMut<'a>(mem::ManuallyDrop<Harness>, PhantomData<&'a mut Harness>);
|
pub struct RefMut<'a>(&'a mut Harness);
|
||||||
|
|
||||||
impl<'a> ops::Deref for RefMut<'a> {
|
impl<'a> ops::Deref for RefMut<'a> {
|
||||||
type Target = Harness;
|
type Target = Harness;
|
||||||
|
|
||||||
fn deref(&self) -> &Harness {
|
fn deref(&self) -> &Harness {
|
||||||
&self.0
|
self.0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a> ops::DerefMut for RefMut<'a> {
|
impl<'a> ops::DerefMut for RefMut<'a> {
|
||||||
fn deref_mut(&mut self) -> &mut Harness {
|
fn deref_mut(&mut self) -> &mut Harness {
|
||||||
&mut self.0
|
self.0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue