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-02-25 13:51:09 +08:00
parent 129c36ed80
commit 7cd58b3403
29 changed files with 45 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
README.md
View File

@@ -1,6 +1,6 @@
# 桃夭
桃夭是套基于`Mediasoup`开发的`WebRTC`音视频信令服务，可以扩展其他智能终端接入。
桃夭是套基于`Mediasoup`开发的`WebRTC`音视频信令服务，可以非常方便的扩展信令接入更多智能终端。
<p align="center">
<img alt="Java" src="https://img.shields.io/badge/dynamic/xml?style=flat-square&label=Java&color=blueviolet&url=https://raw.githubusercontent.com/acgist/taoyao/master/taoyao-signal-server/pom.xml&query=//*[local-name()=%27java.version%27]&cacheSeconds=3600" />
@@ -25,10 +25,6 @@
|taoyao-client-harmony|鸿蒙终端|鸿蒙智能终端接入|
|taoyao-signal-server|信令服务|终端信令控制|
## 模式
监控模式、直播模式、会议模式、屏幕共享模式
## 部署
[部署文档](./docs/Deploy.md)
@@ -70,11 +66,4 @@
* 音频：降噪、混音、变声
* 视频：水印、美颜、AI识别
* P2P
* 信令直传
* 信令服务集群
* 安全处理：房间
* 媒体交互式启动
* 会议调整为房间
* 内外网/多网卡环境
* 一个信令服务多个媒体服务
* 反复测试推流拉流、拉人踢人、音频视频控制

6
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/controller/RoomController.java
View File

@@ -9,9 +9,9 @@ import org.springframework.web.bind.annotation.RestController;
import com.acgist.taoyao.boot.model.Message;
import com.acgist.taoyao.signal.client.ClientStatus;
import com.acgist.taoyao.signal.terminal.media.Room;
import com.acgist.taoyao.signal.terminal.media.RoomManager;
import com.acgist.taoyao.signal.terminal.media.RoomStatus;
import com.acgist.taoyao.signal.flute.media.Room;
import com.acgist.taoyao.signal.flute.media.RoomManager;
import com.acgist.taoyao.signal.flute.media.RoomStatus;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;

4
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/MediaProduceEvent.java
View File

@@ -1,8 +1,8 @@
package com.acgist.taoyao.signal.event;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.terminal.media.Producer;
import com.acgist.taoyao.signal.terminal.media.Room;
import com.acgist.taoyao.signal.flute.media.Producer;
import com.acgist.taoyao.signal.flute.media.Room;
import lombok.Getter;
import lombok.Setter;

2
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/event/RoomEventAdapter.java
View File

@@ -3,7 +3,7 @@ package com.acgist.taoyao.signal.event;
import java.util.Map;
import com.acgist.taoyao.boot.model.Message;
import com.acgist.taoyao.signal.terminal.media.Room;
import com.acgist.taoyao.signal.flute.media.Room;
import lombok.Getter;

2
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/ClientWrapper.java → taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/ClientWrapper.java
View File

@@ -1,4 +1,4 @@
package com.acgist.taoyao.signal.terminal.media;
package com.acgist.taoyao.signal.flute.media;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;

2
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/Consumer.java → taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/Consumer.java
View File

@@ -1,4 +1,4 @@
package com.acgist.taoyao.signal.terminal.media;
package com.acgist.taoyao.signal.flute.media;
import com.acgist.taoyao.signal.client.Client;

5
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/DataConsumer.java Normal file
View File

@@ -0,0 +1,5 @@
package com.acgist.taoyao.signal.flute.media;
public class DataConsumer {
}

2
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/DataProducer.java → taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/DataProducer.java
View File

@@ -1,4 +1,4 @@
package com.acgist.taoyao.signal.terminal.media;
package com.acgist.taoyao.signal.flute.media;
import java.util.Map;

2
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/Kind.java → taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/Kind.java
View File

@@ -1,4 +1,4 @@
package com.acgist.taoyao.signal.terminal.media;
package com.acgist.taoyao.signal.flute.media;
import com.acgist.taoyao.boot.model.MessageCodeException;

2
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/Producer.java → taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/Producer.java
View File

@@ -1,4 +1,4 @@
package com.acgist.taoyao.signal.terminal.media;
package com.acgist.taoyao.signal.flute.media;
import java.util.Map;

2
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/Room.java → taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/Room.java
View File

@@ -1,4 +1,4 @@
package com.acgist.taoyao.signal.terminal.media;
package com.acgist.taoyao.signal.flute.media;
import java.io.Closeable;
import java.util.List;

2
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/RoomManager.java → taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/RoomManager.java
View File

@@ -1,4 +1,4 @@
package com.acgist.taoyao.signal.terminal.media;
package com.acgist.taoyao.signal.flute.media;
import java.util.List;
import java.util.Map;

2
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/RoomStatus.java → taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/RoomStatus.java
View File

@@ -1,4 +1,4 @@
package com.acgist.taoyao.signal.terminal.media;
package com.acgist.taoyao.signal.flute.media;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;

2
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/Transport.java → taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/media/Transport.java
View File

@@ -1,4 +1,4 @@
package com.acgist.taoyao.signal.terminal.media;
package com.acgist.taoyao.signal.flute.media;
import java.io.Closeable;
import java.util.Map;

4
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/flute/package-info.java Normal file
View File

@@ -0,0 +1,4 @@
/**
* 不同终端管理
*/
package com.acgist.taoyao.signal.flute;

2
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolAdapter.java
View File

