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

Filter in caps queries can be None, and there could be no resulting caps

Browse source
This commit is contained in:
Sebastian Dröge 2017-12-17 11:32:01 +02:00
parent ffb5869dd1
commit dfdae187a3
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gstreamer/src/query.rs
View file

@ -105,9 +105,10 @@ impl GstRc<QueryRef> {
unsafe { from_glib_full(ffi::gst_query_new_accept_caps(caps.as_mut_ptr())) } unsafe { from_glib_full(ffi::gst_query_new_accept_caps(caps.as_mut_ptr())) }
} }
pub fn new_caps(filter: &::Caps) -> Self { pub fn new_caps<'a, P: Into<Option<&'a ::Caps>>>(filter: P) -> Self {
assert_initialized_main_thread!(); assert_initialized_main_thread!();
unsafe { from_glib_full(ffi::gst_query_new_caps(filter.as_mut_ptr())) } let filter = filter.into();
unsafe { from_glib_full(ffi::gst_query_new_caps(filter.to_glib_none().0)) }
} }
pub fn new_drain() -> Self { pub fn new_drain() -> Self {
@ -1016,19 +1017,27 @@ impl<'a> AcceptCaps<&'a mut QueryRef> {
pub struct Caps<T>(T); pub struct Caps<T>(T);
impl<'a> Caps<&'a QueryRef> { impl<'a> Caps<&'a QueryRef> {
pub fn get_filter(&self) -> &::CapsRef { pub fn get_filter(&self) -> Option<&::CapsRef> {
unsafe { unsafe {
let mut caps = ptr::null_mut(); let mut caps = ptr::null_mut();
ffi::gst_query_parse_caps(self.0.as_mut_ptr(), &mut caps); ffi::gst_query_parse_caps(self.0.as_mut_ptr(), &mut caps);
::CapsRef::from_ptr(caps) if caps.is_null() {
None
} else {
Some(::CapsRef::from_ptr(caps))
}
} }
} }
pub fn get_result(&self) -> &::CapsRef { pub fn get_result(&self) -> Option<&::CapsRef> {
unsafe { unsafe {
let mut caps = ptr::null_mut(); let mut caps = ptr::null_mut();
ffi::gst_query_parse_caps_result(self.0.as_mut_ptr(), &mut caps); ffi::gst_query_parse_caps_result(self.0.as_mut_ptr(), &mut caps);
::CapsRef::from_ptr(caps) if caps.is_null() {
None
} else {
Some(::CapsRef::from_ptr(caps))
}
} }
} }