From 1874570e59e68910016a73641fdb99bfcd914984 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Garc=C3=ADa-Dom=C3=ADnguez?= Date: Tue, 21 Jun 2016 14:14:23 +0100 Subject: Replace can_run definition --- prepare-videochat.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prepare-videochat.sh b/prepare-videochat.sh index 0ca87d8..1a4475e 100755 --- a/prepare-videochat.sh +++ b/prepare-videochat.sh @@ -173,7 +173,7 @@ confirm() { can_run() { # It's either the path to a file, or the name of an executable in $PATH - (test -x "$1" || which "$1") &>/dev/null + which "$1" >/dev/null 2>/dev/null } start_adb() { -- cgit v1.2.3 From 2b45f14015a41c095791749c08f7cb5feddba47f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Garc=C3=ADa-Dom=C3=ADnguez?= Date: Tue, 21 Jun 2016 14:50:53 +0100 Subject: Avoid '&>' (deprecated according to Bash Hackers Wiki, refs #31) --- prepare-videochat.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prepare-videochat.sh b/prepare-videochat.sh index 1a4475e..ec3c24e 100755 --- a/prepare-videochat.sh +++ b/prepare-videochat.sh @@ -145,7 +145,7 @@ AUDIO_CODEC=opus has_kernel_module() { # Loads module if it is not yet loaded MODULE="$1" - if lsmod | grep "$MODULE" &> /dev/null ; then + if lsmod | grep "$MODULE" >/dev/null 2>/dev/null; then # echo "$MODULE is loaded! Do nothnig." : else -- cgit v1.2.3 From 27ca5dddfb0a7f5ed85d6dcc445ff30cc8f1f4b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Garc=C3=ADa-Dom=C3=ADnguez?= Date: Tue, 21 Jun 2016 18:54:18 +0100 Subject: Mention OPUS in README --- README.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.markdown b/README.markdown index c97ef92..a1483cf 100644 --- a/README.markdown +++ b/README.markdown @@ -3,7 +3,7 @@ ipwebcam-gst This is a shell script which allows Android users to use their phones as a webcam/microphone in Linux. The setup is as follows: -* [IP Webcam](https://market.android.com/details?id=com.pas.webcam) (on the phone) serves up a MJPEG live video stream and a WAV live audio stream through HTTP (port 8080 by default). +* [IP Webcam](https://market.android.com/details?id=com.pas.webcam) (on the phone) serves up a MJPEG live video stream and a WAV/Opus live audio stream through HTTP (port 8080 by default). * If the phone is plugged to USB and ADB is available, the HTTP port in the phone is bridged to the same port in the computer, using ADB port forwarding. This is much faster than using Wi-Fi, and the shell will be able to start the IP Webcam application on the phone directly. The script supports Wi-Fi as well, but it can be rather choppy with bad reception, so I wouldn't recommend it. * From the local port in the computer, a GStreamer graph takes the MJPEG live video stream and dumps it to a loopback V4L2 device, using [v4l2loopback](https://github.com/umlaeute/v4l2loopback). The audio stream is dumped to a PulseAudio null sink. * Most videochat software in Linux is compatible with `v4l2loopback`: Skype 2.1 (*not* the latest 2.2, it seems), Cheese, Empathy, Google Talk video chats and Google+ hangouts should work. -- cgit v1.2.3