From 87acd73efcde49cb5630c266db4ebd3f6b1b9dfd Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期二, 06 四月 2021 15:13:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 52 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
index 00951ba..02fb742 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
@@ -96,7 +96,7 @@
}
/**
- * 鍒涘缓涓�涓帹娴�
+ * 鍒涘缓涓�涓浗鏍囨帹娴�
* @param ip 鎺ㄦ祦ip
* @param port 鎺ㄦ祦绔彛
* @param ssrc 鎺ㄦ祦鍞竴鏍囪瘑
@@ -120,6 +120,39 @@
sendRtpItem.setSsrc(ssrc);
sendRtpItem.setPlatformId(platformId);
sendRtpItem.setDeviceId(deviceId);
+ sendRtpItem.setChannelId(channelId);
+ sendRtpItem.setTcp(tcp);
+ sendRtpItem.setApp("rtp");
+ sendRtpItem.setLocalPort(localPort);
+ return sendRtpItem;
+ }
+
+ /**
+ * 鍒涘缓涓�涓洿鎾帹娴�
+ * @param ip 鎺ㄦ祦ip
+ * @param port 鎺ㄦ祦绔彛
+ * @param ssrc 鎺ㄦ祦鍞竴鏍囪瘑
+ * @param platformId 骞冲彴id
+ * @param channelId 閫氶亾id
+ * @param tcp 鏄惁涓簍cp
+ * @return SendRtpItem
+ */
+ public SendRtpItem createSendRtpItem(String ip, int port, String ssrc, String platformId, String app, String stream, String channelId, boolean tcp){
+ String playSsrc = SsrcUtil.getPlaySsrc();
+ int localPort = createRTPServer(SsrcUtil.getPlaySsrc());
+ if (localPort != -1) {
+ closeRTPServer(playSsrc);
+ }else {
+ logger.error("娌℃湁鍙敤鐨勭鍙�");
+ return null;
+ }
+ SendRtpItem sendRtpItem = new SendRtpItem();
+ sendRtpItem.setIp(ip);
+ sendRtpItem.setPort(port);
+ sendRtpItem.setSsrc(ssrc);
+ sendRtpItem.setApp(app);
+ sendRtpItem.setStreamId(stream);
+ sendRtpItem.setPlatformId(platformId);
sendRtpItem.setChannelId(channelId);
sendRtpItem.setTcp(tcp);
sendRtpItem.setLocalPort(localPort);
@@ -153,6 +186,24 @@
}
/**
+ * 鏌ヨ寰呰浆鎺ㄧ殑娴佹槸鍚﹀氨缁�
+ */
+ public Boolean isStreamReady(String app, String streamId) {
+ JSONObject mediaInfo = zlmresTfulUtils.getMediaInfo(app, "rtmp", streamId);
+ return (mediaInfo.getInteger("code") == 0 && mediaInfo.getBoolean("online"));
+ }
+
+ /**
+ * 鏌ヨ杞帹鐨勬祦鏄惁鏈夊叾瀹冭鐪嬭��
+ * @param streamId
+ * @return
+ */
+ public int totalReaderCount(String app, String streamId) {
+ JSONObject mediaInfo = zlmresTfulUtils.getMediaInfo(app, "rtmp", streamId);
+ return mediaInfo.getInteger("totalReaderCount");
+ }
+
+ /**
* 璋冪敤zlm RESTful API 鈥斺�� stopSendRtp
*/
public Boolean stopSendRtpStream(Map<String, Object>param) {
--
Gitblit v1.8.0