rafaelcaricio/gstreamer-rs
1
0
Fork 0
forked from mirrors/gstreamer-rs
Code Pull requests Activity

audio: Don't store a copy of the AudioInfo in AudioFrame

Browse source 
Instead just reference the one inside the FFI struct directly by making
sure that the memory representation of the FFI and Rust type are the
same.

This reduces the size of `AudioFrame` by about half.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1244>
This commit is contained in:
Sebastian Dröge 2023-04-06 20:45:56 +03:00
parent e584fdb17b
commit a252de69b1
2 changed files with 25 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
gstreamer-audio/src/audio_buffer.rs
View file

@ -2,7 +2,7 @@
use std::{fmt, marker::PhantomData, mem, ops, ptr, slice}; use std::{fmt, marker::PhantomData, mem, ops, ptr, slice};
use glib::translate::{from_glib, Borrowed, FromGlibPtrNone, ToGlibPtr}; use glib::translate::{from_glib, Borrowed, ToGlibPtr};
pub enum Readable {} pub enum Readable {}
pub enum Writable {} pub enum Writable {}
@ -11,7 +11,6 @@ pub struct AudioBuffer<T> {
// Has to be boxed because it contains self-references // Has to be boxed because it contains self-references
audio_buffer: Box<ffi::GstAudioBuffer>, audio_buffer: Box<ffi::GstAudioBuffer>,
buffer: gst::Buffer, buffer: gst::Buffer,
info: crate::AudioInfo,
phantom: PhantomData<T>, phantom: PhantomData<T>,
} }
@ -21,10 +20,10 @@ unsafe impl<T> Sync for AudioBuffer<T> {}
impl<T> fmt::Debug for AudioBuffer<T> { impl<T> fmt::Debug for AudioBuffer<T> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
f.debug_struct("AudioBuffer") f.debug_struct("AudioBuffer")
.field("audio_buffer", &self.audio_buffer) .field("n_samples", &self.n_samples())
.field("buffer", &self.buffer) .field("n_planes", &self.n_planes())
.field("info", &self.info) .field("buffer", &self.buffer())
.field("phantom", &self.phantom) .field("info", &self.info())
.finish() .finish()
} }
} }
@ -32,7 +31,9 @@ impl<T> fmt::Debug for AudioBuffer<T> {
impl<T> AudioBuffer<T> { impl<T> AudioBuffer<T> {
#[inline] #[inline]
pub fn info(&self) -> &crate::AudioInfo { pub fn info(&self) -> &crate::AudioInfo {
&self.info unsafe {
&*(&self.audio_buffer.info as *const ffi::GstAudioInfo as *const crate::AudioInfo)
}
} }
#[inline] #[inline]
@ -135,10 +136,8 @@ impl<T> AudioBuffer<T> {
#[inline] #[inline]
pub fn as_audio_buffer_ref(&self) -> AudioBufferRef<&gst::BufferRef> { pub fn as_audio_buffer_ref(&self) -> AudioBufferRef<&gst::BufferRef> {
let info = self.info.clone();
AudioBufferRef { AudioBufferRef {
audio_buffer: AudioBufferPtr::Borrowed(ptr::NonNull::from(&*self.audio_buffer)), audio_buffer: AudioBufferPtr::Borrowed(ptr::NonNull::from(&*self.audio_buffer)),
info,
unmap: false, unmap: false,
phantom: PhantomData, phantom: PhantomData,
} }
@ -181,13 +180,9 @@ impl AudioBuffer<Readable> {
if !res { if !res {
Err(buffer) Err(buffer)
} else { } else {
let info = crate::AudioInfo::from_glib_none(
&audio_buffer.info as *const _ as *mut ffi::GstAudioInfo,
);
Ok(Self { Ok(Self {
audio_buffer, audio_buffer,
buffer, buffer,
info,
phantom: PhantomData, phantom: PhantomData,
}) })
} }
@ -217,13 +212,9 @@ impl AudioBuffer<Writable> {
if !res { if !res {
Err(buffer) Err(buffer)
} else { } else {
let info = crate::AudioInfo::from_glib_none(
&audio_buffer.info as *const _ as *mut ffi::GstAudioInfo,
);
Ok(Self { Ok(Self {
audio_buffer, audio_buffer,
buffer, buffer,
info,
phantom: PhantomData, phantom: PhantomData,
}) })
} }
@ -252,10 +243,8 @@ impl AudioBuffer<Writable> {
#[inline] #[inline]
pub fn as_mut_audio_buffer_ref(&mut self) -> AudioBufferRef<&mut gst::BufferRef> { pub fn as_mut_audio_buffer_ref(&mut self) -> AudioBufferRef<&mut gst::BufferRef> {
let info = self.info.clone();
AudioBufferRef { AudioBufferRef {
audio_buffer: AudioBufferPtr::Borrowed(ptr::NonNull::from(&mut *self.audio_buffer)), audio_buffer: AudioBufferPtr::Borrowed(ptr::NonNull::from(&mut *self.audio_buffer)),
info,
unmap: false, unmap: false,
phantom: PhantomData, phantom: PhantomData,
} }
@ -295,19 +284,32 @@ impl ops::DerefMut for AudioBufferPtr {
} }
} }
#[derive(Debug)]
pub struct AudioBufferRef<T> { pub struct AudioBufferRef<T> {
// Has to be boxed because it contains self-references // Has to be boxed because it contains self-references
audio_buffer: AudioBufferPtr, audio_buffer: AudioBufferPtr,
info: crate::AudioInfo,
unmap: bool, unmap: bool,
phantom: PhantomData<T>, phantom: PhantomData<T>,
} }
impl<T> fmt::Debug for AudioBufferRef<T> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
f.debug_struct("AudioBufferRef")
.field("n_samples", &self.n_samples())
.field("n_planes", &self.n_planes())
.field("buffer", &unsafe {
gst::BufferRef::from_ptr(self.audio_buffer.buffer)
})
.field("info", &self.info())
.finish()
}
}
impl<T> AudioBufferRef<T> { impl<T> AudioBufferRef<T> {
#[inline] #[inline]
pub fn info(&self) -> &crate::AudioInfo { pub fn info(&self) -> &crate::AudioInfo {
&self.info unsafe {
&*(&self.audio_buffer.info as *const ffi::GstAudioInfo as *const crate::AudioInfo)
}
} }
#[inline] #[inline]
@ -406,14 +408,10 @@ impl<'a> AudioBufferRef<&'a gst::BufferRef> {
pub unsafe fn from_glib_borrow(audio_buffer: *const ffi::GstAudioBuffer) -> Borrowed<Self> { pub unsafe fn from_glib_borrow(audio_buffer: *const ffi::GstAudioBuffer) -> Borrowed<Self> {
debug_assert!(!audio_buffer.is_null()); debug_assert!(!audio_buffer.is_null());
let info = crate::AudioInfo::from_glib_none(
&(*audio_buffer).info as *const _ as *mut ffi::GstAudioInfo,
);
Borrowed::new(Self { Borrowed::new(Self {
audio_buffer: AudioBufferPtr::Borrowed(ptr::NonNull::new_unchecked( audio_buffer: AudioBufferPtr::Borrowed(ptr::NonNull::new_unchecked(
audio_buffer as *mut _, audio_buffer as *mut _,
)), )),
info,
unmap: false, unmap: false,
phantom: PhantomData, phantom: PhantomData,
}) })
@ -440,12 +438,8 @@ impl<'a> AudioBufferRef<&'a gst::BufferRef> {
if !res { if !res {
Err(glib::bool_error!("Failed to map AudioBuffer")) Err(glib::bool_error!("Failed to map AudioBuffer"))
} else { } else {
let info = crate::AudioInfo::from_glib_none(
&audio_buffer.info as *const _ as *mut ffi::GstAudioInfo,
);
Ok(Self { Ok(Self {
audio_buffer: AudioBufferPtr::Owned(audio_buffer), audio_buffer: AudioBufferPtr::Owned(audio_buffer),
info,
unmap: true, unmap: true,
phantom: PhantomData, phantom: PhantomData,
}) })
@ -464,12 +458,8 @@ impl<'a> AudioBufferRef<&'a mut gst::BufferRef> {
pub unsafe fn from_glib_borrow_mut(audio_buffer: *mut ffi::GstAudioBuffer) -> Borrowed<Self> { pub unsafe fn from_glib_borrow_mut(audio_buffer: *mut ffi::GstAudioBuffer) -> Borrowed<Self> {
debug_assert!(!audio_buffer.is_null()); debug_assert!(!audio_buffer.is_null());
let info = crate::AudioInfo::from_glib_none(
&(*audio_buffer).info as *const _ as *mut ffi::GstAudioInfo,
);
Borrowed::new(Self { Borrowed::new(Self {
audio_buffer: AudioBufferPtr::Borrowed(ptr::NonNull::new_unchecked(audio_buffer)), audio_buffer: AudioBufferPtr::Borrowed(ptr::NonNull::new_unchecked(audio_buffer)),
info,
unmap: false, unmap: false,
phantom: PhantomData, phantom: PhantomData,
}) })
@ -496,12 +486,8 @@ impl<'a> AudioBufferRef<&'a mut gst::BufferRef> {
if !res { if !res {
Err(glib::bool_error!("Failed to map AudioBuffer")) Err(glib::bool_error!("Failed to map AudioBuffer"))
} else { } else {
let info = crate::AudioInfo::from_glib_none(
&audio_buffer.info as *const _ as *mut ffi::GstAudioInfo,
);
Ok(Self { Ok(Self {
audio_buffer: AudioBufferPtr::Owned(audio_buffer), audio_buffer: AudioBufferPtr::Owned(audio_buffer),
info,
unmap: true, unmap: true,
phantom: PhantomData, phantom: PhantomData,
}) })

1
gstreamer-audio/src/audio_info.rs
View file

@ -9,6 +9,7 @@ use gst::prelude::*;
#[doc(alias = "GstAudioInfo")] #[doc(alias = "GstAudioInfo")]
#[derive(Clone)] #[derive(Clone)]
#[repr(transparent)]
pub struct AudioInfo(ffi::GstAudioInfo); pub struct AudioInfo(ffi::GstAudioInfo);
impl fmt::Debug for AudioInfo { impl fmt::Debug for AudioInfo {