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

MediaItem增加callId

Browse Source
This commit is contained in:
648540858 2022-07-18 20:33:47 +08:00
parent 4d1c6401c2
commit c48def08cf
3 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
View File

@ -461,7 +461,7 @@ public class ZLMHttpHookListener {
StreamInfo streamInfoByAppAndStream = mediaService.getStreamInfoByAppAndStream(mediaServerItem, StreamInfo streamInfoByAppAndStream = mediaService.getStreamInfoByAppAndStream(mediaServerItem,
app, stream, tracks, streamAuthorityInfo.getCallId()); app, stream, tracks, streamAuthorityInfo.getCallId());
item.setStreamInfo(streamInfoByAppAndStream); item.setStreamInfo(streamInfoByAppAndStream);
item.setSeverId(userSetting.getServerId());
redisCatchStorage.addStream(mediaServerItem, type, app, stream, item); redisCatchStorage.addStream(mediaServerItem, type, app, stream, item);
if (item.getOriginType() == OriginType.RTSP_PUSH.ordinal() if (item.getOriginType() == OriginType.RTSP_PUSH.ordinal()
|| item.getOriginType() == OriginType.RTMP_PUSH.ordinal() || item.getOriginType() == OriginType.RTMP_PUSH.ordinal()

16
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaItem.java
View File

@ -4,6 +4,9 @@ import com.genersoft.iot.vmp.common.StreamInfo;
import java.util.List; import java.util.List;
/**
* @author lin
*/
public class MediaItem { public class MediaItem {
/** /**
@ -21,6 +24,11 @@ public class MediaItem {
*/ */
private String stream; private String stream;
/**
* 推流鉴权Id
*/
private String callId;
/** /**
* 观看总人数，包括hls/rtsp/rtmp/http-flv/ws-flv * 观看总人数，包括hls/rtsp/rtmp/http-flv/ws-flv
*/ */
@ -427,4 +435,12 @@ public class MediaItem {
public void setSeverId(String severId) { public void setSeverId(String severId) {
this.severId = severId; this.severId = severId;
} }
public String getCallId() {
return callId;
}
public void setCallId(String callId) {
this.callId = callId;
}
} }

5
src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
View File

@ -485,7 +485,12 @@ public class RedisCatchStorageImpl implements IRedisCatchStorage {
@Override @Override
public void addStream(MediaServerItem mediaServerItem, String type, String app, String streamId, MediaItem mediaItem) { public void addStream(MediaServerItem mediaServerItem, String type, String app, String streamId, MediaItem mediaItem) {
// 查找是否使用了callID
StreamAuthorityInfo streamAuthorityInfo = getStreamAuthorityInfo(app, streamId);
String key = VideoManagerConstants.WVP_SERVER_STREAM_PREFIX + userSetting.getServerId() + "_" + type + "_" + app + "_" + streamId + "_" + mediaServerItem.getId(); String key = VideoManagerConstants.WVP_SERVER_STREAM_PREFIX + userSetting.getServerId() + "_" + type + "_" + app + "_" + streamId + "_" + mediaServerItem.getId();
if (streamAuthorityInfo != null) {
mediaItem.setCallId(streamAuthorityInfo.getCallId());
}
redis.set(key, mediaItem); redis.set(key, mediaItem);
} }