@@ -10,7 +10,7 @@ import com.acgist.taoyao.boot.model.MessageCode;
import com.acgist.taoyao.boot.service.IdService;
import com.acgist.taoyao.signal.client.ClientManager;
import com.acgist.taoyao.signal.event.ApplicationEventAdapter;
import com.acgist.taoyao.signal.terminal.media.RoomManager;
import com.acgist.taoyao.signal.flute.media.RoomManager;
import lombok.extern.slf4j.Slf4j;

2
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/ProtocolRoomAdapter.java
View File

@@ -8,7 +8,7 @@ import com.acgist.taoyao.boot.model.MessageCodeException;
import com.acgist.taoyao.boot.utils.MapUtils;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.terminal.media.Room;
import com.acgist.taoyao.signal.flute.media.Room;
/**
* 房间信令适配器

2
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaAudioActiveSpeakerProtocol.java
View File

@@ -6,8 +6,8 @@ import com.acgist.taoyao.boot.annotation.Protocol;
import com.acgist.taoyao.boot.model.Message;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.flute.media.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
import com.acgist.taoyao.signal.terminal.media.Room;
/**
* 当前讲话终端信令

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

@@ -14,11 +14,11 @@ import com.acgist.taoyao.boot.utils.MapUtils;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.event.MediaProduceEvent;
import com.acgist.taoyao.signal.flute.media.ClientWrapper;
import com.acgist.taoyao.signal.flute.media.Producer;
import com.acgist.taoyao.signal.flute.media.Room;
import com.acgist.taoyao.signal.flute.media.Transport;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
import com.acgist.taoyao.signal.terminal.media.ClientWrapper;
import com.acgist.taoyao.signal.terminal.media.Producer;
import com.acgist.taoyao.signal.terminal.media.Room;
import com.acgist.taoyao.signal.terminal.media.Transport;
/**
* 消费媒体信令

6
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaProduceProtocol.java
View File

@@ -10,10 +10,10 @@ import com.acgist.taoyao.boot.utils.MapUtils;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.event.MediaProduceEvent;
import com.acgist.taoyao.signal.flute.media.ClientWrapper;
import com.acgist.taoyao.signal.flute.media.Producer;
import com.acgist.taoyao.signal.flute.media.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
import com.acgist.taoyao.signal.terminal.media.ClientWrapper;
import com.acgist.taoyao.signal.terminal.media.Producer;
import com.acgist.taoyao.signal.terminal.media.Room;
import lombok.extern.slf4j.Slf4j;

2
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaProducerScoreProtocol.java
View File

@@ -7,8 +7,8 @@ import com.acgist.taoyao.boot.annotation.Protocol;
import com.acgist.taoyao.boot.model.Message;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.flute.media.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
import com.acgist.taoyao.signal.terminal.media.Room;
/**
* 媒体生产者评分信令

2
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaRouterRtpCapabilitiesProtocol.java
View File

@@ -7,8 +7,8 @@ import com.acgist.taoyao.boot.annotation.Protocol;
import com.acgist.taoyao.boot.model.Message;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.flute.media.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
import com.acgist.taoyao.signal.terminal.media.Room;
/**
* 路由RTP能力信令

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

@@ -9,8 +9,8 @@ import com.acgist.taoyao.boot.model.Message;
import com.acgist.taoyao.boot.utils.MapUtils;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.flute.media.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
import com.acgist.taoyao.signal.terminal.media.Room;
import lombok.extern.slf4j.Slf4j;

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

@@ -14,10 +14,10 @@ import com.acgist.taoyao.boot.utils.MapUtils;
import com.acgist.taoyao.boot.utils.NetUtils;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.flute.media.ClientWrapper;
import com.acgist.taoyao.signal.flute.media.Room;
import com.acgist.taoyao.signal.flute.media.Transport;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
import com.acgist.taoyao.signal.terminal.media.ClientWrapper;
import com.acgist.taoyao.signal.terminal.media.Room;
import com.acgist.taoyao.signal.terminal.media.Transport;
import lombok.extern.slf4j.Slf4j;

2
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomCloseProtocol.java
View File

@@ -7,8 +7,8 @@ import com.acgist.taoyao.boot.annotation.Protocol;
import com.acgist.taoyao.boot.model.Message;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.flute.media.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
import com.acgist.taoyao.signal.terminal.media.Room;
/**
* 关闭房间信令

2
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomCreateProtocol.java
View File

@@ -13,8 +13,8 @@ import com.acgist.taoyao.boot.utils.MapUtils;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.event.MediaClientRegisterEvent;
import com.acgist.taoyao.signal.flute.media.Room;
import com.acgist.taoyao.signal.protocol.ProtocolClientAdapter;
import com.acgist.taoyao.signal.terminal.media.Room;
import lombok.extern.slf4j.Slf4j;

4
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/room/RoomEnterProtocol.java
View File

@@ -11,9 +11,9 @@ import com.acgist.taoyao.boot.model.MessageCodeException;
import com.acgist.taoyao.boot.utils.MapUtils;
import com.acgist.taoyao.signal.client.Client;
import com.acgist.taoyao.signal.client.ClientType;
import com.acgist.taoyao.signal.flute.media.ClientWrapper;
import com.acgist.taoyao.signal.flute.media.Room;
import com.acgist.taoyao.signal.protocol.ProtocolRoomAdapter;
import com.acgist.taoyao.signal.terminal.media.ClientWrapper;
import com.acgist.taoyao.signal.terminal.media.Room;
import lombok.extern.slf4j.Slf4j;

5
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/media/DataConsumer.java
View File

@@ -1,5 +0,0 @@
package com.acgist.taoyao.signal.terminal.media;
public class DataConsumer {
}

4
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/terminal/package-info.java
View File

@@ -1,4 +0,0 @@
/**
* 终端功能代码
*/
package com.acgist.taoyao.signal.terminal;