Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修复方法名错别字

master
lin 2025-03-12 15:02:32 +08:00
parent 4b7275d440
commit e0f9c93b0f
6 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
View File

@ -275,7 +275,7 @@ public class StreamInfo implements Serializable, Cloneable{
}
}
public void channgeStreamIp(String localAddr) {
public void changeStreamIp(String localAddr) {
if (this.flv != null) {
this.flv.setHost(localAddr);
}

2
src/main/java/com/genersoft/iot/vmp/gb28181/controller/CommonChannelController.java
View File

@ -246,7 +246,7 @@ public class CommonChannelController {
} catch (MalformedURLException e) {
host=request.getLocalAddr();
}
streamInfo.channgeStreamIp(host);
streamInfo.changeStreamIp(host);
}
if (!ObjectUtils.isEmpty(streamInfo.getMediaServer().getTranscodeSuffix())
&& !"null".equalsIgnoreCase(streamInfo.getMediaServer().getTranscodeSuffix())) {

2
src/main/java/com/genersoft/iot/vmp/gb28181/controller/GBRecordController.java
View File

@ -147,7 +147,7 @@ public class GBRecordController {
if (data != null) {
StreamInfo streamInfo = (StreamInfo)data;
if (userSetting.getUseSourceIpAsStreamIp()) {
streamInfo.channgeStreamIp(request.getLocalAddr());
streamInfo.changeStreamIp(request.getLocalAddr());
}
wvpResult.setData(new StreamContent(streamInfo));
}

2
src/main/java/com/genersoft/iot/vmp/gb28181/controller/PlayController.java
View File

@ -123,7 +123,7 @@ public class PlayController {
} catch (MalformedURLException e) {
host=request.getLocalAddr();
}
streamInfo.channgeStreamIp(host);
streamInfo.changeStreamIp(host);
}
if (!ObjectUtils.isEmpty(streamInfo.getMediaServer().getTranscodeSuffix()) && !"null".equalsIgnoreCase(streamInfo.getMediaServer().getTranscodeSuffix())) {
streamInfo.setStream(streamInfo.getStream() + "_" + streamInfo.getMediaServer().getTranscodeSuffix());

2
src/main/java/com/genersoft/iot/vmp/gb28181/controller/PlaybackController.java
View File

@ -122,7 +122,7 @@ public class PlaybackController {
} catch (MalformedURLException e) {
host=request.getLocalAddr();
}
streamInfo.channgeStreamIp(host);
streamInfo.changeStreamIp(host);
}
wvpResult.setData(new StreamContent(streamInfo));
}

13
src/main/java/com/genersoft/iot/vmp/media/bean/MediaInfo.java
View File

@ -6,12 +6,11 @@ import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam;
import com.genersoft.iot.vmp.utils.MediaServerUtils;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.util.ObjectUtils;
import java.util.List;
import java.util.Map;
import org.springframework.util.ObjectUtils;
/**
* 视频信息
*/
@ -49,8 +48,10 @@ public class MediaInfo {
private Long duration;
@Schema(description = "在线")
private Boolean online;
@Schema(description = "unknown = 0,rtmp_push=1,rtsp_push=2,rtp_push=3,pull=4,ffmpeg_pull=5,mp4_vod=6,device_chn=7")
@Schema(description = "unknown = 0,rtmp_push=1,rtsp_push=2,rtp_push=3,pull=4,ffmpeg_pull=5,mp4_vod=6,device_chn=7,rtc_push=8")
private Integer originType;
@Schema(description = "originType的文本描述")
private String originTypeStr;
@Schema(description = "产生流的源流地址")
private String originUrl;
@Schema(description = "存活时间，单位秒")
@ -79,6 +80,7 @@ public class MediaInfo {
Boolean online = jsonObject.getBoolean("online");
Integer originType = jsonObject.getInteger("originType");
String originUrl = jsonObject.getString("originUrl");
String originTypeStr = jsonObject.getString("originUrl");
Long aliveSecond = jsonObject.getLong("aliveSecond");
String params = jsonObject.getString("params");
Long bytesSpeed = jsonObject.getLong("bytesSpeed");
@ -93,8 +95,8 @@ public class MediaInfo {
if (originType != null) {
mediaInfo.setOriginType(originType);
}
if (originUrl != null) {
mediaInfo.setOriginUrl(originUrl);
if (originTypeStr != null) {
mediaInfo.setOriginTypeStr(originTypeStr);
}
if (aliveSecond != null) {
@ -182,6 +184,7 @@ public class MediaInfo {
mediaInfo.setReaderCount(param.getTotalReaderCount());
mediaInfo.setOnline(param.isRegist());
mediaInfo.setOriginType(param.getOriginType());
mediaInfo.setOriginTypeStr(param.getOriginTypeStr());
mediaInfo.setOriginUrl(param.getOriginUrl());
mediaInfo.setAliveSecond(param.getAliveSecond());
mediaInfo.setBytesSpeed(param.getBytesSpeed());