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

Do not queue invalid PTS

Browse source 
Configuration packets produced by MediaCodec have no valid PTS, and do
not produce frame. Do not queue their (invalid) PTS not to break the
matching between frames and their PTS.
This commit is contained in:
Romain Vimont 2018-11-11 15:38:06 +01:00
parent 60afb46c8d
commit 22ff03f2f7
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/decoder.c
View file

@ -19,6 +19,7 @@
#define BUFSIZE 0x10000 #define BUFSIZE 0x10000
#define HEADER_SIZE 12 #define HEADER_SIZE 12
#define NO_PTS UINT64_C(-1)
static struct frame_meta *frame_meta_new(uint64_t pts) { static struct frame_meta *frame_meta_new(uint64_t pts) {
struct frame_meta *meta = malloc(sizeof(*meta)); struct frame_meta *meta = malloc(sizeof(*meta));
@ -89,7 +90,7 @@ static int read_packet_with_meta(void *opaque, uint8_t *buf, int buf_size) {
uint64_t pts = buffer_read64be(header); uint64_t pts = buffer_read64be(header);
state->remaining = buffer_read32be(&header[8]); state->remaining = buffer_read32be(&header[8]);
if (!receiver_state_push_meta(state, pts)) { if (pts != NO_PTS && !receiver_state_push_meta(state, pts)) {
LOGE("Could not store PTS for recording"); LOGE("Could not store PTS for recording");
// we cannot save the PTS, the recording would be broken // we cannot save the PTS, the recording would be broken
return -1; return -1;

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

@ -23,6 +23,7 @@ public class ScreenEncoder implements Device.RotationListener {
private static final int REPEAT_FRAME_DELAY = 6; // repeat after 6 frames private static final int REPEAT_FRAME_DELAY = 6; // repeat after 6 frames
private static final int MICROSECONDS_IN_ONE_SECOND = 1_000_000; private static final int MICROSECONDS_IN_ONE_SECOND = 1_000_000;
private static final int NO_PTS = -1;
private final AtomicBoolean rotationChanged = new AtomicBoolean(); private final AtomicBoolean rotationChanged = new AtomicBoolean();
private final ByteBuffer headerBuffer = ByteBuffer.allocate(12); private final ByteBuffer headerBuffer = ByteBuffer.allocate(12);
@ -119,7 +120,7 @@ public class ScreenEncoder implements Device.RotationListener {
long pts; long pts;
if ((bufferInfo.flags & MediaCodec.BUFFER_FLAG_CODEC_CONFIG) != 0) { if ((bufferInfo.flags & MediaCodec.BUFFER_FLAG_CODEC_CONFIG) != 0) {
pts = 0; // non-media data packet pts = NO_PTS; // non-media data packet
} else { } else {
if (ptsOrigin == 0) { if (ptsOrigin == 0) {
ptsOrigin = bufferInfo.presentationTimeUs; ptsOrigin = bufferInfo.presentationTimeUs;