From b0bf856643c8591340ed264bf7cde9bf3f482853 Mon Sep 17 00:00:00 2001 From: mekya Date: Thu, 30 Jan 2025 18:07:13 +0300 Subject: [PATCH 1/3] Remove settings.hlsListSize=5 because we change the default value to 15 --- src/main/webapp/WEB-INF/red5-web.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/webapp/WEB-INF/red5-web.properties b/src/main/webapp/WEB-INF/red5-web.properties index fb04a810..afd0c8e5 100644 --- a/src/main/webapp/WEB-INF/red5-web.properties +++ b/src/main/webapp/WEB-INF/red5-web.properties @@ -8,7 +8,6 @@ webapp.dbName=StreamApp.db settings.webRTCEnabled=true settings.vodFolder= -settings.hlsListSize=5 settings.hlsTime=2 settings.mp4MuxingEnabled=false settings.encoderSettingsString= From 112d474c46d3bbd9f7fe227c1e347b429f29b543 Mon Sep 17 00:00:00 2001 From: mekya Date: Fri, 31 Jan 2025 10:38:31 +0300 Subject: [PATCH 2/3] Remove jsp servlet for html files because it causes charset issue jsp servlet forces none jsp pages have ISO-8859-1 encoding and it causes problems to display other characters Addiontally, we don't use jsp for html file for a long time. Resolves https://github.com/ant-media/Ant-Media-Server/issues/6988 --- src/main/webapp/WEB-INF/web.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 50cc3cbc..7042298c 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -251,12 +251,6 @@ hls-upload-servlet /hls-upload/* - - - jsp - *.html - - m3u8 application/vnd.apple.mpegurl From 4c54276bb155b0295f8c58eaf62366a7115b2d68 Mon Sep 17 00:00:00 2001 From: mekya Date: Sat, 1 Feb 2025 14:23:34 +0300 Subject: [PATCH 3/3] Update the web player to fix undefined error in failing over --- embedded-player/package.json | 2 +- redeploy.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/embedded-player/package.json b/embedded-player/package.json index 5930c3ee..93e09e25 100644 --- a/embedded-player/package.json +++ b/embedded-player/package.json @@ -20,7 +20,7 @@ "author": "", "license": "ISC", "dependencies": { - "@antmedia/web_player": "3.0.0-SNAPSHOT-2024-Dec-23-03-22" + "@antmedia/web_player": "^2.11.11" }, "devDependencies": { diff --git a/redeploy.sh b/redeploy.sh index b1fe2e35..2d3b8e49 100755 --- a/redeploy.sh +++ b/redeploy.sh @@ -3,6 +3,7 @@ AMS_DIR=~/softwares/ant-media-server #Latest sdk is to be deployed to src/main/webapp +rm -rf dist npm run compile OUT=$? if [ $OUT -ne 0 ]; then @@ -13,6 +14,7 @@ fi #Deploy latest embedded player to the src/main/webapp cd embedded-player +rm -rf dist npm run compile OUT=$? if [ $OUT -ne 0 ]; then