From 9228d98ad0a1b26165e217d2f502f15a91923d7b Mon Sep 17 00:00:00 2001
From: flll <2844835+flll@users.noreply.github.com>
Date: Sat, 27 Sep 2025 03:58:11 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20RTSP=E9=9F=B3=E5=A3=B0=E8=A8=AD=E5=AE=9A?=
 =?UTF-8?q?=E3=81=8C=E3=82=B5=E3=83=BC=E3=83=90=E3=83=BC=E5=AE=9F=E8=A1=8C?=
 =?UTF-8?q?=E4=B8=AD=E3=81=AB=E7=84=A1=E8=A6=96=E3=81=95=E3=82=8C=E3=82=8B?=
 =?UTF-8?q?=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 音声設定コマンドをpidofチェックブロック外に移動
- ウォッチドッグチェック中でも設定変更が適用されるよう改善
- 全RTSP無効時の早期終了ロジックを整理
---
 overlay_rootfs/scripts/rtspserver.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/overlay_rootfs/scripts/rtspserver.sh b/overlay_rootfs/scripts/rtspserver.sh
index e1a6596..b01e46d 100755
--- a/overlay_rootfs/scripts/rtspserver.sh
+++ b/overlay_rootfs/scripts/rtspserver.sh
@@ -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
@@ -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
 #