update conf from 2.x

diff --git a/etc/telecaster/telecaster.conf b/etc/telecaster/telecaster.conf
index a9f4489f9f0eecb67a57b3bdfd4a70578a804add..6955e81a497f28d96bb1c04f057000eafe3d324e 100755 (executable)
--- a/etc/telecaster/telecaster.conf
+++ b/etc/telecaster/telecaster.conf
@@ -10,5 +10,36 @@ PORT="1"
 # Options to pass to vncserver
 #OPTIONS="-geometry 1024x768 -depth 8"
 
+# v4l2
+V4L2_ID=0
+V4L2_ZOOM=160
+V4L2_SHARPNESS=144
+
+# C920
+#VIDEO_WIDTH=864
+#VIDEO_HEIGHT=480
+#VIDEO_FRAMERATE=24
+
+# C922
+VIDEO_WIDTH=1280
+VIDEO_HEIGHT=720
+VIDEO_FRAMERATE=30
+VIDEO_FLIP=rotate-180
+VIDEO_FORMAT="image/jpeg"
+VIDEO_DECODER="jpegdec"
+
+# Audio
+AUDIO_CHANNELS=2
+AUDIO_OPUS_BITRATE=96000
+AUDIO_MP3_QUALITY=4.0
+AUDIO_GAIN_PRE=2.5
+AUDIO_GAIN_POST=1.5
+
 # Jackd
 JACK_OPTIONS="-R -P50 -dalsa -r48000 -p1024 -n3 -Chw:3 -Phw:3"
+
+# DeeFuzzer
+DEEFUZZER_AUDIO_CONF="/etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml"
+DEEFUZZER_VIDEO_CONF="/etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml"
+
+TELECASTER_SERVER="/srv/telecaster/telecaster-server"