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

gstreamer: Make allocation query caps optional

Browse source 
See also https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3752

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1194>
This commit is contained in:
Sebastian Dröge 2023-01-19 16:08:16 +02:00
parent 56498aa856
commit d6e9cd33c0
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gstreamer/src/query.rs
View file

@ -1019,11 +1019,12 @@ impl Uri {
declare_concrete_query!(Allocation, T); declare_concrete_query!(Allocation, T);
impl Allocation<Query> { impl Allocation<Query> {
#[doc(alias = "gst_query_new_allocation")] #[doc(alias = "gst_query_new_allocation")]
pub fn new(caps: &crate::Caps, need_pool: bool) -> Self { pub fn new(caps: Option<&crate::Caps>, need_pool: bool) -> Self {
skip_assert_initialized!(); skip_assert_initialized!();
unsafe { unsafe {
Self(from_glib_full(ffi::gst_query_new_allocation( Self(from_glib_full(ffi::gst_query_new_allocation(
caps.as_mut_ptr(), caps.map(|caps| caps.as_mut_ptr())
.unwrap_or(ptr::null_mut()),
need_pool.into_glib(), need_pool.into_glib(),
))) )))
} }
@ -1032,24 +1033,28 @@ impl Allocation<Query> {
impl Allocation { impl Allocation {
#[doc(alias = "gst_query_parse_allocation")] #[doc(alias = "gst_query_parse_allocation")]
pub fn get(&self) -> (&crate::CapsRef, bool) { pub fn get(&self) -> (Option<&crate::CapsRef>, bool) {
unsafe { unsafe {
let mut caps = ptr::null_mut(); let mut caps = ptr::null_mut();
let mut need_pool = mem::MaybeUninit::uninit(); let mut need_pool = mem::MaybeUninit::uninit();
ffi::gst_query_parse_allocation(self.as_mut_ptr(), &mut caps, need_pool.as_mut_ptr()); ffi::gst_query_parse_allocation(self.as_mut_ptr(), &mut caps, need_pool.as_mut_ptr());
( (
crate::CapsRef::from_ptr(caps), if caps.is_null() {
None
} else {
Some(crate::CapsRef::from_ptr(caps))
},
from_glib(need_pool.assume_init()), from_glib(need_pool.assume_init()),
) )
} }
} }
#[doc(alias = "gst_query_parse_allocation")] #[doc(alias = "gst_query_parse_allocation")]
pub fn get_owned(&self) -> (crate::Caps, bool) { pub fn get_owned(&self) -> (Option<crate::Caps>, bool) {
unsafe { unsafe {
let (caps, need_pool) = self.get(); let (caps, need_pool) = self.get();
(from_glib_none(caps.as_ptr()), need_pool) (caps.map(|caps| from_glib_none(caps.as_ptr())), need_pool)
} }
} }
@ -1749,7 +1754,7 @@ mod tests {
fn allocation_need_pool() { fn allocation_need_pool() {
crate::init().unwrap(); crate::init().unwrap();
let mut a = Allocation::new(&crate::Caps::builder("foo/bar").build(), true); let mut a = Allocation::new(Some(&crate::Caps::new_empty_simple("foo/bar")), true);
let pool = crate::BufferPool::new(); let pool = crate::BufferPool::new();
a.add_allocation_pool(Some(&pool), 1024, 1, 4); a.add_allocation_pool(Some(&pool), 1024, 1, 4);
} }
@ -1758,7 +1763,7 @@ mod tests {
fn allocation_do_not_need_pool() { fn allocation_do_not_need_pool() {
crate::init().unwrap(); crate::init().unwrap();
let mut a = Allocation::new(&crate::Caps::builder("foo/bar").build(), false); let mut a = Allocation::new(Some(&crate::Caps::new_empty_simple("foo/bar")), false);
a.add_allocation_pool(crate::BufferPool::NONE, 1024, 1, 4); a.add_allocation_pool(crate::BufferPool::NONE, 1024, 1, 4);
// cannot infer type of the type parameter `T` declared on the enum `Option` // cannot infer type of the type parameter `T` declared on the enum `Option`