From f146203fd39c4a0a0b7656c9c9852bc777034fdd Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 30 一月 2024 14:11:09 +0800
Subject: [PATCH] Merge pull request #1289 from oulover/fix_wvp-28181-2.0_gbStreamId
---
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
index 9012c29..6d405ec 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
import com.genersoft.iot.vmp.common.InviteInfo;
import com.genersoft.iot.vmp.common.InviteSessionStatus;
import com.genersoft.iot.vmp.common.InviteSessionType;
@@ -53,6 +54,7 @@
@SuppressWarnings(value = {"rawtypes", "unchecked"})
@Service
+@DS("master")
public class PlayServiceImpl implements IPlayService {
private final static Logger logger = LoggerFactory.getLogger(PlayServiceImpl.class);
@@ -955,8 +957,11 @@
}
// zlm 鏆傚仠RTP瓒呮椂妫�鏌�
// 浣跨敤zlm涓殑娴両D
- String ssrc = Long.toHexString(Long.parseLong(ssrcTransaction.getSsrc())).toUpperCase();
- JSONObject jsonObject = zlmresTfulUtils.pauseRtpCheck(mediaServerItem, ssrc);
+ String streamKey = inviteInfo.getStream();
+ if (!mediaServerItem.isRtpEnable()) {
+ streamKey = Long.toHexString(Long.parseLong(inviteInfo.getSsrcInfo().getSsrc())).toUpperCase();
+ }
+ JSONObject jsonObject = zlmresTfulUtils.pauseRtpCheck(mediaServerItem, streamKey);
if (jsonObject == null || jsonObject.getInteger("code") != 0) {
throw new ServiceException("鏆傚仠RTP鎺ユ敹澶辫触");
}
@@ -980,8 +985,11 @@
}
// zlm 鏆傚仠RTP瓒呮椂妫�鏌�
// 浣跨敤zlm涓殑娴両D
- String ssrc = Long.toHexString(Long.parseLong(ssrcTransaction.getSsrc())).toUpperCase();
- JSONObject jsonObject = zlmresTfulUtils.resumeRtpCheck(mediaServerItem, ssrc);
+ String streamKey = inviteInfo.getStream();
+ if (!mediaServerItem.isRtpEnable()) {
+ streamKey = Long.toHexString(Long.parseLong(inviteInfo.getSsrcInfo().getSsrc())).toUpperCase();
+ }
+ JSONObject jsonObject = zlmresTfulUtils.resumeRtpCheck(mediaServerItem, streamKey);
if (jsonObject == null || jsonObject.getInteger("code") != 0) {
throw new ServiceException("缁х画RTP鎺ユ敹澶辫触");
}
--
Gitblit v1.8.0