Incorporate changes from other machines

This commit is contained in:
Donald Burr 2015-02-14 21:57:16 -08:00
parent c3b94b7106
commit b1d3e2c146
7 changed files with 191 additions and 15 deletions

View file

@ -30,7 +30,7 @@ echo "*** BEGINNING RUN AT `date` ***" >> video.log
echo "" >> video.log
# configure v4l2
sudo v4l2-ctl --device=$VIDEO_DEVICE --set-fmt-video=width=800,height=600,pixelformat=1 >>video.log 2>&1
sudo v4l2-ctl --device=$VIDEO_DEVICE --set-fmt-video=width=320,height=240,pixelformat=1 >>video.log 2>&1
# set mic volume
amixer -c 1 sset Mic,0 80%,80% unmute cap >>video.log 2>&1
@ -48,9 +48,9 @@ echo "log file is available as video.log"
# working, video+audio with vlc, audio-only with mplayer*
cvlc \
v4l2://$VIDEO_DEVICE:chroma=MJPG:width=800:height=600 \
v4l2://$VIDEO_DEVICE:chroma=MJPG:width=320:height=240 \
:input-slave="alsa://hw:1,0" \
--sout '#transcode{acodec=a52,ab=32}:http{mux=ts,dst=:8080,name=stream}' \
--sout '#transcode{acodec=mp3,ab=32}:http{mux=ts,dst=:8080,name=stream}' \
-vvv \
>>video.log 2>&1