summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio García-Domínguez <nyoescape@gmail.com>2016-06-20 11:14:32 +0100
committerGitHub <noreply@github.com>2016-06-20 11:14:32 +0100
commitd9baeb24a79a2a161f996e5376a4db59a8090613 (patch)
treed6eb2ec455842c2fca295af895a6e678ea409f2b
parent3a41cef9549cf7b68620c4059bf655a7681de49c (diff)
parentde0237ca2e2e6c2fe46b5f89727c16c679b4df1e (diff)
Merge pull request #30 from laptander/master
add Troubleshooting and add AUDIO_CODEC variable in different commits
-rw-r--r--README.markdown7
-rwxr-xr-xprepare-videochat.sh15
2 files changed, 17 insertions, 5 deletions
diff --git a/README.markdown b/README.markdown
index 371c57b..c97ef92 100644
--- a/README.markdown
+++ b/README.markdown
@@ -15,10 +15,13 @@ To use this script, simply run it with `./prepare-videochat.sh` and follow instr
Please make sure that audio is enabled on IP Webcam, or the script won't work!
-Here's an idea for future work: switch to Python and use the official GStreamer binding. I'd love to see that, but I don't have enough free time :-(.
+Ideas for future work:
+* switch to Python and use the official GStreamer binding. I'd love to see that, but I don't have enough free time :-(.
+* make a separated config file (system-wide and user-defind)
+* make another file (ex. prepare-mic) for preparing audio without video or allow it via config
Disclaimer: the script has only been tested in my local installation of Ubuntu 13.04 and on Arch Linux. I think it should work on most recent Debian-based distributions as well (and Debian, of course). If you need any help, please create an issue on this project.
Note: the v4l2loopback-dkms package seems to be broken in Saucy (13.10), as it refers to an old v4l2loopback release (0.7.0) and not to the latest version as of date (0.8.0). Please install v4l2loopback from its official Github repo.
-Note: You can install this script from AUR in Arch Linux. It will resolve all dependencies automatically.
+Note: You can install this script from AUR in Arch Linux with ipwebcam-gst-git package. It will resolve all dependencies automatically.
diff --git a/prepare-videochat.sh b/prepare-videochat.sh
index 3d57a3e..0ca87d8 100755
--- a/prepare-videochat.sh
+++ b/prepare-videochat.sh
@@ -32,7 +32,7 @@
# INSTALLATION
#
# In Arch Linux
-# install ipwebcam-gst package from AUR
+# install ipwebcam-gst-git package from AUR
#
# TROUBLESHOOTING
#
@@ -59,12 +59,19 @@
#
# To make sure the video from IP Webcam works for you (except for
# v4l2loopback and your video conference software), try this command
-# with a simplified pipeline:
+# with a simplified pipeline (do not forget to replace $IP and $PORT
+# with your values):
#
+# on Debian:
# gst-launch souphttpsrc location="http://$IP:$PORT/videofeed" \
# do-timestamp=true is-live=true \
# ! multipartdemux ! jpegdec ! ffmpegcolorspace ! ximagesink
#
+# on Arch Linux:
+# gst-launch-1.0 souphttpsrc location="http://$IP:$PORT/videofeed" \
+# do-timestamp=true is-live=true \
+# ! multipartdemux ! jpegdec ! videoconvert ! ximagesink
+#
# You should be able to see the picture from your webcam on a new window.
# If that doesn't work, there's something wrong with your connection to
# the phone.
@@ -130,6 +137,8 @@ HEIGHT=480
# Frame rate of video
GST_FPS=5
+# Choose audio codec from wav, aac or opus
+AUDIO_CODEC=opus
### FUNCTIONS
@@ -330,7 +339,7 @@ fi
# Remind the user to open up IP Webcam and start the server
BASE_URL=http://$IP:$PORT
VIDEO_URL=$BASE_URL/videofeed
-AUDIO_URL=$BASE_URL/audio.wav
+AUDIO_URL=$BASE_URL/audio.$AUDIO_CODEC
if phone_plugged && ! iw_server_is_started; then
# If the phone is plugged to USB and we have ADB, we can start the server by sending an intent
start_iw_server