Shikong/gb28181-docking-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改 streamId 生成方式, 封装 MediaSdpHelper.getStreamId

Browse Source
This commit is contained in:
shikong 2023-08-24 09:14:02 +08:00
parent 60cb7cf93c
commit d2a58ec221
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gb28181-service/src/main/java/cn/skcks/docking/gb28181/core/sip/gb28181/cache/CacheUtil.java vendored
View File

@ -11,5 +11,5 @@ public class CacheUtil {
return StringUtils.joinWith(SEPARATOR, (Object[]) ArrayUtils.addFirst(ids,prefix)); return StringUtils.joinWith(SEPARATOR, (Object[]) ArrayUtils.addFirst(ids,prefix));
} }
public final static String SIP_C_SEQ_PREFIX = "SIP_C_SEQ_"; public final static String SIP_C_SEQ_PREFIX = "SIP_C_SEQ";
} }

10
gb28181-service/src/main/java/cn/skcks/docking/gb28181/core/sip/gb28181/sdp/MediaSdpHelper.java
View File

@ -3,7 +3,6 @@ package cn.skcks.docking.gb28181.core.sip.gb28181.sdp;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonValue;
import gov.nist.core.Separators; import gov.nist.core.Separators;
import gov.nist.javax.sdp.SessionDescriptionImpl;
import gov.nist.javax.sdp.fields.AttributeField; import gov.nist.javax.sdp.fields.AttributeField;
import gov.nist.javax.sdp.fields.ConnectionField; import gov.nist.javax.sdp.fields.ConnectionField;
import gov.nist.javax.sdp.fields.TimeField; import gov.nist.javax.sdp.fields.TimeField;
@ -11,12 +10,20 @@ import gov.nist.javax.sdp.fields.URIField;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import javax.sdp.*; import javax.sdp.*;
import java.util.*; import java.util.*;
@Slf4j
public class MediaSdpHelper { public class MediaSdpHelper {
public final static String SEPARATOR = "_";
public static String getStreamId(String prefix,String... ids){
return StringUtils.joinWith(SEPARATOR, (Object[]) ArrayUtils.addFirst(ids,prefix));
}
public static final Map<String, String> RTPMAP = new HashMap<>() {{ public static final Map<String, String> RTPMAP = new HashMap<>() {{
put("96", "PS/90000"); put("96", "PS/90000");
put("126", "H264/90000"); put("126", "H264/90000");
@ -53,6 +60,7 @@ public class MediaSdpHelper {
@SneakyThrows @SneakyThrows
public static GB28181Description build(Action action, String deviceId, String channelId, String netType, String rtpIp, int rtpPort, String ssrc, StreamMode streamMode, TimeDescription timeDescription){ public static GB28181Description build(Action action, String deviceId, String channelId, String netType, String rtpIp, int rtpPort, String ssrc, StreamMode streamMode, TimeDescription timeDescription){
log.debug("{} {} {} {} {} {} {} {} {}",action, deviceId, channelId, netType, rtpIp, rtpPort, ssrc, streamMode, timeDescription);
GB28181Description description = new GB28181Description(); GB28181Description description = new GB28181Description();
description.setSessionName(SdpFactory.getInstance().createSessionName(action.getAction())); description.setSessionName(SdpFactory.getInstance().createSessionName(action.getAction()));

2
gb28181-service/src/main/java/cn/skcks/docking/gb28181/service/play/PlayService.java
View File

@ -61,7 +61,7 @@ public class PlayService {
return result; return result;
} }
String streamId = CacheUtil.getKey(deviceId,channelId); String streamId = MediaSdpHelper.getStreamId(deviceId,channelId);
String key = CacheUtil.getKey(PREFIX, streamId); String key = CacheUtil.getKey(PREFIX, streamId);
if(RedisUtil.KeyOps.hasKey(key)){ if(RedisUtil.KeyOps.hasKey(key)){
String url = RedisUtil.StringOps.get(key); String url = RedisUtil.StringOps.get(key);