添加第三方服务参与的推流直接转发到国标功能
This commit is contained in:
@@ -104,6 +104,11 @@ public class ParentPlatform {
|
||||
*/
|
||||
private int channelCount;
|
||||
|
||||
/**
|
||||
* 共享所有的直播流
|
||||
*/
|
||||
private boolean shareAllLiveStream;
|
||||
|
||||
public Integer getId() {
|
||||
return id;
|
||||
}
|
||||
@@ -264,4 +269,12 @@ public class ParentPlatform {
|
||||
this.channelCount = channelCount;
|
||||
}
|
||||
|
||||
|
||||
public boolean isShareAllLiveStream() {
|
||||
return shareAllLiveStream;
|
||||
}
|
||||
|
||||
public void setShareAllLiveStream(boolean shareAllLiveStream) {
|
||||
this.shareAllLiveStream = shareAllLiveStream;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -31,6 +31,7 @@ import javax.sip.header.FromHeader;
|
||||
import javax.sip.message.Request;
|
||||
import javax.sip.message.Response;
|
||||
import java.text.ParseException;
|
||||
import java.util.List;
|
||||
import java.util.Vector;
|
||||
|
||||
/**
|
||||
@@ -105,7 +106,8 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
|
||||
if (platform != null) {
|
||||
// 查询平台下是否有该通道
|
||||
DeviceChannel channel = storager.queryChannelInParentPlatform(requesterId, channelId);
|
||||
GbStream gbStream = storager.queryStreamInParentPlatform(requesterId, channelId);
|
||||
List<GbStream> gbStreams = storager.queryStreamInParentPlatform(requesterId, channelId);
|
||||
GbStream gbStream = gbStreams.size() > 0? gbStreams.get(0):null;
|
||||
MediaServerItem mediaServerItem = null;
|
||||
// 不是通道可能是直播流
|
||||
if (channel != null && gbStream == null ) {
|
||||
|
||||
Reference in New Issue
Block a user