mirrors/scrcpy
0
0
Fork 0
mirror of https://github.com/Genymobile/scrcpy.git synced 2025-08-03 06:39:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Dealing with Conflict

Browse source
This commit is contained in:
gz0119 2025-03-10 21:00:46 +08:00
commit 6ea2e79052
3 changed files with 11 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/src/demuxer.c
View file

@ -9,7 +9,7 @@
#include "util/binary.h" #include "util/binary.h"
#include "util/log.h" #include "util/log.h"
#define SC_PACKET_HEADER_SIZE 16 #define SC_PACKET_HEADER_SIZE 12
#define SC_PACKET_FLAG_CONFIG (UINT64_C(1) << 63) #define SC_PACKET_FLAG_CONFIG (UINT64_C(1) << 63)
#define SC_PACKET_FLAG_KEY_FRAME (UINT64_C(1) << 62) #define SC_PACKET_FLAG_KEY_FRAME (UINT64_C(1) << 62)
@ -95,11 +95,11 @@ sc_demuxer_recv_packet(struct sc_demuxer *demuxer, AVPacket *packet) {
// The video and audio streams contain a sequence of raw packets (as // The video and audio streams contain a sequence of raw packets (as
// provided by MediaCodec), each prefixed with a "meta" header. // provided by MediaCodec), each prefixed with a "meta" header.
// //
// The "meta" header length is 16 bytes: // The "meta" header length is 12 bytes:
// [. . . . . . . .|. . . .][. . . .]. . . . . . . . . . . . . . . ... // [. . . . . . . .|. . . .]. . . . . . . . . . . . . . . ...
// <-------------> <------> <------> <-----------------------------... // <-------------> <-----> <-----------------------------...
// PTS packet screen raw packet // PTS packet raw packet
// size orientation // size
// //
// It is followed by <packet_size> bytes containing the packet/frame. // It is followed by <packet_size> bytes containing the packet/frame.
// //
@ -149,7 +149,6 @@ sc_demuxer_recv_packet(struct sc_demuxer *demuxer, AVPacket *packet) {
} }
packet->dts = packet->pts; packet->dts = packet->pts;
return true; return true;
} }

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

@ -132,7 +132,7 @@ public final class Server {
audioCapture = new AudioPlaybackCapture(options.getAudioDup()); audioCapture = new AudioPlaybackCapture(options.getAudioDup());
} }
Streamer audioStreamer = new Streamer(connection.getAudioFd(), audioCodec, options.getSendCodecMeta(), options.getSendFrameMeta(), options.getDisplayId()); Streamer audioStreamer = new Streamer(connection.getAudioFd(), audioCodec, options.getSendCodecMeta(), options.getSendFrameMeta());
AsyncProcessor audioRecorder; AsyncProcessor audioRecorder;
if (audioCodec == AudioCodec.RAW) { if (audioCodec == AudioCodec.RAW) {
audioRecorder = new AudioRawRecorder(audioCapture, audioStreamer); audioRecorder = new AudioRawRecorder(audioCapture, audioStreamer);
@ -144,7 +144,7 @@ public final class Server {
if (video) { if (video) {
Streamer videoStreamer = new Streamer(connection.getVideoFd(), options.getVideoCodec(), options.getSendCodecMeta(), Streamer videoStreamer = new Streamer(connection.getVideoFd(), options.getVideoCodec(), options.getSendCodecMeta(),
options.getSendFrameMeta(), options.getDisplayId()); options.getSendFrameMeta());
SurfaceCapture surfaceCapture; SurfaceCapture surfaceCapture;
if (options.getVideoSource() == VideoSource.DISPLAY) { if (options.getVideoSource() == VideoSource.DISPLAY) {
NewDisplay newDisplay = options.getNewDisplay(); NewDisplay newDisplay = options.getNewDisplay();

13
server/src/main/java/com/genymobile/scrcpy/device/Streamer.java
View file

@ -21,17 +21,15 @@ public final class Streamer {
private final Codec codec; private final Codec codec;
private final boolean sendCodecMeta; private final boolean sendCodecMeta;
private final boolean sendFrameMeta; private final boolean sendFrameMeta;
private final int displayId;
private final int HEADER_PACKET_SIZE = 12; private final int HEADER_PACKET_SIZE = 12;
private final ByteBuffer headerBuffer = ByteBuffer.allocate(HEADER_PACKET_SIZE); private final ByteBuffer headerBuffer = ByteBuffer.allocate(HEADER_PACKET_SIZE);
public Streamer(FileDescriptor fd, Codec codec, boolean sendCodecMeta, boolean sendFrameMeta, int displayId) { public Streamer(FileDescriptor fd, Codec codec, boolean sendCodecMeta, boolean sendFrameMeta) {
this.fd = fd; this.fd = fd;
this.codec = codec; this.codec = codec;
this.sendCodecMeta = sendCodecMeta; this.sendCodecMeta = sendCodecMeta;
this.sendFrameMeta = sendFrameMeta; this.sendFrameMeta = sendFrameMeta;
this.displayId = displayId;
} }
public Codec getCodec() { public Codec getCodec() {
@ -79,15 +77,11 @@ public final class Streamer {
} }
if (sendFrameMeta) { if (sendFrameMeta) {
int screenOrientation = getScreenOrientation(); writeFrameMeta(fd, buffer.remaining(), pts, config, keyFrame);
writeFrameMeta(fd, buffer.remaining(), pts, config, keyFrame, screenOrientation);
} }
IO.writeFully(fd, buffer); IO.writeFully(fd, buffer);
} }
private int getScreenOrientation() {
return Device.getCurrentRotation(this.displayId);
}
public void writePacket(ByteBuffer codecBuffer, MediaCodec.BufferInfo bufferInfo) throws IOException { public void writePacket(ByteBuffer codecBuffer, MediaCodec.BufferInfo bufferInfo) throws IOException {
long pts = bufferInfo.presentationTimeUs; long pts = bufferInfo.presentationTimeUs;
@ -96,7 +90,7 @@ public final class Streamer {
writePacket(codecBuffer, pts, config, keyFrame); writePacket(codecBuffer, pts, config, keyFrame);
} }
private void writeFrameMeta(FileDescriptor fd, int packetSize, long pts, boolean config, boolean keyFrame, int screenOrientation) throws IOException { private void writeFrameMeta(FileDescriptor fd, int packetSize, long pts, boolean config, boolean keyFrame) throws IOException {
headerBuffer.clear(); headerBuffer.clear();
long ptsAndFlags; long ptsAndFlags;
@ -111,7 +105,6 @@ public final class Streamer {
headerBuffer.putLong(ptsAndFlags); headerBuffer.putLong(ptsAndFlags);
headerBuffer.putInt(packetSize); headerBuffer.putInt(packetSize);
headerBuffer.putInt(screenOrientation);
headerBuffer.flip(); headerBuffer.flip();
IO.writeFully(fd, headerBuffer); IO.writeFully(fd, headerBuffer);
} }