修复方法名错别字
parent
4b7275d440
commit
e0f9c93b0f
|
@ -275,7 +275,7 @@ public class StreamInfo implements Serializable, Cloneable{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void channgeStreamIp(String localAddr) {
|
public void changeStreamIp(String localAddr) {
|
||||||
if (this.flv != null) {
|
if (this.flv != null) {
|
||||||
this.flv.setHost(localAddr);
|
this.flv.setHost(localAddr);
|
||||||
}
|
}
|
||||||
|
|
|
@ -246,7 +246,7 @@ public class CommonChannelController {
|
||||||
} catch (MalformedURLException e) {
|
} catch (MalformedURLException e) {
|
||||||
host=request.getLocalAddr();
|
host=request.getLocalAddr();
|
||||||
}
|
}
|
||||||
streamInfo.channgeStreamIp(host);
|
streamInfo.changeStreamIp(host);
|
||||||
}
|
}
|
||||||
if (!ObjectUtils.isEmpty(streamInfo.getMediaServer().getTranscodeSuffix())
|
if (!ObjectUtils.isEmpty(streamInfo.getMediaServer().getTranscodeSuffix())
|
||||||
&& !"null".equalsIgnoreCase(streamInfo.getMediaServer().getTranscodeSuffix())) {
|
&& !"null".equalsIgnoreCase(streamInfo.getMediaServer().getTranscodeSuffix())) {
|
||||||
|
|
|
@ -147,7 +147,7 @@ public class GBRecordController {
|
||||||
if (data != null) {
|
if (data != null) {
|
||||||
StreamInfo streamInfo = (StreamInfo)data;
|
StreamInfo streamInfo = (StreamInfo)data;
|
||||||
if (userSetting.getUseSourceIpAsStreamIp()) {
|
if (userSetting.getUseSourceIpAsStreamIp()) {
|
||||||
streamInfo.channgeStreamIp(request.getLocalAddr());
|
streamInfo.changeStreamIp(request.getLocalAddr());
|
||||||
}
|
}
|
||||||
wvpResult.setData(new StreamContent(streamInfo));
|
wvpResult.setData(new StreamContent(streamInfo));
|
||||||
}
|
}
|
||||||
|
|
|
@ -123,7 +123,7 @@ public class PlayController {
|
||||||
} catch (MalformedURLException e) {
|
} catch (MalformedURLException e) {
|
||||||
host=request.getLocalAddr();
|
host=request.getLocalAddr();
|
||||||
}
|
}
|
||||||
streamInfo.channgeStreamIp(host);
|
streamInfo.changeStreamIp(host);
|
||||||
}
|
}
|
||||||
if (!ObjectUtils.isEmpty(streamInfo.getMediaServer().getTranscodeSuffix()) && !"null".equalsIgnoreCase(streamInfo.getMediaServer().getTranscodeSuffix())) {
|
if (!ObjectUtils.isEmpty(streamInfo.getMediaServer().getTranscodeSuffix()) && !"null".equalsIgnoreCase(streamInfo.getMediaServer().getTranscodeSuffix())) {
|
||||||
streamInfo.setStream(streamInfo.getStream() + "_" + streamInfo.getMediaServer().getTranscodeSuffix());
|
streamInfo.setStream(streamInfo.getStream() + "_" + streamInfo.getMediaServer().getTranscodeSuffix());
|
||||||
|
|
|
@ -122,7 +122,7 @@ public class PlaybackController {
|
||||||
} catch (MalformedURLException e) {
|
} catch (MalformedURLException e) {
|
||||||
host=request.getLocalAddr();
|
host=request.getLocalAddr();
|
||||||
}
|
}
|
||||||
streamInfo.channgeStreamIp(host);
|
streamInfo.changeStreamIp(host);
|
||||||
}
|
}
|
||||||
wvpResult.setData(new StreamContent(streamInfo));
|
wvpResult.setData(new StreamContent(streamInfo));
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,12 +6,11 @@ import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam;
|
||||||
import com.genersoft.iot.vmp.utils.MediaServerUtils;
|
import com.genersoft.iot.vmp.utils.MediaServerUtils;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
import org.springframework.util.ObjectUtils;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.springframework.util.ObjectUtils;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 视频信息
|
* 视频信息
|
||||||
*/
|
*/
|
||||||
|
@ -49,8 +48,10 @@ public class MediaInfo {
|
||||||
private Long duration;
|
private Long duration;
|
||||||
@Schema(description = "在线")
|
@Schema(description = "在线")
|
||||||
private Boolean online;
|
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;
|
private Integer originType;
|
||||||
|
@Schema(description = "originType的文本描述")
|
||||||
|
private String originTypeStr;
|
||||||
@Schema(description = "产生流的源流地址")
|
@Schema(description = "产生流的源流地址")
|
||||||
private String originUrl;
|
private String originUrl;
|
||||||
@Schema(description = "存活时间,单位秒")
|
@Schema(description = "存活时间,单位秒")
|
||||||
|
@ -79,6 +80,7 @@ public class MediaInfo {
|
||||||
Boolean online = jsonObject.getBoolean("online");
|
Boolean online = jsonObject.getBoolean("online");
|
||||||
Integer originType = jsonObject.getInteger("originType");
|
Integer originType = jsonObject.getInteger("originType");
|
||||||
String originUrl = jsonObject.getString("originUrl");
|
String originUrl = jsonObject.getString("originUrl");
|
||||||
|
String originTypeStr = jsonObject.getString("originUrl");
|
||||||
Long aliveSecond = jsonObject.getLong("aliveSecond");
|
Long aliveSecond = jsonObject.getLong("aliveSecond");
|
||||||
String params = jsonObject.getString("params");
|
String params = jsonObject.getString("params");
|
||||||
Long bytesSpeed = jsonObject.getLong("bytesSpeed");
|
Long bytesSpeed = jsonObject.getLong("bytesSpeed");
|
||||||
|
@ -93,8 +95,8 @@ public class MediaInfo {
|
||||||
if (originType != null) {
|
if (originType != null) {
|
||||||
mediaInfo.setOriginType(originType);
|
mediaInfo.setOriginType(originType);
|
||||||
}
|
}
|
||||||
if (originUrl != null) {
|
if (originTypeStr != null) {
|
||||||
mediaInfo.setOriginUrl(originUrl);
|
mediaInfo.setOriginTypeStr(originTypeStr);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (aliveSecond != null) {
|
if (aliveSecond != null) {
|
||||||
|
@ -182,6 +184,7 @@ public class MediaInfo {
|
||||||
mediaInfo.setReaderCount(param.getTotalReaderCount());
|
mediaInfo.setReaderCount(param.getTotalReaderCount());
|
||||||
mediaInfo.setOnline(param.isRegist());
|
mediaInfo.setOnline(param.isRegist());
|
||||||
mediaInfo.setOriginType(param.getOriginType());
|
mediaInfo.setOriginType(param.getOriginType());
|
||||||
|
mediaInfo.setOriginTypeStr(param.getOriginTypeStr());
|
||||||
mediaInfo.setOriginUrl(param.getOriginUrl());
|
mediaInfo.setOriginUrl(param.getOriginUrl());
|
||||||
mediaInfo.setAliveSecond(param.getAliveSecond());
|
mediaInfo.setAliveSecond(param.getAliveSecond());
|
||||||
mediaInfo.setBytesSpeed(param.getBytesSpeed());
|
mediaInfo.setBytesSpeed(param.getBytesSpeed());
|
||||||
|
|
Loading…
Reference in New Issue