From 943ab31a0f32b7bb50fa1ff90c9ce8d72b232cfd Mon Sep 17 00:00:00 2001 From: MaZderMind Date: Wed, 13 May 2015 19:35:20 +0200 Subject: experiment with transporting uncompressed a/v together in a matroska stream --- voctocore/scripts/audio-play-cam1-mirror.sh | 4 ++-- voctocore/scripts/audio-play-cam2-mirror.sh | 6 ++--- voctocore/scripts/audio-source-cam1.sh | 6 ----- voctocore/scripts/audio-source-cam2.sh | 6 ----- voctocore/scripts/audio-visualize-cam1-mirror.sh | 4 ++-- voctocore/scripts/av-play-cam1-mirror.sh | 13 +++++++---- voctocore/scripts/av-record-cam1-mirror.sh | 9 ++++---- voctocore/scripts/av-source-avsync.sh | 29 ++++++++++++------------ voctocore/scripts/av-source-cam1.sh | 13 +++++++++++ voctocore/scripts/av-source-cam2.sh | 13 +++++++++++ voctocore/scripts/av-source-eevblog.sh | 29 ++++++++++++------------ voctocore/scripts/video-play-cam1-mirror.sh | 2 +- voctocore/scripts/video-play-cam2-mirror.sh | 2 +- voctocore/scripts/video-play-mixer-output.sh | 2 +- voctocore/scripts/video-source-cam1.sh | 7 ------ voctocore/scripts/video-source-cam2.sh | 7 ------ 16 files changed, 79 insertions(+), 73 deletions(-) delete mode 100755 voctocore/scripts/audio-source-cam1.sh delete mode 100755 voctocore/scripts/audio-source-cam2.sh create mode 100755 voctocore/scripts/av-source-cam1.sh create mode 100755 voctocore/scripts/av-source-cam2.sh delete mode 100755 voctocore/scripts/video-source-cam1.sh delete mode 100755 voctocore/scripts/video-source-cam2.sh (limited to 'voctocore/scripts') diff --git a/voctocore/scripts/audio-play-cam1-mirror.sh b/voctocore/scripts/audio-play-cam1-mirror.sh index d85a390..6b60a9b 100755 --- a/voctocore/scripts/audio-play-cam1-mirror.sh +++ b/voctocore/scripts/audio-play-cam1-mirror.sh @@ -1,5 +1,5 @@ #!/bin/sh gst-launch-1.0 \ - tcpclientsrc host=localhost port=23000 !\ - gdpdepay !\ + tcpclientsrc host=localhost port=13000 !\ + matroskademux !\ alsasink diff --git a/voctocore/scripts/audio-play-cam2-mirror.sh b/voctocore/scripts/audio-play-cam2-mirror.sh index 6881e43..e9f2fb1 100755 --- a/voctocore/scripts/audio-play-cam2-mirror.sh +++ b/voctocore/scripts/audio-play-cam2-mirror.sh @@ -1,5 +1,5 @@ #!/bin/sh gst-launch-1.0 \ - tcpclientsrc host=localhost port=23001 !\ - gdpdepay !\ - alsasink sync=false + tcpclientsrc host=localhost port=13001 !\ + matroskademux !\ + alsasink diff --git a/voctocore/scripts/audio-source-cam1.sh b/voctocore/scripts/audio-source-cam1.sh deleted file mode 100755 index f42bc3f..0000000 --- a/voctocore/scripts/audio-source-cam1.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -gst-launch-1.0 \ - audiotestsrc freq=440 !\ - audio/x-raw,format=S16LE,channels=2,layout=interleaved,rate=48000 !\ - gdppay !\ - tcpclientsink host=localhost port=20000 diff --git a/voctocore/scripts/audio-source-cam2.sh b/voctocore/scripts/audio-source-cam2.sh deleted file mode 100755 index 84de3cb..0000000 --- a/voctocore/scripts/audio-source-cam2.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -gst-launch-1.0 \ - audiotestsrc freq=330 !\ - audio/x-raw,format=S16LE,channels=2,layout=interleaved,rate=48000 !\ - gdppay !\ - tcpclientsink host=localhost port=20001 diff --git a/voctocore/scripts/audio-visualize-cam1-mirror.sh b/voctocore/scripts/audio-visualize-cam1-mirror.sh index 3119e7e..53aabb1 100755 --- a/voctocore/scripts/audio-visualize-cam1-mirror.sh +++ b/voctocore/scripts/audio-visualize-cam1-mirror.sh @@ -1,7 +1,7 @@ #!/bin/sh gst-launch-1.0 \ - tcpclientsrc host=localhost port=23000 !\ - gdpdepay !\ + tcpclientsrc host=localhost port=13000 !\ + matroskademux !\ wavescope shader=none style=lines !\ video/x-raw,width=800,height=300 !\ videoconvert !\ diff --git a/voctocore/scripts/av-play-cam1-mirror.sh b/voctocore/scripts/av-play-cam1-mirror.sh index 9149cd7..0e0e1e9 100755 --- a/voctocore/scripts/av-play-cam1-mirror.sh +++ b/voctocore/scripts/av-play-cam1-mirror.sh @@ -1,9 +1,12 @@ #!/bin/sh gst-launch-1.0 \ tcpclientsrc host=localhost port=13000 !\ - gdpdepay !\ - xvimagesink \ + matroskademux name=demux \ \ - tcpclientsrc host=localhost port=23000 !\ - gdpdepay !\ - alsasink sync=false + demux. !\ + queue !\ + xvimagesink ts-offset=1000000000 \ + \ + demux. !\ + queue !\ + alsasink provide-clock=false ts-offset=1000000000 diff --git a/voctocore/scripts/av-record-cam1-mirror.sh b/voctocore/scripts/av-record-cam1-mirror.sh index 0a33a97..2e7899d 100755 --- a/voctocore/scripts/av-record-cam1-mirror.sh +++ b/voctocore/scripts/av-record-cam1-mirror.sh @@ -1,17 +1,18 @@ #!/bin/sh gst-launch-1.0 \ tcpclientsrc host=localhost port=13000 !\ - gdpdepay !\ + matroskademux name=demux \ + \ + demux. !\ queue !\ timeoverlay !\ - videoconvert !\ avenc_mpeg2video bitrate=5000000 max-key-interval=0 !\ queue !\ mux. \ \ - tcpclientsrc host=localhost port=23000 !\ - gdpdepay !\ + demux. !\ queue !\ + audioconvert !\ avenc_mp2 bitrate=192000 !\ queue !\ mux. \ diff --git a/voctocore/scripts/av-source-avsync.sh b/voctocore/scripts/av-source-avsync.sh index 756d83b..0276202 100755 --- a/voctocore/scripts/av-source-avsync.sh +++ b/voctocore/scripts/av-source-avsync.sh @@ -5,19 +5,20 @@ gst-launch-1.0 -vm \ name=src \ \ src. !\ - queue !\ - videoconvert !\ - videoscale !\ - video/x-raw,format=I420,width=1280,height=720,framerate=25/1,pixel-aspect-ratio=1/1 ! \ - timeoverlay valignment=bottom ! \ - gdppay ! \ - tcpclientsink host=localhost port=10000 \ + queue !\ + videoconvert !\ + videoscale !\ + video/x-raw,format=I420,width=1280,height=720,framerate=25/1,pixel-aspect-ratio=1/1 ! \ + timeoverlay valignment=bottom ! \ + mux. \ \ src. !\ - queue !\ - audioconvert !\ - audioresample !\ - audiorate !\ - audio/x-raw,format=S16LE,channels=2,layout=interleaved,rate=48000 !\ - gdppay !\ - tcpclientsink host=localhost port=20000 + queue !\ + audioconvert !\ + audioresample !\ + audiorate !\ + audio/x-raw,format=S16LE,channels=2,layout=interleaved,rate=48000 !\ + mux. \ + \ + matroskamux name=mux !\ + tcpclientsrc host=localhost port=10000 diff --git a/voctocore/scripts/av-source-cam1.sh b/voctocore/scripts/av-source-cam1.sh new file mode 100755 index 0000000..11b9663 --- /dev/null +++ b/voctocore/scripts/av-source-cam1.sh @@ -0,0 +1,13 @@ +#!/bin/sh +gst-launch-1.0 -vm \ + videotestsrc pattern=smpte !\ + video/x-raw,format=I420,width=1280,height=720,framerate=25/1,pixel-aspect-ratio=1/1 ! \ + timeoverlay valignment=bottom ! \ + mux. \ + \ + audiotestsrc freq=440 !\ + audio/x-raw,format=S16LE,channels=2,layout=interleaved,rate=48000 !\ + mux. \ + \ + matroskamux name=mux !\ + tcpclientsrc host=localhost port=10000 diff --git a/voctocore/scripts/av-source-cam2.sh b/voctocore/scripts/av-source-cam2.sh new file mode 100755 index 0000000..139a507 --- /dev/null +++ b/voctocore/scripts/av-source-cam2.sh @@ -0,0 +1,13 @@ +#!/bin/sh +gst-launch-1.0 -vm \ + videotestsrc pattern=ball !\ + video/x-raw,format=I420,width=1280,height=720,framerate=25/1,pixel-aspect-ratio=1/1 ! \ + timeoverlay valignment=bottom ! \ + mux. \ + \ + audiotestsrc freq=330 !\ + audio/x-raw,format=S16LE,channels=2,layout=interleaved,rate=48000 !\ + mux. \ + \ + matroskamux name=mux !\ + tcpclientsrc host=localhost port=10001 diff --git a/voctocore/scripts/av-source-eevblog.sh b/voctocore/scripts/av-source-eevblog.sh index 1175b88..f99e43f 100755 --- a/voctocore/scripts/av-source-eevblog.sh +++ b/voctocore/scripts/av-source-eevblog.sh @@ -4,19 +4,20 @@ gst-launch-1.0 -vm \ decodebin name=src \ \ src. !\ - queue !\ - videoconvert !\ - videoscale !\ - video/x-raw,format=I420,width=1280,height=720,framerate=25/1,pixel-aspect-ratio=1/1 ! \ - timeoverlay valignment=bottom ! \ - gdppay ! \ - tcpclientsink host=localhost port=10000 \ + queue !\ + videoconvert !\ + videoscale !\ + video/x-raw,format=I420,width=1280,height=720,framerate=25/1,pixel-aspect-ratio=1/1 ! \ + timeoverlay valignment=bottom ! \ + mux. \ \ src. !\ - queue !\ - audioconvert !\ - audioresample !\ - audiorate !\ - audio/x-raw,format=S16LE,channels=2,layout=interleaved,rate=48000 !\ - gdppay !\ - tcpclientsink host=localhost port=20000 + queue !\ + audioconvert !\ + audioresample !\ + audiorate !\ + audio/x-raw,format=S16LE,channels=2,layout=interleaved,rate=48000 !\ + mux. \ + \ + matroskamux name=mux !\ + tcpclientsink host=localhost port=10000 diff --git a/voctocore/scripts/video-play-cam1-mirror.sh b/voctocore/scripts/video-play-cam1-mirror.sh index 75e65c7..ec3605b 100755 --- a/voctocore/scripts/video-play-cam1-mirror.sh +++ b/voctocore/scripts/video-play-cam1-mirror.sh @@ -1,5 +1,5 @@ #!/bin/sh gst-launch-1.0 \ tcpclientsrc host=localhost port=13000 !\ - gdpdepay !\ + matroskademux !\ xvimagesink diff --git a/voctocore/scripts/video-play-cam2-mirror.sh b/voctocore/scripts/video-play-cam2-mirror.sh index b4ff9e5..e42ca6a 100755 --- a/voctocore/scripts/video-play-cam2-mirror.sh +++ b/voctocore/scripts/video-play-cam2-mirror.sh @@ -1,5 +1,5 @@ #!/bin/sh gst-launch-1.0 \ tcpclientsrc host=localhost port=13001 !\ - gdpdepay !\ + matroskademux !\ xvimagesink diff --git a/voctocore/scripts/video-play-mixer-output.sh b/voctocore/scripts/video-play-mixer-output.sh index c33b8f3..abb3174 100755 --- a/voctocore/scripts/video-play-mixer-output.sh +++ b/voctocore/scripts/video-play-mixer-output.sh @@ -1,5 +1,5 @@ #!/bin/sh gst-launch-1.0 \ tcpclientsrc host=localhost port=11000 !\ - gdpdepay !\ + matroskademux !\ xvimagesink diff --git a/voctocore/scripts/video-source-cam1.sh b/voctocore/scripts/video-source-cam1.sh deleted file mode 100755 index e920c43..0000000 --- a/voctocore/scripts/video-source-cam1.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -gst-launch-1.0 \ - videotestsrc !\ - video/x-raw,format=I420,width=1280,height=720,framerate=25/1,pixel-aspect-ratio=1/1 !\ - timeoverlay valignment=bottom !\ - gdppay !\ - tcpclientsink host=localhost port=10000 diff --git a/voctocore/scripts/video-source-cam2.sh b/voctocore/scripts/video-source-cam2.sh deleted file mode 100755 index 403b852..0000000 --- a/voctocore/scripts/video-source-cam2.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -gst-launch-1.0 \ - videotestsrc pattern=ball !\ - video/x-raw,format=I420,width=1280,height=720,framerate=25/1,pixel-aspect-ratio=1/1 !\ - timeoverlay valignment=bottom !\ - gdppay !\ - tcpclientsink host=localhost port=10001 -- cgit v1.2.3