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-10-04 21:03:23 +08:00
parent 809a938867
commit 4abb437c01
4 changed files with 84 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/room/Recorder.java
View File

@@ -30,6 +30,24 @@ import lombok.extern.slf4j.Slf4j;
* VP8 = 101
* H264 = 107
*
* 注意：媒体格式和录制格式一致可以直接使用`copy`代替格式参数减小`CPU`占用
*
* OPUS/VP8->AAC/H264(TS)
* ffmpeg -y -protocol_whitelist "file,rtp,udp" -thread_queue_size 1024 -c:a libopus -c:v libvpx -r:v 30 -i taoyao.sdp -c:a aac -c:v h264 -f mpegts taoyao.ts
* ffmpeg -y -protocol_whitelist "file,rtp,udp" -thread_queue_size 1024 -c:a libopus -c:v libvpx -r:v 30 -i taoyao.sdp -c:a aac -c:v h264 -f mpegts taoyao.ts
*
* OPUS/VP8->AAC/H264(MP4)
* ffmpeg -y -protocol_whitelist "file,rtp,udp" -thread_queue_size 1024 -c:a libopus -c:v libvpx -r:v 30 -i taoyao.sdp -c:a aac -c:v h264 taoyao.mp4
* ffmpeg -y -protocol_whitelist "file,rtp,udp" -thread_queue_size 1024 -c:a libopus -c:v libvpx -r:v 30 -i taoyao.sdp -c:a aac -c:v h264 taoyao.mp4
*
* PCMU/H264->AAC/H264(TS)
* ffmpeg -y -protocol_whitelist "file,rtp,udp" -thread_queue_size 1024 -i taoyao.sdp -c:a aac -c:v h264 -f mpegts taoyao.ts
* ffmpeg -y -protocol_whitelist "file,rtp,udp" -thread_queue_size 1024 -i taoyao.sdp -c:a aac -c:v h264 -f mpegts taoyao.ts
*
* PCMU/H264->AAC/H264(MP4)
* ffmpeg -y -protocol_whitelist "file,rtp,udp" -thread_queue_size 1024 -i taoyao.sdp -c:a aac -c:v copy taoyao.mp4
* ffmpeg -y -protocol_whitelist "file,rtp,udp" -thread_queue_size 1024 -i taoyao.sdp -c:a aac -c:v copy taoyao.mp4
*
* @author acgist
*/
@Slf4j

7
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/media/MediaConsumerResumeProtocol.java
View File

@@ -33,7 +33,10 @@ import lombok.extern.slf4j.Slf4j;
"consumerId": "消费者ID"
}
""",
flow = "终端->信令服务->媒体服务->信令服务->终端"
flow = {
"终端->信令服务->媒体服务->信令服务->终端",
"终端-[恢复生产者]>信令服务->媒体服务-[恢复消费者]>信令服务->终端"
}
)
public class MediaConsumerResumeProtocol extends ProtocolRoomAdapter implements ApplicationListener<MediaConsumerResumeEvent> {
@@ -49,7 +52,7 @@ public class MediaConsumerResumeProtocol extends ProtocolRoomAdapter implements
final Room room = event.getRoom();
final Client mediaClient = event.getMediaClient();
final Map<String, Object> body = Map.of(
Constant.ROOM_ID, room.getRoomId(),
Constant.ROOM_ID, room.getRoomId(),
Constant.CONSUMER_ID, event.getConsumerId()
);
mediaClient.push(this.build(body));