From: Guillaume Pellerin <guillaume.pellerin@free.fr>
Date: Tue, 27 Feb 2024 21:00:23 +0000 (+0100)
Subject: add VIDEO_FORMAT and VIDEO_DECODER
X-Git-Tag: 3.0.1~15
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ae0cffb4b689f696c6904656285ad10520f4cd31;p=telecaster-server.git

add VIDEO_FORMAT and VIDEO_DECODER
---

diff --git a/bin/streaming/tc_video_simple_webm_stream-gst1.sh b/bin/streaming/tc_video_simple_webm_stream-gst1.sh
index 85c1a8d..035378d 100755
--- a/bin/streaming/tc_video_simple_webm_stream-gst1.sh
+++ b/bin/streaming/tc_video_simple_webm_stream-gst1.sh
@@ -15,10 +15,12 @@ V4L2_SHARPNESS=128
 #VIDEO_FRAMERATE=24
 
 # C922
-VIDEO_WIDTH=864
-VIDEO_HEIGHT=480
-VIDEO_FRAMERATE=24
+VIDEO_WIDTH=1280
+VIDEO_HEIGHT=720
+VIDEO_FRAMERATE=30
 VIDEO_FLIP=none
+VIDEO_FORMAT="video/x-raw, format=YUY2"
+VIDEO_DECODER="identity"
 
 # Audio
 AUDIO_CHANNELS=2
@@ -36,7 +38,8 @@ v4l2-ctl -d $V4L2_ID -c focus_absolute=1
 v4l2-ctl -d $V4L2_ID -c sharpness=$V4L2_SHARPNESS
 
 # GST launch
-gst-launch-1.0 v4l2src device=/dev/video$V4L2_ID ! video/x-raw, format=YUY2, width=$VIDEO_WIDTH, height=$VIDEO_HEIGHT, framerate=$VIDEO_FRAMERATE/1  \
+gst-launch-1.0 v4l2src device=/dev/video$V4L2_ID ! $VIDEO_FORMAT, width=$VIDEO_WIDTH, height=$VIDEO_HEIGHT, framerate=$VIDEO_FRAMERATE/1  \
+	! queue ! $VIDEO_DECODER \
 	! queue ! videoflip method=$VIDEO_FLIP \
 	! queue ! videoconvert \
 	! queue ! vp8enc threads=4 deadline=2 \
diff --git a/etc/telecaster/telecaster.conf b/etc/telecaster/telecaster.conf
index 37a642a..58a83a8 100755
--- a/etc/telecaster/telecaster.conf
+++ b/etc/telecaster/telecaster.conf
@@ -21,10 +21,12 @@ V4L2_SHARPNESS=144
 #VIDEO_FRAMERATE=24
 
 # C922
-VIDEO_WIDTH=864
-VIDEO_HEIGHT=480
-VIDEO_FRAMERATE=24
+VIDEO_WIDTH=1280
+VIDEO_HEIGHT=720
+VIDEO_FRAMERATE=30
 VIDEO_FLIP=rotate-180
+VIDEO_FORMAT=image/jpeg
+VIDEO_DECODER=jpegdec
 
 # Audio
 AUDIO_CHANNELS=2