From 932c940102fe5ae002181374573431d48ffb2c25 Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.com>
Date: Mon, 20 Apr 2020 12:30:05 +0200
Subject: [PATCH] gstreamer: caps: add new_from_iter(_with_features)()

---
 gstreamer/src/caps.rs | 49 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/gstreamer/src/caps.rs b/gstreamer/src/caps.rs
index 6d5e85dd0..090e4d428 100644
--- a/gstreamer/src/caps.rs
+++ b/gstreamer/src/caps.rs
@@ -70,6 +70,36 @@ impl Caps {
         caps
     }
 
+    #[allow(clippy::should_implement_trait)]
+    pub fn from_iter<'a, I>(iter: I) -> Self
+    where
+        I: IntoIterator<Item = &'a StructureRef>,
+    {
+        assert_initialized_main_thread!();
+        let mut caps = Caps::new_empty();
+
+        iter.into_iter()
+            .for_each(|s| caps.get_mut().unwrap().append_structure(s.to_owned()));
+
+        caps
+    }
+
+    pub fn from_iter_with_features<'a, 'b, I>(iter: I) -> Self
+    where
+        I: IntoIterator<Item = (&'a StructureRef, &'b CapsFeaturesRef)>,
+    {
+        assert_initialized_main_thread!();
+        let mut caps = Caps::new_empty();
+
+        iter.into_iter().for_each(|(s, f)| {
+            caps.get_mut()
+                .unwrap()
+                .append_structure_full(s.to_owned(), Some(f.to_owned()))
+        });
+
+        caps
+    }
+
     pub fn fixate(&mut self) {
         skip_assert_initialized!();
         unsafe {
@@ -863,4 +893,23 @@ mod tests {
             .build();
         assert_eq!(caps.to_string(), "audio/x-raw(ANY)");
     }
+
+    #[test]
+    fn test_new_from_iter() {
+        ::init().unwrap();
+
+        let caps = Caps::builder_full_with_any_features()
+            .structure(Structure::builder("audio/x-raw").build())
+            .structure(Structure::builder("video/x-raw").build())
+            .build();
+
+        let audio = Caps::from_iter(caps.iter().filter(|s| s.get_name() == "audio/x-raw"));
+        assert_eq!(audio.to_string(), "audio/x-raw");
+
+        let audio = Caps::from_iter_with_features(
+            caps.iter_with_features()
+                .filter(|(s, _)| s.get_name() == "audio/x-raw"),
+        );
+        assert_eq!(audio.to_string(), "audio/x-raw(ANY)");
+    }
 }