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-08-02 07:41:28 +08:00
parent 2ab0d237db
commit 7d1e9f3a09
5 changed files with 67 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaAudioVolumeProtocol.java
View File

@@ -19,33 +19,33 @@ import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
@Description(
body = """
{
"roomId": "房间ID",
"roomId" : "房间ID",
"volumes" : [
{
"volume": 音量,
"volume" : 音量,
"clientId": "终端ID"
},
...
]
}
""",
flow = "媒体服务->信令服务->终端"
flow = "媒体服务->信令服务-)终端"
)
public class MediaAudioVolumeProtocol extends ProtocolRoomAdapter {
public static final String SIGNAL = "media::audio::volume";
public MediaAudioVolumeProtocol() {
super("终端音量信令", SIGNAL);
}
public static final String SIGNAL = "media::audio::volume";
public MediaAudioVolumeProtocol() {
super("终端音量信令", SIGNAL);
}
@Override
public void execute(String clientId, ClientType clientType, Room room, Client client, Client mediaClient, Message message, Map<String, Object> body) {
if(clientType.mediaServer()) {
room.broadcast(message);
} else {
this.logNoAdapter(clientType);
}
}
@Override
public void execute(String clientId, ClientType clientType, Room room, Client client, Client mediaClient, Message message, Map<String, Object> body) {
if(clientType.mediaServer()) {
room.broadcast(message);
} else {
this.logNoAdapter(clientType);
}
}
}

26
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumeProtocol.java
View File

@@ -39,14 +39,14 @@ import lombok.extern.slf4j.Slf4j;
""",
body = """
{
"roomId": "房间ID"
"roomId" : "房间ID"
"producerId": "生产者ID"
}
""",
flow = {
"终端-[生产媒体]>信令服务-[其他终端消费])信令服务",
"终端-[创建WebRTC消费通道]>信令服务-[消费其他终端])信令服务",
"终端->信令服务->媒体服务=>信令服务->终端->信令服务->媒体服务"
"终端-[生产媒体]>信令服务-[消费媒体])信令服务=>信令服务->终端",
"终端-[创建WebRTC通道]>信令服务-[消费媒体])信令服务=>信令服务->终端",
"终端->信令服务->媒体服务=>信令服务->终端"
}
)
public class MediaConsumeProtocol extends ProtocolRoomAdapter implements ApplicationListener<MediaConsumeEvent> {
@@ -63,12 +63,12 @@ public class MediaConsumeProtocol extends ProtocolRoomAdapter implements Applica
final Room room = event.getRoom();
if(event.getProducer() != null) {
// 生产媒体：其他终端消费
final Producer producer = event.getProducer();
final Producer producer = event.getProducer();
final ClientWrapper produceClientWrapper = producer.getProducerClient();
room.getClients().values().stream()
.filter(v -> v != produceClientWrapper)
.filter(v -> v.getRecvTransport() != null)
.filter(v -> v.getSubscribeType().canConsume(producer))
.filter(v -> v != produceClientWrapper)
.filter(v -> v.getRecvTransport() != null)
.filter(v -> v.getSubscribeType().canConsume(producer))
.forEach(v -> this.consume(room, v, producer, this.build()));
} else if(event.getClientWrapper() != null) {
// 创建WebRTC消费通道：消费其他终端
@@ -78,9 +78,9 @@ public class MediaConsumeProtocol extends ProtocolRoomAdapter implements Applica
return;
}
room.getClients().values().stream()
.filter(v -> v != consumeClientWrapper)
.filter(v -> v != consumeClientWrapper)
.flatMap(v -> v.getProducers().values().stream())
.filter(v -> consumeClientWrapper.getSubscribeType().canConsume(v))
.filter(v -> consumeClientWrapper.getSubscribeType().canConsume(v))
.forEach(producer -> this.consume(room, consumeClientWrapper, producer, this.build()));
} else {
throw MessageCodeException.of("消费媒体失败");
@@ -121,10 +121,10 @@ public class MediaConsumeProtocol extends ProtocolRoomAdapter implements Applica
/**
* 消费媒体
*
* @param room 房间
* @param room 房间
* @param consumerClientWrapper 消费者终端包装器
* @param producer 生产者
* @param message 消息
* @param producer 生产者
* @param message 消息
*/
private void consume(Room room, ClientWrapper consumerClientWrapper, Producer producer, Message message) {
final Client mediaClient = room.getMediaClient();