修复语音对讲Bye消息的发送

648540858

2023-09-25 5f50a3cfd9571eced413d23d729fb0b68b16df0a

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

old mode 100644
new mode 100755
@@ -30,6 +30,7 @@
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;

import com.genersoft.iot.vmp.utils.DateUtil;

import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;

import com.genersoft.iot.vmp.vmanager.bean.OtherPsSendInfo;

import com.genersoft.iot.vmp.vmanager.bean.OtherRtpSendInfo;

import com.genersoft.iot.vmp.vmanager.bean.StreamContent;

import org.slf4j.Logger;

@@ -200,7 +201,10 @@


        String mediaServerId = json.getString("mediaServerId");

        MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);



        if (mediaInfo == null) {

            return new HookResultForOnPublish(200, "success");

        }

        // 推流鉴权的处理

        if (!"rtp".equals(param.getApp())) {

            if (userSetting.getPushAuthority()) {

                // 推流鉴权

@@ -252,10 +256,20 @@
            }

        });



        // 是否录像

        if ("rtp".equals(param.getApp())) {

            result.setEnable_mp4(userSetting.getRecordSip());

        } else {

            result.setEnable_mp4(userSetting.isRecordPushLive());

        }

        // 替换流地址

        if ("rtp".equals(param.getApp()) && !mediaInfo.isRtpEnable()) {

            String ssrc = String.format("%010d", Long.parseLong(param.getStream(), 16));;

            InviteInfo inviteInfo = inviteStreamService.getInviteInfoBySSRC(ssrc);

            if (inviteInfo != null) {

                result.setStream_replace(inviteInfo.getStream());

                logger.info("[ZLM HOOK]推流鉴权 stream: {} 替换为 {}", param.getStream(), inviteInfo.getStream());

            }

        }

        List<SsrcTransaction> ssrcTransactionForAll = sessionManager.getSsrcTransactionForAll(null, null, null, param.getStream());

        if (ssrcTransactionForAll != null && ssrcTransactionForAll.size() == 1) {

@@ -298,7 +312,10 @@
        if (param.getApp().equalsIgnoreCase("rtp")) {

            String receiveKey = VideoManagerConstants.WVP_OTHER_RECEIVE_RTP_INFO + userSetting.getServerId() + "_" + param.getStream();

            OtherRtpSendInfo otherRtpSendInfo = (OtherRtpSendInfo)redisTemplate.opsForValue().get(receiveKey);

            if (otherRtpSendInfo != null) {



            String receiveKeyForPS = VideoManagerConstants.WVP_OTHER_RECEIVE_PS_INFO + userSetting.getServerId() + "_" + param.getStream();

            OtherPsSendInfo otherPsSendInfo = (OtherPsSendInfo)redisTemplate.opsForValue().get(receiveKeyForPS);

            if (otherRtpSendInfo != null || otherPsSendInfo != null) {

                result.setEnable_mp4(true);

            }

        }

@@ -503,6 +520,15 @@
                                                    sendRtpItem.getCallId(), sendRtpItem.getStream());

                                        } else {

                                            cmder.streamByeCmd(device, sendRtpItem.getChannelId(), param.getStream(), sendRtpItem.getCallId());

                                            if (sendRtpItem.getPlayType().equals(InviteStreamType.BROADCAST)

                                                    || sendRtpItem.getPlayType().equals(InviteStreamType.TALK)) {

                                                AudioBroadcastCatch audioBroadcastCatch = audioBroadcastManager.get(sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());

                                                if (audioBroadcastCatch != null) {

                                                    // 来自上级平台的停止对讲

                                                    logger.info("[停止对讲] 来自上级，平台：{}, 通道：{}", sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());

                                                    audioBroadcastManager.del(sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());

                                                }

                                            }

                                        }

                                    } catch (SipException | InvalidArgumentException | ParseException |

                                             SsrcTransactionNotFoundException e) {

@@ -569,6 +595,7 @@
                Device device = deviceService.getDevice(inviteInfo.getDeviceId());

                if (device != null) {

                    try {

                        // 多查询一次防止已经被处理了

                        InviteInfo info = inviteStreamService.getInviteInfo(inviteInfo.getType(),

                                inviteInfo.getDeviceId(), inviteInfo.getChannelId(), inviteInfo.getStream());

                        if (info != null) {

@@ -643,7 +670,7 @@


        if ("rtp".equals(param.getApp())) {

            String[] s = param.getStream().split("_");

            if (!mediaInfo.isRtpEnable() || (s.length != 2 && s.length != 4)) {

            if ((s.length != 2 && s.length != 4)) {

                defaultResult.setResult(HookResult.SUCCESS());

                return defaultResult;

            }

@@ -672,9 +699,10 @@


                result.onTimeout(() -> {

                    logger.info("[ZLM HOOK] 预览流自动点播, 等待超时");

                    // 释放rtpserver

                    msg.setData(new HookResult(ErrorCode.ERROR100.getCode(), "点播超时"));

                    resultHolder.invokeResult(msg);

                    resultHolder.invokeAllResult(msg);

                    inviteStreamService.removeInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, deviceId, channelId);

                    storager.stopPlay(deviceId, channelId);

                });



                resultHolder.put(key, uuid, result);