Skip to content

fix: RTSP音声設定がサーバー実行中に無視される問題を修正 #140

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: RTSP音声設定がサーバー実行中に無視される問題を修正 #140

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions overlay_rootfs/scripts/rtspserver.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ fi

if [ "$1" = "watchdog" ]; then
[ "$RTSP_VIDEO0" = "on" -o "$RTSP_VIDEO1" = "on" -o "$RTSP_VIDEO2" = "on" ] || exit 0
else
[ "$1" != "on" -a "$1" != "restart" -a "$RTSP_VIDEO0" != "on" -a "$RTSP_VIDEO1" != "on" -a "$RTSP_VIDEO2" != "on" ] && exit 0
fi

if ! pidof v4l2rtspserver > /dev/null ; then
[ "$1" != "on" -a "$1" != "restart" -a "$1" != "watchdog" -a "$RTSP_VIDEO0" != "on" -a "$RTSP_VIDEO1" != "on" -a "$RTSP_VIDEO2" != "on" ] && exit 0

echo "RTSP Restart " >> /tmp/log/rtspserver.log

/scripts/cmd video 0 $RTSP_VIDEO0 > /dev/null
Expand All @@ -81,11 +81,12 @@ if ! pidof v4l2rtspserver > /dev/null ; then
while [ "`pidof v4l2rtspserver`" = "" ]; do
sleep 0.5
done
[ "$RTSP_VIDEO0" = "on" ] && /scripts/cmd audio 0 $AUDIO0 > /dev/null
[ "$RTSP_VIDEO1" = "on" ] && /scripts/cmd audio 1 $AUDIO1 > /dev/null
[ "$RTSP_VIDEO2" = "on" ] && /scripts/cmd audio 2 $AUDIO2 > /dev/null
fi

[ "$RTSP_VIDEO0" = "on" ] && /scripts/cmd audio 0 $AUDIO0 > /dev/null
[ "$RTSP_VIDEO1" = "on" ] && /scripts/cmd audio 1 $AUDIO1 > /dev/null
[ "$RTSP_VIDEO2" = "on" ] && /scripts/cmd audio 2 $AUDIO2 > /dev/null

#
# go2rtc
#
Expand Down