Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(play): 修复单端口推流下级自定义 ssrc 时, ssrc 修正不完全的问题

pull/981/head
xiaoQQya 2023-08-02 13:56:07 +08:00
parent 2e399faf41
commit 273ade5f73
2 changed files with 142 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
View File

@ -1,5 +1,6 @@
package com.genersoft.iot.vmp.gb28181.session;
import com.genersoft.iot.vmp.common.InviteInfo;
import com.genersoft.iot.vmp.common.InviteSessionType;
import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.conf.UserSetting;
@ -31,6 +32,7 @@ public class VideoStreamSessionManager {
/**
* 添加一个点播/回放的事务信息
* 后续可以通过流Id/callID
*
* @param deviceId 设备ID
* @param channelId 通道ID
* @param callId 一次请求的CallID
@ -38,7 +40,7 @@ public class VideoStreamSessionManager {
* @param mediaServerId 所使用的流媒体ID
* @param response 回复
*/
public void put(String deviceId, String channelId, String callId, String stream, String ssrc, String mediaServerId, SIPResponse response, InviteSessionType type){
public void put(String deviceId, String channelId, String callId, String stream, String ssrc, String mediaServerId, SIPResponse response, InviteSessionType type) {
SsrcTransaction ssrcTransaction = new SsrcTransaction();
ssrcTransaction.setDeviceId(deviceId);
ssrcTransaction.setChannelId(channelId);
@ -53,54 +55,82 @@ public class VideoStreamSessionManager {
+ "_" + deviceId + "_" + channelId + "_" + callId + "_" + stream, ssrcTransaction);
}
public SsrcTransaction getSsrcTransaction(String deviceId, String channelId, String callId, String stream){
public SsrcTransaction getSsrcTransaction(String deviceId, String channelId, String callId, String stream) {
if (ObjectUtils.isEmpty(deviceId)) {
deviceId ="*";
deviceId = "*";
}
if (ObjectUtils.isEmpty(channelId)) {
channelId ="*";
channelId = "*";
}
if (ObjectUtils.isEmpty(callId)) {
callId ="*";
callId = "*";
}
if (ObjectUtils.isEmpty(stream)) {
stream ="*";
stream = "*";
}
String key = VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetting.getServerId() + "_" + deviceId + "_" + channelId + "_" + callId+ "_" + stream;
String key = VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetting.getServerId() + "_" + deviceId + "_" + channelId + "_" + callId + "_" + stream;
List<Object> scanResult = RedisUtil.scan(redisTemplate, key);
if (scanResult.size() == 0) {
return null;
}
return (SsrcTransaction)redisTemplate.opsForValue().get(scanResult.get(0));
return (SsrcTransaction) redisTemplate.opsForValue().get(scanResult.get(0));
}
public List<SsrcTransaction> getSsrcTransactionForAll(String deviceId, String channelId, String callId, String stream){
/**
* 更新缓存事务.
*
* @param inviteInfo 点播信息
* @param ssrc 下级平台自定义 ssrc
*/
public void updateSsrcTransactionForStream(InviteInfo inviteInfo, String ssrc) {
String stream = String.format("%08x", Integer.parseInt(ssrc)).toUpperCase();
SsrcTransaction ssrcTransactionInDb = getSsrcTransaction(inviteInfo.getDeviceId(), inviteInfo.getChannelId(),
inviteInfo.getType().toString().toLowerCase(), inviteInfo.getStream());
if (ObjectUtils.isEmpty(ssrcTransactionInDb)) {
return;
}
remove(ssrcTransactionInDb.getDeviceId(), ssrcTransactionInDb.getChannelId(),
ssrcTransactionInDb.getCallId(), ssrcTransactionInDb.getStream());
String key = VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX
+ userSetting.getServerId()
+ "_" + ssrcTransactionInDb.getDeviceId()
+ "_" + ssrcTransactionInDb.getChannelId()
+ "_" + ssrcTransactionInDb.getCallId()
+ "_" + stream;
ssrcTransactionInDb.setSsrc(ssrc);
ssrcTransactionInDb.setStream(stream);
redisTemplate.opsForValue().set(key, ssrcTransactionInDb);
}
public List<SsrcTransaction> getSsrcTransactionForAll(String deviceId, String channelId, String callId, String stream) {
if (ObjectUtils.isEmpty(deviceId)) {
deviceId ="*";
deviceId = "*";
}
if (ObjectUtils.isEmpty(channelId)) {
channelId ="*";
channelId = "*";
}
if (ObjectUtils.isEmpty(callId)) {
callId ="*";
callId = "*";
}
if (ObjectUtils.isEmpty(stream)) {
stream ="*";
stream = "*";
}
String key = VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetting.getServerId() + "_" + deviceId + "_" + channelId + "_" + callId+ "_" + stream;
String key = VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetting.getServerId() + "_" + deviceId + "_" + channelId + "_" + callId + "_" + stream;
List<Object> scanResult = RedisUtil.scan(redisTemplate, key);
if (scanResult.size() == 0) {
return null;
}
List<SsrcTransaction> result = new ArrayList<>();
for (Object keyObj : scanResult) {
result.add((SsrcTransaction)redisTemplate.opsForValue().get(keyObj));
result.add((SsrcTransaction) redisTemplate.opsForValue().get(keyObj));
}
return result;
}
public String getMediaServerId(String deviceId, String channelId, String stream){
public String getMediaServerId(String deviceId, String channelId, String stream) {
SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId, null, stream);
if (ssrcTransaction == null) {
return null;
@ -108,7 +138,7 @@ public class VideoStreamSessionManager {
return ssrcTransaction.getMediaServerId();
}
public String getSSRC(String deviceId, String channelId, String stream){
public String getSSRC(String deviceId, String channelId, String stream) {
SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId, null, stream);
if (ssrcTransaction == null) {
return null;
@ -116,8 +146,8 @@ public class VideoStreamSessionManager {
return ssrcTransaction.getSsrc();
}
public void remove(String deviceId, String channelId, String stream) {
SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId, null, stream);
public void remove(String deviceId, String channelId, String callId, String stream) {
SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId, callId, stream);
if (ssrcTransaction == null) {
return;
}
@ -125,10 +155,13 @@ public class VideoStreamSessionManager {
+ deviceId + "_" + channelId + "_" + ssrcTransaction.getCallId() + "_" + ssrcTransaction.getStream());
}
public void remove(String deviceId, String channelId, String stream) {
remove(deviceId, channelId, null, stream);
}
public List<SsrcTransaction> getAllSsrc() {
List<Object> ssrcTransactionKeys = RedisUtil.scan(redisTemplate, String.format("%s_*_*_*_*", VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX+ userSetting.getServerId()));
List<SsrcTransaction> result= new ArrayList<>();
List<Object> ssrcTransactionKeys = RedisUtil.scan(redisTemplate, String.format("%s_*_*_*_*", VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetting.getServerId()));
List<SsrcTransaction> result = new ArrayList<>();
for (Object ssrcTransactionKey : ssrcTransactionKeys) {
String key = (String) ssrcTransactionKey;
SsrcTransaction ssrcTransaction = JsonUtil.redisJsonToObject(redisTemplate, key, SsrcTransaction.class);

5
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
View File

@ -335,6 +335,11 @@ public class PlayServiceImpl implements IPlayService {
String stream = String.format("%08x", Integer.parseInt(ssrcInResponse)).toUpperCase();
hookSubscribe.getContent().put("stream", stream);
inviteStreamService.updateInviteInfoForStream(inviteInfo, stream);
streamSession.updateSsrcTransactionForStream(inviteInfo, ssrcInResponse);
ssrcInfo.setSsrc(ssrcInResponse);
ssrcInfo.setStream(stream);
inviteInfo.setSsrcInfo(ssrcInfo);
inviteInfo.setStream(stream);
subscribe.addSubscribe(hookSubscribe, (mediaServerItemInUse, hookParam) -> {
logger.info("[ZLM HOOK] ssrc修正后收到订阅消息： " + hookParam);
dynamicTask.stop(timeOutTaskKey);