648540858
2024-05-24 1efabbe4cc672fcf2ce589bdad1bce66c897a225
支持把推流的额外参数加入redis缓存
2个文件已修改
39 ■■■■ 已修改文件
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/hook/OnStreamChangedHookParam.java 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
@@ -457,15 +457,12 @@
                    if (!"rtp".equals(param.getApp())) {
                        String type = OriginType.values()[param.getOriginType()].getType();
                        if (param.isRegist()) {
                            StreamAuthorityInfo streamAuthorityInfo = redisCatchStorage.getStreamAuthorityInfo(
                                    param.getApp(), param.getStream());
                            String callId = null;
                            if (streamAuthorityInfo != null) {
                                callId = streamAuthorityInfo.getCallId();
                            }
                            Map<String, String> params = MediaServerUtils.urlParamToMap(param.getParams());
                            param.setParamMap(params);
                            StreamInfo streamInfoByAppAndStream = mediaService.getStreamInfoByAppAndStream(mediaInfo,
                                    param.getApp(), param.getStream(), tracks, callId);
                                    param.getApp(), param.getStream(), tracks, params.get("callId"));
                            param.setStreamInfo(new StreamContent(streamInfoByAppAndStream));
                            redisCatchStorage.addStream(mediaInfo, type, param.getApp(), param.getStream(), param);
                            if (param.getOriginType() == OriginType.RTSP_PUSH.ordinal()
                                    || param.getOriginType() == OriginType.RTMP_PUSH.ordinal()
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/hook/OnStreamChangedHookParam.java
@@ -3,6 +3,7 @@
import com.genersoft.iot.vmp.vmanager.bean.StreamContent;
import java.util.List;
import java.util.Map;
/**
 * @author lin
@@ -97,6 +98,16 @@
     * 音视频轨道
     */
    private String vhost;
    /**
     * 额外的参数字符串
     */
    private String params;
    /**
     * 额外的参数
     */
    private Map<String, String> paramMap;
    public boolean isRegist() {
        return regist;
@@ -496,6 +507,23 @@
        this.callId = callId;
    }
    public Map<String, String> getParamMap() {
        return paramMap;
    }
    public void setParamMap(Map<String, String> paramMap) {
        this.paramMap = paramMap;
    }
    public String getParams() {
        return params;
    }
    public void setParams(String params) {
        this.params = params;
    }
    @Override
    public String toString() {
        return "OnStreamChangedHookParam{" +