diff options
| -rwxr-xr-x | voctocore/experiments/failovertest.py | 2 | ||||
| -rwxr-xr-x | voctocore/experiments/test-grabber-src.sh | 2 | ||||
| -rwxr-xr-x | voctocore/experiments/video-grabber-src.sh | 2 | ||||
| -rw-r--r-- | voctocore/experiments/videodisplay.py | 7 |
4 files changed, 5 insertions, 8 deletions
diff --git a/voctocore/experiments/failovertest.py b/voctocore/experiments/failovertest.py index fd43d83..fd1f1ee 100755 --- a/voctocore/experiments/failovertest.py +++ b/voctocore/experiments/failovertest.py @@ -23,7 +23,7 @@ class Example: self.bus.connect('message::error', self.on_error) self.mixdisplay = VideomixerWithDisplay() - self.grabbersrc = ShmSrc('/tmp/grabber-v', Gst.Caps.from_string('video/x-raw,width=1280,height=720,framerate=25/1,format=BGRA')) + self.grabbersrc = ShmSrc('/tmp/grabber-v', Gst.Caps.from_string('video/x-raw,width=1280,height=720,framerate=25/1,format=RGB')) # Add elements to pipeline self.pipeline.add(self.mixdisplay) diff --git a/voctocore/experiments/test-grabber-src.sh b/voctocore/experiments/test-grabber-src.sh index 63fcec9..6e9cb2c 100755 --- a/voctocore/experiments/test-grabber-src.sh +++ b/voctocore/experiments/test-grabber-src.sh @@ -1,7 +1,7 @@ #!/bin/sh gst-launch-1.0 -vm \ videotestsrc !\ - video/x-raw,width=1280,height=720,framerate=25/1,format=BGRA !\ + video/x-raw,width=1280,height=720,framerate=25/1,format=RGB !\ queue !\ shmsink \ sync=true \ diff --git a/voctocore/experiments/video-grabber-src.sh b/voctocore/experiments/video-grabber-src.sh index b3feb16..bb178a9 100755 --- a/voctocore/experiments/video-grabber-src.sh +++ b/voctocore/experiments/video-grabber-src.sh @@ -10,7 +10,7 @@ gst-launch-1.0 -v \ videoconvert !\ videorate !\ videoscale !\ - video/x-raw,format=BGRA,width=1280,height=720,framerate=25/1 !\ + video/x-raw,format=RGB,width=1280,height=720,framerate=25/1 !\ shmsink \ sync=true \ socket-path=/tmp/grabber-v \ diff --git a/voctocore/experiments/videodisplay.py b/voctocore/experiments/videodisplay.py index 57087da..57f8903 100644 --- a/voctocore/experiments/videodisplay.py +++ b/voctocore/experiments/videodisplay.py @@ -9,7 +9,6 @@ class VideomixerWithDisplay(Gst.Bin): self.secondsrc = Gst.ElementFactory.make('videotestsrc', None) self.mixer = Gst.ElementFactory.make('videomixer', None) self.ident = Gst.ElementFactory.make('identity', None) - self.conv = Gst.ElementFactory.make('videoconvert', None) self.q1 = Gst.ElementFactory.make('queue', None) self.q2 = Gst.ElementFactory.make('queue', None) self.display = Gst.ElementFactory.make('ximagesink', None) @@ -18,7 +17,6 @@ class VideomixerWithDisplay(Gst.Bin): self.add(self.secondsrc) self.add(self.mixer) self.add(self.ident) - self.add(self.conv) self.add(self.display) self.add(self.q1) self.add(self.q2) @@ -41,11 +39,10 @@ class VideomixerWithDisplay(Gst.Bin): self.q1.get_static_pad('src').link(self.firstpad) self.q2.get_static_pad('src').link(self.secondpad) - self.secondsrc.link_filtered(self.ident, Gst.Caps.from_string('video/x-raw,format=BGRA,width=400,height=400,framerate=25/1')) + self.secondsrc.link_filtered(self.ident, Gst.Caps.from_string('video/x-raw,width=400,height=400,framerate=25/1,format=RGB')) self.ident.link(self.q2) - self.mixer.link(self.conv) - self.conv.link(self.display) + self.mixer.link(self.display) # Add Ghost Pads self.add_pad( |