Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added authentication support #111

Merged
merged 4 commits into from Feb 23, 2022
Merged

Added authentication support #111

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3edb21d
Added authentication support
Blendman974 Jun 23, 2021
27d33f0
Added user and password to audio pipeline as well
Blendman974 Jun 23, 2021
3b58d05
Removed two spaces that were not required
Blendman974 Jul 23, 2021
955e667
Fix mapping between short and long options
agarciadom Feb 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 14 additions & 5 deletions run-videochat.sh
View file
Open in desktop
Expand Up @@ -60,8 +60,10 @@ show_help() {
echo " -l, --adb-flags <id> adb flags to specify device id"
echo " -i, --use-wifi <ip> use wi-fi mode with specified ip"
echo " -p, --port <port> port on which IP Webcam is listening (default 8080)"
echo " -P, --password <pass> password for accesing the IP Webcam"
echo " -s, --no-sync No force syncing to timestamps"
echo " -t, --with-tee adds the 'tee' multiplexer to the pipeline, to workaround 'single-frame' capture issue (see issue #97)"
echo " -u, --username <user> username for accesing the IP Webcam"
echo " -v, --video capture only video"
echo " -w, --width <width> set image width (default 640)"
echo " -x, --no-proxy disable proxy while acessing IP"
Expand Down Expand Up @@ -115,9 +117,12 @@ phone_plugged() {
url_reachable() {
CURL_OPTIONS=""
if [ $DISABLE_PROXY = 1 ]; then
CURL_OPTIONS="--noproxy $IP"
CURL_OPTIONS+="--noproxy $IP"
fi

if [[ $USERNAME != "" && $PASSWORD != "" ]]; then
CURL_OPTIONS+="-u $USERNAME:$PASSWORD"
fi
# -f produces a non-zero status code when answer is 4xx or 5xx
curl $CURL_OPTIONS -f -m 5 -sI "$1" >/dev/null
}
Expand Down Expand Up @@ -192,21 +197,25 @@ DISABLE_ECHO_CANCEL=0
# Use exclusive caps by default (required by Chrome, Cheese and others)
V4L2_OPTS="exclusive_caps=1"

USERNAME=""
PASSWORD=""

OPTS=`getopt -o ab:Cd:f:h:l:i:p:stvw:x --long audio,adb-path:,device:,flip:,height:,help,adb-flags:,use-wifi:,port:,no-sync,with-tee,video,width:,no-proxy,no-echo-cancel -n "$0" -- "$@"`
OPTS=`getopt -o ab:Cd:f:h:l:i:p:P:stu:vw:x --long audio,adb-path:,no-echo-cancel,device:,flip:,height:,help,adb-flags:,use-wifi:,port:,password:,no-sync,with-tee,username:,video,width:,no-proxy -n "$0" -- "$@"`
eval set -- "$OPTS"

while true; do
case "$1" in
-a | --audio ) CAPTURE_STREAM="a"; shift;;
-b | --adb-path ) ADB="$2"; shift 2;;
-C | --no-echo-cancel ) DISABLE_ECHO_CANCEL=1; shift;;
-C | --no-echo-cancel ) DISABLE_ECHO_CANCEL=1; shift;;
-d | --device ) DEVICE="$2"; shift 2;;
-f | --flip ) FLIP_METHOD="$2"; shift 2;;
-h | --height ) HEIGHT="$2"; shift 2;;
-l | --adb-flags ) ADB_FLAGS="-s $2"; shift 2;;
-i | --use-wifi ) IP="$2"; shift 2;;
-p | --port ) PORT="$2"; shift 2;;
-P | --password) PASSWORD="$2"; shift 2;;
-u | --username) USERNAME="$2"; shift 2;;
-s | --no-sync ) SYNC=false; shift;;
-t | --with-tee ) USE_TEE=true; shift;;
-v | --video ) CAPTURE_STREAM="v"; shift;;
Expand Down Expand Up @@ -430,7 +439,7 @@ pipeline_video() {
GST_TEE="! tee "
fi

echo souphttpsrc location="$VIDEO_URL" do-timestamp=true is-live=true \
echo souphttpsrc location="$VIDEO_URL" do-timestamp=true is-live=true user-id="$USERNAME" user-pw="$PASSWORD" \
! queue \
! multipartdemux \
! decodebin \
Expand All @@ -443,7 +452,7 @@ pipeline_video() {
}

pipeline_audio() {
echo souphttpsrc location="$AUDIO_URL" do-timestamp=true is-live=true \
echo souphttpsrc location="$AUDIO_URL" do-timestamp=true is-live=true user-id="$USERNAME" user-pw="$PASSWORD" \
! $GST_AUDIO_CAPS ! queue \
! pulsesink device="$SINK_NAME" sync=$SYNC
}
Expand Down