From 93c632f2082ba00feed0cba441dd73e8cdb26556 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 10 二月 2023 16:47:04 +0800
Subject: [PATCH] 合并主线
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
index 99fa4c1..c5fe9f6 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
@@ -265,13 +265,13 @@
throw new ControllerException(ErrorCode.ERROR400.getCode(), "鏈壘鍒伴�氶亾锛� " + channelId);
}
- return playService.audioBroadcast(device, channelId);
+ return playService.audioBroadcastInfo(device, channelId);
}
@GetMapping("/1111")
public void broadcastApi1() {
- MediaServerItem defaultMediaServer = mediaServerService.getMediaServerForMinimumLoad();
+ MediaServerItem defaultMediaServer = mediaServerService.getMediaServerForMinimumLoad(null);
Device device = storager.queryVideoDevice("34020000001320090001");
playService.talk(defaultMediaServer, device, "34020000001370000001", null, null, null);
--
Gitblit v1.8.0