diff options
| author | MaZderMind <peter@mazdermind.de> | 2014-09-18 11:49:36 +0200 |
|---|---|---|
| committer | MaZderMind <peter@mazdermind.de> | 2014-09-18 11:49:36 +0200 |
| commit | 33ae6e1aac59b4d120ed3b8a319c6eb0ed5045cf (patch) | |
| tree | 9bef83e15aea02c739c4a23aef47dd9e78bac53f /voctocore/scripts | |
| parent | 1e8589e2895eec33ec344f60a9579b118e751312 (diff) | |
enable audioswitch, use a payloader to transfer buffer timestamps through the shm-bridge and keep a/v sync intact
Diffstat (limited to 'voctocore/scripts')
| -rwxr-xr-x | voctocore/scripts/videosrc1.sh | 13 | ||||
| -rwxr-xr-x | voctocore/scripts/videosrc2.sh | 15 |
2 files changed, 13 insertions, 15 deletions
diff --git a/voctocore/scripts/videosrc1.sh b/voctocore/scripts/videosrc1.sh index 39e5212..fe34b16 100755 --- a/voctocore/scripts/videosrc1.sh +++ b/voctocore/scripts/videosrc1.sh @@ -1,8 +1,9 @@ #!/bin/sh +mkdir -p /tmp/voctomix-sockets/ rm -f /tmp/voctomix-sockets/v-cam1 /tmp/voctomix-sockets/a-cam1 gst-launch-1.0 -v \ uridecodebin \ - uri=file:///home/peter/ED_1280.avi \ + uri=file:///home/peter/avsync.mp4 \ name=src \ \ src. !\ @@ -12,20 +13,18 @@ gst-launch-1.0 -v \ videorate !\ videoscale !\ video/x-raw,format=RGBx,width=1280,height=720,framerate=25/1 !\ + gdppay !\ shmsink \ - sync=true \ socket-path=/tmp/voctomix-sockets/v-cam1 \ - wait-for-connection=false \ shm-size=100000000 \ \ src. !\ queue !\ + audioresample !\ audioconvert !\ - audiorate !\ - audio/x-raw,format=F32LE,layout=interleaved,channels=2,rate=48000 !\ + audio/x-raw,format=S16LE,layout=interleaved,rate=48000,channels=2 !\ + gdppay !\ shmsink \ - sync=true \ socket-path=/tmp/voctomix-sockets/a-cam1 \ - wait-for-connection=false \ shm-size=10000000 diff --git a/voctocore/scripts/videosrc2.sh b/voctocore/scripts/videosrc2.sh index e136495..1c5bc56 100755 --- a/voctocore/scripts/videosrc2.sh +++ b/voctocore/scripts/videosrc2.sh @@ -1,8 +1,9 @@ #!/bin/sh +mkdir -p /tmp/voctomix-sockets/ rm -f /tmp/voctomix-sockets/v-cam2 /tmp/voctomix-sockets/a-cam2 gst-launch-1.0 -v \ uridecodebin \ - uri=file:///home/peter/Sintel.2010.720p.mkv \ + uri=file:///home/peter/ED_1280.avi \ name=src \ \ src. !\ @@ -11,20 +12,18 @@ gst-launch-1.0 -v \ videoconvert !\ videorate !\ videoscale !\ - video/x-raw,format=RGBx,width=1280,height=720,framerate=25/1 !\ + video/x-raw,format=RGBx,width=1280,height=720,framerate=25/1,pixel-aspect-ratio=1/1 !\ + gdppay !\ shmsink \ - sync=true \ socket-path=/tmp/voctomix-sockets/v-cam2 \ - wait-for-connection=false \ shm-size=100000000 \ \ src. !\ queue !\ + audioresample !\ audioconvert !\ - audiorate !\ - audio/x-raw,format=F32LE,layout=interleaved,channels=2,rate=48000 !\ + audio/x-raw,format=S16LE,layout=interleaved,rate=48000,channels=2 !\ + gdppay !\ shmsink \ - sync=true \ socket-path=/tmp/voctomix-sockets/a-cam2 \ - wait-for-connection=false \ shm-size=10000000 |