From 9d8de8cd6752676c3d44acaffb5aeb06537b2863 Mon Sep 17 00:00:00 2001 From: MaZderMind Date: Tue, 19 May 2015 13:31:24 +0200 Subject: remove costly textoverlays --- voctocore/lib/avpreviewoutput.py | 2 -- voctocore/lib/avrawoutput.py | 2 -- voctocore/lib/avsource.py | 2 -- voctocore/lib/videomix.py | 2 -- voctocore/scripts/av-record-cam1-mirror.sh | 2 -- voctocore/scripts/av-record-output.sh | 2 -- voctocore/scripts/av-source-eevblog.sh | 2 -- 7 files changed, 14 deletions(-) (limited to 'voctocore') diff --git a/voctocore/lib/avpreviewoutput.py b/voctocore/lib/avpreviewoutput.py index b1bc27f..263edea 100644 --- a/voctocore/lib/avpreviewoutput.py +++ b/voctocore/lib/avpreviewoutput.py @@ -25,8 +25,6 @@ class AVPreviewOutput(TCPMultiConnection): intervideosrc channel=video_{channel} ! {vcaps_in} ! - textoverlay halignment=left valignment=top ypad=75 text=AVPreviewOutput ! - timeoverlay halignment=left valignment=top ypad=75 xpad=400 ! videorate ! videoscale ! {vcaps_out} ! diff --git a/voctocore/lib/avrawoutput.py b/voctocore/lib/avrawoutput.py index 912c292..bda6b77 100644 --- a/voctocore/lib/avrawoutput.py +++ b/voctocore/lib/avrawoutput.py @@ -20,8 +20,6 @@ class AVRawOutput(TCPMultiConnection): intervideosrc channel=video_{channel} ! {vcaps} ! - textoverlay halignment=left valignment=top ypad=75 text=AVRawOutput ! - timeoverlay halignment=left valignment=top ypad=75 xpad=400 ! queue ! mux. diff --git a/voctocore/lib/avsource.py b/voctocore/lib/avsource.py index c84ce85..9b2a6ea 100644 --- a/voctocore/lib/avsource.py +++ b/voctocore/lib/avsource.py @@ -40,8 +40,6 @@ class AVSource(TCPSingleConnection): pipeline += """ demux. ! {vcaps} ! - textoverlay halignment=left valignment=top ypad=25 text=AVSource ! - timeoverlay halignment=left valignment=top ypad=25 xpad=400 ! queue ! tee name=vtee diff --git a/voctocore/lib/videomix.py b/voctocore/lib/videomix.py index bd4ca70..d27c3e3 100644 --- a/voctocore/lib/videomix.py +++ b/voctocore/lib/videomix.py @@ -21,8 +21,6 @@ class VideoMix(object): pipeline = """ videomixer name=mix ! {caps} ! - textoverlay halignment=left valignment=top ypad=125 text=VideoMix ! - timeoverlay halignment=left valignment=top ypad=125 xpad=400 ! queue ! tee name=tee diff --git a/voctocore/scripts/av-record-cam1-mirror.sh b/voctocore/scripts/av-record-cam1-mirror.sh index d4e4515..5726535 100755 --- a/voctocore/scripts/av-record-cam1-mirror.sh +++ b/voctocore/scripts/av-record-cam1-mirror.sh @@ -5,8 +5,6 @@ gst-launch-1.0 \ \ demux. !\ queue !\ - textoverlay halignment=left valignment=top ypad=250 text=Recording !\ - timeoverlay halignment=left valignment=top ypad=250 xpad=400 !\ avenc_mpeg2video bitrate=5000000 max-key-interval=0 !\ queue !\ mux. \ diff --git a/voctocore/scripts/av-record-output.sh b/voctocore/scripts/av-record-output.sh index 016e5a8..ef306ed 100755 --- a/voctocore/scripts/av-record-output.sh +++ b/voctocore/scripts/av-record-output.sh @@ -5,8 +5,6 @@ gst-launch-1.0 \ \ demux. !\ queue !\ - textoverlay halignment=left valignment=top ypad=250 text=Recording !\ - timeoverlay halignment=left valignment=top ypad=250 xpad=400 !\ avenc_mpeg2video bitrate=5000000 max-key-interval=0 !\ queue !\ mux. \ diff --git a/voctocore/scripts/av-source-eevblog.sh b/voctocore/scripts/av-source-eevblog.sh index 03c2528..0ed237d 100755 --- a/voctocore/scripts/av-source-eevblog.sh +++ b/voctocore/scripts/av-source-eevblog.sh @@ -8,8 +8,6 @@ gst-launch-1.0 \ videoconvert !\ videoscale !\ video/x-raw,format=I420,width=1280,height=720,framerate=25/1,pixel-aspect-ratio=1/1 ! \ - textoverlay halignment=left valignment=top ypad=300 text=Playback !\ - timeoverlay halignment=left valignment=top ypad=300 xpad=400 !\ mux. \ \ src. !\ -- cgit v1.2.3