From c69b64c756770067c8c89d1f2f2fb80d4a88031f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 28 五月 2024 10:23:17 +0800
Subject: [PATCH] 修复CSEQ重置错误 #1449

---
 src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java |    8 ++------
 打包/config/config.ini                                                         |   16 ++++++++++++++--
 src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java       |   23 ++---------------------
 3 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
index 5f96dbe..144fb59 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
@@ -18,6 +18,7 @@
 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
 import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
 import com.genersoft.iot.vmp.utils.DateUtil;
+import com.genersoft.iot.vmp.utils.MediaServerUtils;
 import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
 import com.genersoft.iot.vmp.vmanager.bean.OtherPsSendInfo;
 import com.genersoft.iot.vmp.vmanager.bean.OtherRtpSendInfo;
@@ -26,12 +27,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
 
 import javax.sip.InvalidArgumentException;
 import javax.sip.SipException;
 import java.text.ParseException;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -101,7 +100,7 @@
             }
             if (userSetting.getPushAuthority()) {
                 // 瀵逛簬鎺ㄦ祦杩涜閴存潈
-                Map<String, String> paramMap = urlParamToMap(params);
+                Map<String, String> paramMap = MediaServerUtils.urlParamToMap(params);
                 // 鎺ㄦ祦閴存潈
                 if (params == null) {
                     logger.info("鎺ㄦ祦閴存潈澶辫触锛� 缂哄皯蹇呰鍙傛暟锛歴ign=md5(user琛ㄧ殑pushKey)");
@@ -208,24 +207,6 @@
             }
         }
         return result;
-    }
-
-    private Map<String, String> urlParamToMap(String params) {
-        HashMap<String, String> map = new HashMap<>();
-        if (ObjectUtils.isEmpty(params)) {
-            return map;
-        }
-        String[] paramsArray = params.split("&");
-        if (paramsArray.length == 0) {
-            return map;
-        }
-        for (String param : paramsArray) {
-            String[] paramArray = param.split("=");
-            if (paramArray.length == 2) {
-                map.put(paramArray[0], paramArray[1]);
-            }
-        }
-        return map;
     }
 
     @Override
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
index 0a45552..a7c5f72 100755
--- a/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
@@ -82,12 +82,8 @@
 
     @Override
     public void resetAllCSEQ() {
-        String scanKey = VideoManagerConstants.SIP_CSEQ_PREFIX  + userSetting.getServerId() + "_*";
-        List<Object> keys = RedisUtil.scan(redisTemplate, scanKey);
-        for (Object o : keys) {
-            String key = (String) o;
-            redisTemplate.opsForValue().set(key, 1);
-        }
+        String key = VideoManagerConstants.SIP_CSEQ_PREFIX  + userSetting.getServerId();
+        redisTemplate.opsForValue().set(key, 1);
     }
 
     @Override
diff --git "a/\346\211\223\345\214\205/config/config.ini" "b/\346\211\223\345\214\205/config/config.ini"
index 5e4e595..cbfc030 100755
--- "a/\346\211\223\345\214\205/config/config.ini"
+++ "b/\346\211\223\345\214\205/config/config.ini"
@@ -97,9 +97,9 @@
 fmp4_demand=0
 hls_demand=0
 hls_save_path=./www
-modify_stamp=0
+modify_stamp=2
 mp4_as_player=0
-mp4_max_second=3600
+mp4_max_second=300
 mp4_save_path=./www
 rtmp_demand=0
 rtsp_demand=0
@@ -163,4 +163,16 @@
 port=9000
 timeoutSec=5
 
+
+[transcode]
+acodec=pcma
+decoder_h264=h264_qsv,h264_videotoolbox,h264_bm,libopenh264
+decoder_h265=hevc_qsv,hevc_videotoolbox,hevc_bm
+enable_ffmpeg_log=0
+encoder_h264=h264_qsv,h264_videotoolbox,h264_bm,libx264,libopenh264
+encoder_h265=hevc_qsv,hevc_videotoolbox,hevc_bm,libx265
+filter=
+suffix=transport
+vcodec=H264
+
 ; } ---

--
Gitblit v1.8.0