Revert "fix: add videoconvert before videoflip"

This reverts commit 05e2da7. Not helpful and did not fix negotiation issue with dmabuf + pipewiresrc
SeaDve · Jul 22, 2024 · df07762 · df07762
1 parent a279328
commit df07762
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/src/pipeline.rs b/src/pipeline.rs
@@ -247,15 +247,15 @@ fn make_videocrop(data: &SelectAreaData) -> Result<gst::Element> {
 ///
 /// Single stream:
 ///
-/// pipewiresrc -> videoconvert -> videoflip -> videorate
+/// pipewiresrc -> videoflip -> videorate
 ///
 /// Multiple streams:
 ///
-/// pipewiresrc1 -> videoconvert -> videoflip -> |
-///                                              |
-/// pipewiresrc2 -> videoconvert -> videoflip -> | -> compositor -> videorate
-///                                              |
-/// pipewiresrcn -> videoconvert -> videoflip -> |
+/// pipewiresrc1 -> videoflip -> |
+///                              |
+/// pipewiresrc2 -> videoflip -> | -> compositor -> videorate
+///                              |
+/// pipewiresrcn -> videoflip -> |
 pub fn make_videosrc_bin(
     fd: RawFd,
     streams: &[Stream],
@@ -283,10 +283,9 @@ pub fn make_videosrc_bin(
         [] => bail!("No streams provided"),
         [stream] => {
             let pipewiresrc = make_pipewiresrc(fd, &stream.node_id().to_string())?;
-            let videoconvert = gst::ElementFactory::make("videoconvert").build()?;
             let videoflip = make_videoflip()?;
-            bin.add_many([&pipewiresrc, &videoconvert, &videoflip])?;
-            gst::Element::link_many([&pipewiresrc, &videoconvert, &videoflip, &videorate])?;
+            bin.add_many([&pipewiresrc, &videoflip])?;
+            gst::Element::link_many([&pipewiresrc, &videoflip, &videorate])?;
         }
         streams => {
             let compositor = gst::ElementFactory::make("compositor").build()?;
@@ -296,14 +295,12 @@ pub fn make_videosrc_bin(
             let mut last_pos = 0;
             for stream in streams {
                 let pipewiresrc = make_pipewiresrc(fd, &stream.node_id().to_string())?;
-                let videoconvert = gst::ElementFactory::make("videoconvert").build()?;
                 let videoflip = make_videoflip()?;
-                bin.add_many([&pipewiresrc, &videoconvert, &videoflip])?;
+                bin.add_many([&pipewiresrc, &videoflip])?;
                 pipewiresrc.link_filtered(
-                    &videoconvert,
+                    &videoflip,
                     &optional_dmabuf_feature_caps(gst::Structure::builder("video/x-raw").build()),
                 )?;
-                videoconvert.link(&videoflip)?;
 
                 let compositor_sink_pad = compositor
                     .request_pad_simple("sink_%u")