wvp-pro.git - Gitblit

			@@ -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;
			}
			@@ -274,6 +280,9 @@
			logger.info("[ZLM HOOK] 流注销, {}->{}->{}/{}", param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream());
			}

			JSONObject ret = new JSONObject();
			ret.put("code", 0);
			ret.put("msg", "success");
			MediaServerItem mediaInfo = mediaServerService.getOne(param.getMediaServerId());
			JSONObject json = (JSONObject) JSON.toJSON(param);
			taskExecutor.execute(() -> {
			@@ -285,7 +294,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()
			@@ -330,34 +338,34 @@
			}
			}else if ("broadcast".equals(param.getApp())){
			// 语音对讲推流 stream需要满足格式deviceId_channelId
			if (param.getStream().indexOf("_") > 0) {
			String[] streamArray = param.getStream().split("_");
			if (streamArray.length == 2) {
			String deviceId = streamArray[0];
			String channelId = streamArray[1];
			Device device = deviceService.getDevice(deviceId);
			if (device != null) {
			if (param.isRegist()) {
			if (audioBroadcastManager.exit(deviceId, channelId)) {
			playService.stopAudioBroadcast(deviceId, channelId);
			}
			// 开启语音对讲通道
			try {
			playService.audioBroadcastCmd(device, channelId, mediaInfo, 60, (msg)->{
			logger.info("[语音对讲] 通道建立成功, device: {}, channel: {}", deviceId, channelId);
			});
			} catch (InvalidArgumentException \| ParseException \| SipException e) {
			logger.error("[命令发送失败] 语音对讲: {}", e.getMessage());
			}
			}else {
			// 流注销
			playService.stopAudioBroadcast(deviceId, channelId);
			}
			} else{
			logger.info("[语音对讲] 未找到设备：{}", deviceId);
			}
			}
			}
			if (param.getStream().indexOf("_") > 0) {
			String[] streamArray = param.getStream().split("_");
			if (streamArray.length == 2) {
			String deviceId = streamArray[0];
			String channelId = streamArray[1];
			Device device = deviceService.getDevice(deviceId);
			if (device != null) {
			if (param.isRegist()) {
			if (audioBroadcastManager.exit(deviceId, channelId)) {
			playService.stopAudioBroadcast(deviceId, channelId);
			}
			// 开启语音对讲通道
			try {
			playService.audioBroadcastCmd(device, channelId, mediaInfo, param.getApp(), param.getStream(), 60, false, (msg)->{
			logger.info("[语音对讲] 通道建立成功, device: {}, channel: {}", deviceId, channelId);
			});
			} catch (InvalidArgumentException \| ParseException \| SipException e) {
			logger.error("[命令发送失败] 语音对讲: {}", e.getMessage());
			}
			}else {
			// 流注销
			playService.stopAudioBroadcast(deviceId, channelId);
			}
			} else{
			logger.info("[语音对讲] 未找到设备：{}", deviceId);
			}
			}
			}
			}else if ("talk".equals(param.getApp())){
			// 语音对讲推流 stream需要满足格式deviceId_channelId
			if (param.getStream().indexOf("_") > 0) {