From 562dbb0857e4e6f7a250d69752270c0c165d5141 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 07 二月 2024 20:37:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main-dev' into main-dev
---
src/main/java/com/genersoft/iot/vmp/service/IPlayService.java | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/IPlayService.java b/src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
old mode 100644
new mode 100755
index 60d377d..ca4256e
--- a/src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
@@ -33,14 +33,8 @@
MediaServerItem getNewMediaServerItem(Device device);
- /**
- * 鑾峰彇鍖呭惈assist鏈嶅姟鐨勮妭鐐�
- */
- MediaServerItem getNewMediaServerItemHasAssist(Device device);
-
void playBack(String deviceId, String channelId, String startTime, String endTime, ErrorCallback<Object> callback);
void playBack(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo, String deviceId, String channelId, String startTime, String endTime, ErrorCallback<Object> callback);
-
void zlmServerOffline(String mediaServerId);
void download(String deviceId, String channelId, String startTime, String endTime, int downloadSpeed, ErrorCallback<Object> callback);
@@ -72,4 +66,5 @@
void stopTalk(Device device, String channelId, Boolean streamIsReady);
void getSnap(String deviceId, String channelId, String fileName, ErrorCallback errorCallback);
+
}
--
Gitblit v1.8.0