648540858
2023-03-20 039fbf7e243d4bf0f46b44e7dae2a5d36e978056
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
@@ -249,6 +249,7 @@
            String channelId = ssrcTransactionForAll.get(0).getChannelId();
            DeviceChannel deviceChannel = storager.queryChannel(deviceId, channelId);
            if (deviceChannel != null) {
                result.setEnable_audio(deviceChannel.isHasAudio());
            }
            // 如果是录像下载就设置视频间隔十秒
@@ -257,6 +258,11 @@
                result.setEnable_audio(true);
                result.setEnable_mp4(true);
            }
            // 如果是talk对讲,则默认获取声音
            if (ssrcTransactionForAll.get(0).getType() == VideoStreamSessionManager.SessionType.talk) {
                result.setEnable_audio(true);
            }
        }
        return result;
    }
@@ -285,7 +291,6 @@
                }
            }
            // 流消失移除redis play
            List<OnStreamChangedHookParam.MediaTrack> tracks = param.getTracks();
            if (param.isRegist()) {
                if (param.getOriginType() == OriginType.RTMP_PUSH.ordinal()
                        || param.getOriginType() == OriginType.RTSP_PUSH.ordinal()
@@ -343,7 +348,7 @@
                        }
                        // 开启语音对讲通道
                        try {
                           playService.audioBroadcastCmd(device, channelId, mediaInfo, 60, (msg)->{
                           playService.audioBroadcastCmd(device, channelId, 60, mediaInfo, param.getApp(), param.getStream(), (msg)->{
                              logger.info("[语音对讲] 通道建立成功, device: {}, channel: {}", deviceId, channelId);
                           });
                        } catch (InvalidArgumentException | ParseException | SipException e) {