From dbdb9ca06d3a6a357abe52b393bb398f4e1e8a4a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 01 六月 2023 15:58:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
index 3037e3f..f73392f 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
@@ -106,7 +106,7 @@
}
String dstUrl = String.format("rtmp://%s:%s/%s/%s", "127.0.0.1", mediaInfo.getRtmpPort(), param.getApp(),
param.getStream() );
- param.setDst_url(dstUrl);
+ param.setDstUrl(dstUrl);
StringBuffer resultMsg = new StringBuffer();
param.setMediaServerId(mediaInfo.getId());
boolean saveResult;
@@ -127,7 +127,7 @@
resultMsg.append(", 浣嗘槸鍚敤澶辫触锛岃妫�鏌ユ祦鍦板潃鏄惁鍙敤");
param.setEnable(false);
// 鐩存帴绉婚櫎
- if (param.isEnable_remove_none_reader()) {
+ if (param.isEnableRemoveNoneReader()) {
del(param.getApp(), param.getStream());
}else {
updateStreamProxy(param);
@@ -228,11 +228,11 @@
}
if ("default".equals(param.getType())){
result = zlmresTfulUtils.addStreamProxy(mediaServerItem, param.getApp(), param.getStream(), param.getUrl(),
- param.isEnable_audio(), param.isEnable_mp4(), param.getRtp_type());
+ param.isEnableAudio(), param.isEnableMp4(), param.getRtpType());
}else if ("ffmpeg".equals(param.getType())) {
- result = zlmresTfulUtils.addFFmpegSource(mediaServerItem, param.getSrc_url(), param.getDst_url(),
- param.getTimeout_ms() + "", param.isEnable_audio(), param.isEnable_mp4(),
- param.getFfmpeg_cmd_key());
+ result = zlmresTfulUtils.addFFmpegSource(mediaServerItem, param.getSrcUrl(), param.getDstUrl(),
+ param.getTimeoutMs() + "", param.isEnableAudio(), param.isEnableMp4(),
+ param.getFfmpegCmdKey());
}
return result;
}
@@ -286,7 +286,7 @@
updateStreamProxy(streamProxy);
}else {
logger.info("鍚敤浠ｇ悊澶辫触锛� {}/{}->{}({})", app, stream, jsonObject.getString("msg"),
- streamProxy.getSrc_url() == null? streamProxy.getUrl():streamProxy.getSrc_url());
+ streamProxy.getSrcUrl() == null? streamProxy.getUrl():streamProxy.getSrcUrl());
}
}
return result;
--
Gitblit v1.8.0