XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复语音对讲返回的地址

Browse Source
This commit is contained in:
648540858
2023-02-07 14:52:33 +08:00
parent c226deacff
commit 922a9e8b32
3 changed files with 50 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
View File

@@ -39,6 +39,7 @@ import com.genersoft.iot.vmp.utils.DateUtil;
import com.genersoft.iot.vmp.utils.redis.RedisUtil;
import com.genersoft.iot.vmp.vmanager.bean.AudioBroadcastResult;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import com.genersoft.iot.vmp.vmanager.bean.StreamContent;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import com.genersoft.iot.vmp.vmanager.gb28181.play.bean.AudioBroadcastEvent;
import gov.nist.javax.sip.message.SIPResponse;
@@ -1004,7 +1005,7 @@ public class PlayServiceImpl implements IPlayService {
AudioBroadcastResult audioBroadcastResult = new AudioBroadcastResult();
audioBroadcastResult.setApp(app);
audioBroadcastResult.setStream(stream);
audioBroadcastResult.setStreamInfo(mediaService.getStreamInfoByAppAndStream(mediaServerItem, app, stream, null, null, null,false));
audioBroadcastResult.setStreamInfo(new StreamContent(mediaService.getStreamInfoByAppAndStream(mediaServerItem, app, stream, null, null, null,false)));
audioBroadcastResult.setCodec("G.711");
return audioBroadcastResult;
}

10
src/main/java/com/genersoft/iot/vmp/vmanager/bean/AudioBroadcastResult.java
View File

@@ -1,9 +1,5 @@
package com.genersoft.iot.vmp.vmanager.bean;
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItemLite;
/**
* @author lin
*/
@@ -11,7 +7,7 @@ public class AudioBroadcastResult {
/**
* 推流的各个方式流地址
*/
private StreamInfo streamInfo;
private StreamContent streamInfo;
/**
* 编码格式
@@ -29,11 +25,11 @@ public class AudioBroadcastResult {
private String stream;
public StreamInfo getStreamInfo() {
public StreamContent getStreamInfo() {
return streamInfo;
}
public void setStreamInfo(StreamInfo streamInfo) {
public void setStreamInfo(StreamContent streamInfo) {
this.streamInfo = streamInfo;
}