From: Guillaume Pellerin Date: Wed, 31 Jan 2024 21:58:53 +0000 (+0100) Subject: hard double atmwq X-Git-Tag: 3.0~33 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0e5f384c9bad69af782d32ec87b9352fcaf4a010;p=telecaster-server.git hard double atmwq --- diff --git a/bin/streaming/tc_start.sh b/bin/streaming/tc_start.sh index 391f48e..8bd936d 100755 --- a/bin/streaming/tc_start.sh +++ b/bin/streaming/tc_start.sh @@ -20,7 +20,7 @@ $TELECASTER_SERVER/bin/streaming/tc_audio_mp3_icecast-gst1.sh & sleep 1 -$TELECASTER_SERVER/bin/streaming/tc_video_simple_webm_stream-gst1.sh & +$TELECASTER_SERVER/bin/streaming/tc_video_simple_webm_stream-gst1-double.sh & sleep 3 diff --git a/bin/streaming/tc_video_simple_webm_stream-gst1.sh b/bin/streaming/tc_video_simple_webm_stream-gst1.sh index 50cf7a4..108fb78 100755 --- a/bin/streaming/tc_video_simple_webm_stream-gst1.sh +++ b/bin/streaming/tc_video_simple_webm_stream-gst1.sh @@ -6,18 +6,16 @@ set -e source /etc/telecaster/telecaster.conf -ID=$1 - # V4L2 setup if [ ! -z "${V4L2_ZOOM-}" ]; then -v4l2-ctl -d $ID -c power_line_frequency=1 -v4l2-ctl -d $ID -c zoom_absolute=$V4L2_ZOOM -v4l2-ctl -d $ID -c focus_auto=0 -v4l2-ctl -d $ID -c focus_absolute=1 -v4l2-ctl -d $ID -c sharpness=$V4L2_SHARPNESS +v4l2-ctl -d $V4L2_ID -c power_line_frequency=1 +v4l2-ctl -d $V4L2_ID -c zoom_absolute=$V4L2_ZOOM +v4l2-ctl -d $V4L2_ID -c focus_auto=0 +v4l2-ctl -d $V4L2_ID -c focus_absolute=1 +v4l2-ctl -d $V4L2_ID -c sharpness=$V4L2_SHARPNESS fi -gst-launch-1.0 v4l2src device=/dev/video$ID ! $V4L2_FORMAT, width=$VIDEO_WIDTH, height=$VIDEO_HEIGHT, framerate=$VIDEO_FRAMERATE/1 \ +gst-launch-1.0 v4l2src device=/dev/video$V4L2_ID ! $V4L2_FORMAT, width=$VIDEO_WIDTH, height=$VIDEO_HEIGHT, framerate=$VIDEO_FRAMERATE/1 \ ! queue ! $V4L2_DEC \ ! queue ! videoflip method=$VIDEO_FLIP \ ! queue ! videoconvert \ @@ -33,7 +31,7 @@ gst-launch-1.0 v4l2src device=/dev/video$ID ! $V4L2_FORMAT, width=$VIDEO_WIDTH, ! queue ! opusenc bitrate=$AUDIO_OPUS_BITRATE \ ! queue ! muxout. \ webmmux streamable=true name=muxout \ - ! queue ! shout2send ip=127.0.0.1 port=8000 password=source2parisson mount=telecaster_live_$ID.webm + ! queue ! shout2send ip=127.0.0.1 port=8000 password=source2parisson mount=telecaster_live_$V4L2_ID.webm > /dev/null done