From 62bdd9588419e56d06f20fd78f2c74d5c6511100 Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 1 Sep 2025 21:35:39 +1200 Subject: [PATCH] test: Update 3 files --- squashkiwi-streaming/config/mediamtx.yml | 10 ++-------- squashkiwi-streaming/config/service.env | 2 +- squashkiwi-streaming/test-camera.sh | 16 +++++++++------- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/squashkiwi-streaming/config/mediamtx.yml b/squashkiwi-streaming/config/mediamtx.yml index b3f11d8..0827faa 100644 --- a/squashkiwi-streaming/config/mediamtx.yml +++ b/squashkiwi-streaming/config/mediamtx.yml @@ -53,16 +53,10 @@ paths: recordSegmentDuration: 1h recordDeleteAfter: 720h - # Generate HLS - sourceGenerateHLS: yes - - # Generate WebRTC - sourceGenerateWebRTC: yes + # HLS is automatically generated for all paths when HLS server is enabled # Sub-stream for lower bandwidth court_sub: source: rtsp://${CAMERA_USER}:${CAMERA_PASSWORD}@${CAMERA_IP}:${CAMERA_RTSP_PORT}/cam/realmonitor?channel=1&subtype=1 sourceProtocol: tcp - sourceOnDemand: yes - sourceGenerateHLS: yes - hlsSegmentDuration: 4s \ No newline at end of file + sourceOnDemand: yes \ No newline at end of file diff --git a/squashkiwi-streaming/config/service.env b/squashkiwi-streaming/config/service.env index 9953c89..e29bfdd 100644 --- a/squashkiwi-streaming/config/service.env +++ b/squashkiwi-streaming/config/service.env @@ -17,7 +17,7 @@ CAMERA_RTSP_PORT=554 # Court Configuration COURT_ID=court1 -COURT_NAME=Court 1 +COURT_NAME="Court 1" # SquashKiwi API SQUASHKIWI_API=https://squash.kiwi/api diff --git a/squashkiwi-streaming/test-camera.sh b/squashkiwi-streaming/test-camera.sh index 8aad25a..ab80393 100755 --- a/squashkiwi-streaming/test-camera.sh +++ b/squashkiwi-streaming/test-camera.sh @@ -6,8 +6,9 @@ if [ -z "${AGENT_PATH}" ]; then # Manual execution - set paths relative to template directory AGENT_PATH="../../../agent/" - source "./config/.template_info.env" - source "./config/service.env" + # Load from the actual deployed config, not template config + source "../config/.template_info.env" + source "../config/service.env" fi source "${AGENT_PATH}/common.sh" @@ -30,8 +31,9 @@ echo "Testing RTSP URL (password hidden): rtsp://${CAMERA_USER}:****@${CAMERA_IP echo "" echo "Testing with ffprobe..." docker run --rm --network host \ + --entrypoint ffprobe \ linuxserver/ffmpeg:latest \ - ffprobe -v error \ + -v error \ "${RTSP_URL}" 2>&1 | head -20 if [ $? -eq 0 ]; then @@ -43,13 +45,13 @@ else # Try without subtype parameter ALT_URL="rtsp://${CAMERA_USER}:${ENCODED_PASSWORD}@${CAMERA_IP}:${CAMERA_RTSP_PORT}/cam/realmonitor?channel=1" - docker run --rm --network host linuxserver/ffmpeg:latest \ - ffprobe -v error "${ALT_URL}" 2>&1 | head -5 + docker run --rm --network host --entrypoint ffprobe linuxserver/ffmpeg:latest \ + -v error "${ALT_URL}" 2>&1 | head -5 # Try simple path SIMPLE_URL="rtsp://${CAMERA_USER}:${ENCODED_PASSWORD}@${CAMERA_IP}:${CAMERA_RTSP_PORT}/" - docker run --rm --network host linuxserver/ffmpeg:latest \ - ffprobe -v error "${SIMPLE_URL}" 2>&1 | head -5 + docker run --rm --network host --entrypoint ffprobe linuxserver/ffmpeg:latest \ + -v error "${SIMPLE_URL}" 2>&1 | head -5 fi echo ""