qq27800734/taoyao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[*] 日常优化

Browse Source
This commit is contained in:
acgist
2023-09-08 10:11:53 +08:00
parent 475bb71300
commit 587b3c99d5
5 changed files with 234 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaTransportPlainProtocol.java → taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaTransportPlainCreateProtocol.java
View File

@@ -33,27 +33,34 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
@Protocol
@Description(
memo = "用来接入RTP终端",
memo = "用来接入RTP协议终端",
body = """
{
"roomId" : "房间ID",
"rtcpMux" : RTP和RTCP端口复用（true|false）,
"comedia" : 自动识别终端端口（true|false）,
"enableSctp" : 是否开启SCTP（true|false）,
"numSctpStreams": SCTP数量,
"enableSrtp" : 是否开启SRTP（true|false）,
"roomId" : "房间ID",
"rtcpMux" : RTP/RTCP端口复用（true|false）,
"comedia" : 自动识别终端端口（true|false）,
"enableSctp" : 是否开启SCTP（true|false）,
"numSctpStreams" : SCTP数量,
"enableSrtp" : 是否开启SRTP（true|false）,
"srtpCryptoSuite": {
"cryptoSuite": "算法（AEAD_AES_256_GCM|AEAD_AES_128_GCM|AES_CM_128_HMAC_SHA1_80|AES_CM_128_HMAC_SHA1_32）",
"keyBase64" : "密钥"
}
}
{
roomId : "房间ID",
transportId: "通道ID",
ip : "RTP监听IP",
port : "RTP媒体端口",
rtcpPort : "RTP媒体RTCP端口"
}
"""
)
public class MediaTransportPlainProtocol extends ProtocolRoomAdapter {
public class MediaTransportPlainCreateProtocol extends ProtocolRoomAdapter {
public static final String SIGNAL = "media::transport::plain";
public static final String SIGNAL = "media::transport::plain::create";
public MediaTransportPlainProtocol() {
public MediaTransportPlainCreateProtocol() {
super("创建RTP输入通道信令", SIGNAL);
}
@@ -77,11 +84,20 @@ public class MediaTransportPlainProtocol extends ProtocolRoomAdapter {
log.warn("发送通道已经存在：{}", transportId);
}
clientWrapper.setSendTransport(sendTransport);
// TODO：双向队列
// 拷贝属性
sendTransport.copy(responseBody);
// TODO：需要测试
// 消费者
Transport recvTransport = clientWrapper.getRecvTransport();
if(recvTransport == null) {
recvTransport = new Transport(transportId, Direction.RECV, room, client);
// transports.put(transportId, recvTransport);
// 消费媒体
// this.publishEvent(new MediaConsumeEvent(room, clientWrapper));
} else {
log.warn("接收通道已经存在：{}", transportId);
}
clientWrapper.setRecvTransport(recvTransport);
client.push(response);
log.info("{}创建RTP信令通道：{}", clientId, transportId);
log.info("{}创建RTP输入通道：{}", clientId, transportId);
}
/**

4
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaTransportWebRtcConnectProtocol.java
View File

@@ -30,7 +30,7 @@ import lombok.extern.slf4j.Slf4j;
"dtlsParameters": "DTLS参数"
}
{
"roomId" : "房间标识",
"roomId" : "房间ID",
"transportId" : "传输通道标识"
}
"""
@@ -52,7 +52,7 @@ public class MediaTransportWebRtcConnectProtocol extends ProtocolRoomAdapter {
final Map<String, Object> responseBody = response.body();
client.push(response);
final String transportId = MapUtils.get(responseBody, Constant.TRANSPORT_ID);
log.info("{}连接WebRTC通道信令：{}", clientId, transportId);
log.info("{}连接WebRTC通道：{}", clientId, transportId);
} else {
this.logNoAdapter(clientType);
}

36
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaTransportWebRtcCreateProtocol.java
View File

@@ -34,15 +34,15 @@ import lombok.extern.slf4j.Slf4j;
body = {
"""
{
"roomId" : "房间标识",
"roomId" : "房间ID",
"forceTcp" : "强制使用TCP",
"producing" : "是否生产",
"consuming" : "是否消费",
"sctpCapabilities": "sctpCapabilities"
}
{
"roomId" : "房间标识",
"transportId" : "传输通道标识",
"roomId" : "房间ID",
"transportId" : "传输通道ID",
"iceCandidates" : "iceCandidates",
"iceParameters" : "iceParameters",
"dtlsParameters": "dtlsParameters",
@@ -72,6 +72,20 @@ public class MediaTransportWebRtcCreateProtocol extends ProtocolRoomAdapter {
this.rewriteIP(client.getIP(), responseBody);
// 处理逻辑
final ClientWrapper clientWrapper = room.clientWrapper(client);
// 生产者
final Boolean producing = MapUtils.getBoolean(body, Constant.PRODUCING);
if(Boolean.TRUE.equals(producing)) {
Transport sendTransport = clientWrapper.getSendTransport();
if(sendTransport == null) {
sendTransport = new Transport(transportId, Direction.SEND, room, client);
transports.put(transportId, sendTransport);
} else {
log.warn("发送通道已经存在：{}", transportId);
}
clientWrapper.setSendTransport(sendTransport);
// 拷贝属性
sendTransport.copy(responseBody);
}
// 消费者
final Boolean consuming = MapUtils.getBoolean(body, Constant.CONSUMING);
if(Boolean.TRUE.equals(consuming)) {
@@ -88,22 +102,8 @@ public class MediaTransportWebRtcCreateProtocol extends ProtocolRoomAdapter {
// 消费媒体：不能在连接时调用
this.publishEvent(new MediaConsumeEvent(room, clientWrapper));
}
// 生产者
final Boolean producing = MapUtils.getBoolean(body, Constant.PRODUCING);
if(Boolean.TRUE.equals(producing)) {
Transport sendTransport = clientWrapper.getSendTransport();
if(sendTransport == null) {
sendTransport = new Transport(transportId, Direction.SEND, room, client);
transports.put(transportId, sendTransport);
} else {
log.warn("发送通道已经存在：{}", transportId);
}
clientWrapper.setSendTransport(sendTransport);
// 拷贝属性
sendTransport.copy(responseBody);
}
client.push(response);
log.info("{}创建WebRTC通道信令：{}", clientId, transportId);
log.info("{}创建WebRTC通道：{}", clientId, transportId);
} else {
this.logNoAdapter(clientType);
}