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 85c1a8dbde0cc8704e972f8703c7af7bc136e7f8..035378d24ed77e2921f070ab70dacb031fc4b745 100755 (executable)
--- 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 bd5904c2660bcb2aed3fa19ad5279cb29325da24..e72ab224abb2a5c45659f04f3b2cf761ca9c9dd1 100755 (executable)
--- 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