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

analytics: Allow empty object type

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1407>
This commit is contained in:
Olivier Crête 2024-03-11 16:10:37 -04:00 committed by GStreamer Marge Bot
parent 82f6accc31
commit 3246f4fb5b
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gstreamer-analytics/src/object_detection.rs
View file

@ -82,11 +82,15 @@ unsafe fn from(t: ffi::GstAnalyticsMtd) -> ffi::GstAnalyticsODMtd {
impl<'a> AnalyticsMtdRef<'a, AnalyticsODMtd> { impl<'a> AnalyticsMtdRef<'a, AnalyticsODMtd> {
#[doc(alias = "gst_analytics_od_mtd_get_obj_type")] #[doc(alias = "gst_analytics_od_mtd_get_obj_type")]
pub fn obj_type(&self) -> glib::Quark { pub fn obj_type(&self) -> Option<glib::Quark> {
unsafe { unsafe {
let mut mtd = from(ffi::GstAnalyticsMtd::unsafe_from(self)); let mut mtd = from(ffi::GstAnalyticsMtd::unsafe_from(self));
let type_ = ffi::gst_analytics_od_mtd_get_obj_type(&mut mtd); let type_ = ffi::gst_analytics_od_mtd_get_obj_type(&mut mtd);
glib::Quark::from_glib(type_) if type_ == 0 {
None
} else {
Some(glib::Quark::from_glib(type_))
}
} }
} }
@ -143,7 +147,7 @@ mod tests {
.add_od_mtd(glib::Quark::from_str("blb"), 0, 1, 10, 20, 0.8) .add_od_mtd(glib::Quark::from_str("blb"), 0, 1, 10, 20, 0.8)
.unwrap(); .unwrap();
assert_eq!(od.obj_type(), glib::Quark::from_str("blb")); assert_eq!(od.obj_type().unwrap(), glib::Quark::from_str("blb"));
let loc = od.location().unwrap(); let loc = od.location().unwrap();
@ -159,7 +163,7 @@ mod tests {
let meta2 = buf.meta::<AnalyticsRelationMeta>().unwrap(); let meta2 = buf.meta::<AnalyticsRelationMeta>().unwrap();
let od2 = meta2.mtd::<AnalyticsODMtd>(0).unwrap(); let od2 = meta2.mtd::<AnalyticsODMtd>(0).unwrap();
assert_eq!(od2.obj_type(), glib::Quark::from_str("blb")); assert_eq!(od2.obj_type().unwrap(), glib::Quark::from_str("blb"));
let loc = od2.location().unwrap(); let loc = od2.location().unwrap();
assert_eq!(loc.x, 0); assert_eq!(loc.x, 0);

6
gstreamer-analytics/src/relation_meta.rs
View file

@ -652,13 +652,13 @@ mod tests {
assert_eq!(meta.len(), meta.iter::<AnalyticsAnyMtd>().count()); assert_eq!(meta.len(), meta.iter::<AnalyticsAnyMtd>().count());
assert_eq!(meta.len(), meta.iter::<AnalyticsODMtd>().count()); assert_eq!(meta.len(), meta.iter::<AnalyticsODMtd>().count());
for mtd in meta.iter::<AnalyticsODMtd>() { for mtd in meta.iter::<AnalyticsODMtd>() {
assert_eq!(mtd.obj_type(), glib::Quark::from_str("blb")) assert_eq!(mtd.obj_type().unwrap(), glib::Quark::from_str("blb"))
} }
assert_eq!(meta.len(), meta.iter::<AnalyticsAnyMtd>().count()); assert_eq!(meta.len(), meta.iter::<AnalyticsAnyMtd>().count());
for mtd in meta.iter::<AnalyticsAnyMtd>() { for mtd in meta.iter::<AnalyticsAnyMtd>() {
if let Ok(mtd) = mtd.downcast::<AnalyticsODMtd>() { if let Ok(mtd) = mtd.downcast::<AnalyticsODMtd>() {
assert_eq!(mtd.obj_type(), glib::Quark::from_str("blb")) assert_eq!(mtd.obj_type().unwrap(), glib::Quark::from_str("blb"))
} }
} }
@ -689,7 +689,7 @@ mod tests {
0 0
); );
for mtd in meta.iter_direct_related::<AnalyticsODMtd>(od1_id, crate::RelTypes::IS_PART_OF) { for mtd in meta.iter_direct_related::<AnalyticsODMtd>(od1_id, crate::RelTypes::IS_PART_OF) {
assert_eq!(mtd.obj_type(), glib::Quark::from_str("blb")) assert_eq!(mtd.obj_type().unwrap(), glib::Quark::from_str("blb"))
} }
let mut meta = buf.make_mut().meta_mut::<AnalyticsRelationMeta>().unwrap(); let mut meta = buf.make_mut().meta_mut::<AnalyticsRelationMeta>().unwrap();