Rename --encoder to --video-encoder

This prepares the introduction of --audio-encoder.
This commit is contained in:
Romain Vimont 2023-02-22 22:44:01 +01:00
commit 8a5be9e2a6
12 changed files with 41 additions and 31 deletions

View file

@ -21,7 +21,7 @@ public class Options {
private boolean showTouches;
private boolean stayAwake;
private List<CodecOption> videoCodecOptions;
private String encoderName;
private String videoEncoder;
private boolean powerOffScreenOnClose;
private boolean clipboardAutosync = true;
private boolean downsizeOnError = true;
@ -154,12 +154,12 @@ public class Options {
this.videoCodecOptions = videoCodecOptions;
}
public String getEncoderName() {
return encoderName;
public String getVideoEncoder() {
return videoEncoder;
}
public void setEncoderName(String encoderName) {
this.encoderName = encoderName;
public void setVideoEncoder(String videoEncoder) {
this.videoEncoder = videoEncoder;
}
public void setPowerOffScreenOnClose(boolean powerOffScreenOnClose) {

View file

@ -117,7 +117,7 @@ public final class Server {
Streamer videoStreamer = new Streamer(connection.getVideoFd(), options.getVideoCodec(), options.getSendCodecId(),
options.getSendFrameMeta());
ScreenEncoder screenEncoder = new ScreenEncoder(device, videoStreamer, options.getVideoBitRate(), options.getMaxFps(),
options.getVideoCodecOptions(), options.getEncoderName(), options.getDownsizeOnError());
options.getVideoCodecOptions(), options.getVideoEncoder(), options.getDownsizeOnError());
try {
// synchronous
screenEncoder.streamScreen();
@ -245,9 +245,9 @@ public final class Server {
List<CodecOption> videoCodecOptions = CodecOption.parse(value);
options.setVideoCodecOptions(videoCodecOptions);
break;
case "encoder_name":
case "video_encoder":
if (!value.isEmpty()) {
options.setEncoderName(value);
options.setVideoEncoder(value);
}
break;
case "power_off_on_close":