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-06-08 15:45:33 +08:00
parent cbd5661c56
commit 87256bcfbd
8 changed files with 58 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/party/media/Recorder.java
View File

@@ -11,8 +11,6 @@ import java.util.regex.Pattern;
import org.apache.commons.lang3.math.NumberUtils;
import com.acgist.taoyao.boot.config.FfmpegProperties;
import com.acgist.taoyao.boot.config.MediaProperties;
import com.acgist.taoyao.boot.config.MediaVideoProperties;
import com.acgist.taoyao.boot.utils.FileUtils;
import com.acgist.taoyao.boot.utils.NetUtils;
import com.acgist.taoyao.boot.utils.ScriptUtils;
@@ -130,10 +128,6 @@ public class Recorder {
* 文件路径
*/
private final String filepath;
/**
* 媒体配置
*/
private final MediaProperties mediaProperties;
/**
* FFmpeg配置
*/
@@ -146,10 +140,7 @@ public class Recorder {
* @param mediaProperties 媒体配置
* @param ffmpegProperties FFmpeg配置
*/
public Recorder(
String name, Room room, ClientWrapper clientWrapper,
MediaProperties mediaProperties, FfmpegProperties ffmpegProperties
) {
public Recorder(String name, Room room, ClientWrapper clientWrapper, FfmpegProperties ffmpegProperties) {
this.close = false;
this.running = false;
this.room = room;
@@ -158,7 +149,6 @@ public class Recorder {
this.preview = Paths.get(this.folder, "taoyao.jpg").toAbsolutePath().toString();
this.filepath = Paths.get(this.folder, "taoyao.mp4").toAbsolutePath().toString();
this.clientWrapper = clientWrapper;
this.mediaProperties = mediaProperties;
this.ffmpegProperties = ffmpegProperties;
FileUtils.mkdirs(this.folder);
}
@@ -185,10 +175,9 @@ public class Recorder {
* 录制视频
*/
private void record() {
final MediaVideoProperties mediaVideoProperties = this.mediaProperties.getVideo();
final String recordScript = String.format(
this.ffmpegProperties.getRecord(),
mediaVideoProperties.getFrameRate(),
this.ffmpegProperties.getFrameRate(),
this.sdpfile,
this.filepath
);
@@ -219,7 +208,7 @@ public class Recorder {
this.videoPort = NetUtils.scanPort(this.audioPort + 2, maxPort);
this.videoRtcpPort = NetUtils.scanPort(this.audioPort + 3, maxPort);
final String sdp = String.format(
this.ffmpegProperties.getSdp(),
this.ffmpegProperties.getRecordSdp(),
this.audioPort,
this.audioRtcpPort,
this.videoPort,

7
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/control/ControlServerRecordProtocol.java
View File

@@ -10,7 +10,6 @@ import com.acgist.taoyao.boot.annotation.Description;
import com.acgist.taoyao.boot.annotation.Protocol;
import com.acgist.taoyao.boot.config.Constant;
import com.acgist.taoyao.boot.config.FfmpegProperties;
import com.acgist.taoyao.boot.config.MediaProperties;
import com.acgist.taoyao.boot.model.Message;
import com.acgist.taoyao.boot.utils.MapUtils;
import com.acgist.taoyao.signal.client.Client;
@@ -51,12 +50,10 @@ public class ControlServerRecordProtocol extends ProtocolControlAdapter implemen
public static final String SIGNAL = "control::server::record";
private final MediaProperties mediaProperties;
private final FfmpegProperties ffmpegProperties;
public ControlServerRecordProtocol(MediaProperties mediaProperties, FfmpegProperties ffmpegProperties) {
public ControlServerRecordProtocol(FfmpegProperties ffmpegProperties) {
super("服务端录像信令", SIGNAL);
this.mediaProperties = mediaProperties;
this.ffmpegProperties = ffmpegProperties;
}
@@ -122,7 +119,7 @@ public class ControlServerRecordProtocol extends ProtocolControlAdapter implemen
}
final String name = UUID.randomUUID().toString();
// 打开录制线程
final Recorder recorder = new Recorder(name, room, clientWrapper, this.mediaProperties, this.ffmpegProperties);
final Recorder recorder = new Recorder(name, room, clientWrapper, this.ffmpegProperties);
recorder.start();
clientWrapper.setRecorder(recorder);
// 打开媒体录制