Android/scrcpy
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Make streamer independent of codec type

Browse source 
Rename VideoStreamer to Streamer, and extract a Codec interface which
will also support audio codecs.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
This commit is contained in:
Romain Vimont 2023-02-06 14:52:09 +01:00
parent c226797991
commit 10ce0f376a
5 changed files with 39 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
server/src/main/java/com/genymobile/scrcpy/Codec.java Normal file
View file

@ -0,0 +1,16 @@
package com.genymobile.scrcpy;
public interface Codec {
enum Type {
VIDEO,
}
Type getType();
int getId();
String getName();
String getMimeType();
}

6
server/src/main/java/com/genymobile/scrcpy/ScreenEncoder.java
View file

@ -32,7 +32,7 @@ public class ScreenEncoder implements Device.RotationListener {
private final AtomicBoolean rotationChanged = new AtomicBoolean(); private final AtomicBoolean rotationChanged = new AtomicBoolean();
private final Device device; private final Device device;
private final VideoStreamer streamer; private final Streamer streamer;
private final String encoderName; private final String encoderName;
private final List<CodecOption> codecOptions; private final List<CodecOption> codecOptions;
private final int bitRate; private final int bitRate;
@ -42,7 +42,7 @@ public class ScreenEncoder implements Device.RotationListener {
private boolean firstFrameSent; private boolean firstFrameSent;
private int consecutiveErrors; private int consecutiveErrors;
public ScreenEncoder(Device device, VideoStreamer streamer, int bitRate, int maxFps, List<CodecOption> codecOptions, String encoderName, public ScreenEncoder(Device device, Streamer streamer, int bitRate, int maxFps, List<CodecOption> codecOptions, String encoderName,
boolean downsizeOnError) { boolean downsizeOnError) {
this.device = device; this.device = device;
this.streamer = streamer; this.streamer = streamer;
@ -164,7 +164,7 @@ public class ScreenEncoder implements Device.RotationListener {
return 0; return 0;
} }
private boolean encode(MediaCodec codec, VideoStreamer streamer) throws IOException { private boolean encode(MediaCodec codec, Streamer streamer) throws IOException {
boolean eof = false; boolean eof = false;
MediaCodec.BufferInfo bufferInfo = new MediaCodec.BufferInfo(); MediaCodec.BufferInfo bufferInfo = new MediaCodec.BufferInfo();

6
server/src/main/java/com/genymobile/scrcpy/Server.java
View file

@ -100,9 +100,9 @@ public final class Server {
device.setClipboardListener(text -> controllerRef.getSender().pushClipboardText(text)); device.setClipboardListener(text -> controllerRef.getSender().pushClipboardText(text));
} }
VideoStreamer videoStreamer = new VideoStreamer(connection.getVideoFd(), codec, options.getSendCodecId(), options.getSendFrameMeta()); Streamer videoStreamer = new Streamer(connection.getVideoFd(), codec, options.getSendCodecId(), options.getSendFrameMeta());
ScreenEncoder screenEncoder = new ScreenEncoder(device, videoStreamer, options.getBitRate(), options.getMaxFps(), codecOptions, ScreenEncoder screenEncoder = new ScreenEncoder(device, videoStreamer, options.getBitRate(), options.getMaxFps(),
options.getEncoderName(), options.getDownsizeOnError()); codecOptions, options.getEncoderName(), options.getDownsizeOnError());
try { try {
// synchronous // synchronous
screenEncoder.streamScreen(); screenEncoder.streamScreen();

8
server/src/main/java/com/genymobile/scrcpy/VideoStreamer.java → server/src/main/java/com/genymobile/scrcpy/Streamer.java
View file

@ -6,26 +6,26 @@ import java.io.FileDescriptor;
import java.io.IOException; import java.io.IOException;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
public final class VideoStreamer { public final class Streamer {
private static final long PACKET_FLAG_CONFIG = 1L << 63; private static final long PACKET_FLAG_CONFIG = 1L << 63;
private static final long PACKET_FLAG_KEY_FRAME = 1L << 62; private static final long PACKET_FLAG_KEY_FRAME = 1L << 62;
private final FileDescriptor fd; private final FileDescriptor fd;
private final VideoCodec codec; private final Codec codec;
private final boolean sendCodecId; private final boolean sendCodecId;
private final boolean sendFrameMeta; private final boolean sendFrameMeta;
private final ByteBuffer headerBuffer = ByteBuffer.allocate(12); private final ByteBuffer headerBuffer = ByteBuffer.allocate(12);
public VideoStreamer(FileDescriptor fd, VideoCodec codec, boolean sendCodecId, boolean sendFrameMeta) { public Streamer(FileDescriptor fd, Codec codec, boolean sendCodecId, boolean sendFrameMeta) {
this.fd = fd; this.fd = fd;
this.codec = codec; this.codec = codec;
this.sendCodecId = sendCodecId; this.sendCodecId = sendCodecId;
this.sendFrameMeta = sendFrameMeta; this.sendFrameMeta = sendFrameMeta;
} }
public VideoCodec getCodec() { public Codec getCodec() {
return codec; return codec;
} }

14
server/src/main/java/com/genymobile/scrcpy/VideoCodec.java
View file

@ -3,7 +3,7 @@ package com.genymobile.scrcpy;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.media.MediaFormat; import android.media.MediaFormat;
public enum VideoCodec { public enum VideoCodec implements Codec {
H264(0x68_32_36_34, "h264", MediaFormat.MIMETYPE_VIDEO_AVC), H264(0x68_32_36_34, "h264", MediaFormat.MIMETYPE_VIDEO_AVC),
H265(0x68_32_36_35, "h265", MediaFormat.MIMETYPE_VIDEO_HEVC), H265(0x68_32_36_35, "h265", MediaFormat.MIMETYPE_VIDEO_HEVC),
@SuppressLint("InlinedApi") // introduced in API 21 @SuppressLint("InlinedApi") // introduced in API 21
@ -19,10 +19,22 @@ public enum VideoCodec {
this.mimeType = mimeType; this.mimeType = mimeType;
} }
@Override
public Type getType() {
return Type.VIDEO;
}
@Override
public int getId() { public int getId() {
return id; return id;
} }
@Override
public String getName() {
return name;
}
@Override
public String getMimeType() { public String getMimeType() {
return mimeType; return mimeType;
} }