Display and control your Android device
Pass key frame flag from the device
Romain Vimont67068e4e3d7a
diff --git a/app/src/demuxer.c b/app/src/demuxer.cindex c2f4a636..417abd27 100644--- a/app/src/demuxer.c+++ b/app/src/demuxer.c@@ -15,8 +15,9 @@#define HEADER_SIZE 12#define SC_PACKET_FLAG_CONFIG (UINT64_C(1) << 63)+#define SC_PACKET_FLAG_KEY_FRAME (UINT64_C(1) << 62)-#define SC_PACKET_PTS_MASK (SC_PACKET_FLAG_CONFIG - 1)+#define SC_PACKET_PTS_MASK (SC_PACKET_FLAG_KEY_FRAME - 1)static boolsc_demuxer_recv_packet(struct sc_demuxer *demuxer, AVPacket *packet) {@@ -35,10 +36,11 @@ sc_demuxer_recv_packet(struct sc_demuxer *demuxer, AVPacket *packet) {// The most significant bits of the PTS are used for packet flags://// byte 7 byte 6 byte 5 byte 4 byte 3 byte 2 byte 1 byte 0- // C....... ........ ........ ........ ........ ........ ........ ........- // ^<-------------------------------------------------------------------->- // | PTS- // `- config packet+ // CK...... ........ ........ ........ ........ ........ ........ ........+ // ^^<------------------------------------------------------------------->+ // || PTS+ // | `- config packet+ // `-- key frameuint8_t header[HEADER_SIZE];ssize_t r = net_recv_all(demuxer->socket, header, HEADER_SIZE);@@ -67,6 +69,10 @@ sc_demuxer_recv_packet(struct sc_demuxer *demuxer, AVPacket *packet) {packet->pts = pts_flags & SC_PACKET_PTS_MASK;}+ if (pts_flags & SC_PACKET_FLAG_KEY_FRAME) {+ packet->flags |= AV_PKT_FLAG_KEY;+ }+return true;}diff --git a/server/src/main/java/com/genymobile/scrcpy/ScreenEncoder.java b/server/src/main/java/com/genymobile/scrcpy/ScreenEncoder.javaindex a51a8a32..f97206ec 100644--- a/server/src/main/java/com/genymobile/scrcpy/ScreenEncoder.java+++ b/server/src/main/java/com/genymobile/scrcpy/ScreenEncoder.java@@ -29,6 +29,7 @@ public class ScreenEncoder implements Device.RotationListener {private static final int[] MAX_SIZE_FALLBACK = {2560, 1920, 1600, 1280, 1024, 800};private static final long PACKET_FLAG_CONFIG = 1L << 63;+ private static final long PACKET_FLAG_KEY_FRAME = 1L << 62;private final AtomicBoolean rotationChanged = new AtomicBoolean();private final ByteBuffer headerBuffer = ByteBuffer.allocate(12);@@ -189,6 +190,9 @@ public class ScreenEncoder implements Device.RotationListener {ptsOrigin = bufferInfo.presentationTimeUs;}pts = bufferInfo.presentationTimeUs - ptsOrigin;+ if ((bufferInfo.flags & MediaCodec.BUFFER_FLAG_KEY_FRAME) != 0) {+ pts |= PACKET_FLAG_KEY_FRAME;+ }}headerBuffer.putLong(pts);