diff options
| author | MaZderMind <peter@mazdermind.de> | 2014-08-15 10:05:06 +0200 |
|---|---|---|
| committer | MaZderMind <peter@mazdermind.de> | 2014-08-15 10:05:06 +0200 |
| commit | e98f8d9b23ca532f29526bdfa700c606ebfd39bf (patch) | |
| tree | 3136c620f7949f14ac54bcad2a181469662b51fc | |
| parent | 298a7daa86ebd2e1f5f838fc3d4a4da7151cb6a8 (diff) | |
use RGBx, seems to be less cpu intense on the test machine (32bit alignemnt)
| -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 | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/voctocore/experiments/failovertest.py b/voctocore/experiments/failovertest.py index fd1f1ee..d827de0 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=RGB')) + self.grabbersrc = ShmSrc('/tmp/grabber-v', Gst.Caps.from_string('video/x-raw,width=1280,height=720,framerate=25/1,format=RGBx')) # 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 6e9cb2c..7978b69 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=RGB !\ + video/x-raw,width=1280,height=720,framerate=25/1,format=RGBx !\ queue !\ shmsink \ sync=true \ diff --git a/voctocore/experiments/video-grabber-src.sh b/voctocore/experiments/video-grabber-src.sh index bb178a9..02ba1b9 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=RGB,width=1280,height=720,framerate=25/1 !\ + video/x-raw,format=RGBx,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 57f8903..b8b7a86 100644 --- a/voctocore/experiments/videodisplay.py +++ b/voctocore/experiments/videodisplay.py @@ -39,7 +39,7 @@ 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,width=400,height=400,framerate=25/1,format=RGB')) + self.secondsrc.link_filtered(self.ident, Gst.Caps.from_string('video/x-raw,width=400,height=400,framerate=25/1,format=RGBx')) self.ident.link(self.q2) self.mixer.link(self.display) |