StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Fixed video packet assembling.

Browse Source 
Video should look better now.
This commit is contained in:
irungentoo 2014-12-12 17:47:57 -05:00
parent 36851e7b38
commit 12f396fcc2
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
1 changed files with 40 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
toxav/codec.c
View File

@ -637,47 +637,63 @@ void queue_message(RTPSession *session, RTPMessage *msg)
if (packet_size < VIDEOFRAME_HEADER_SIZE) if (packet_size < VIDEOFRAME_HEADER_SIZE)
goto end; goto end;
if (packet[0] > cs->frameid_in || (msg->header->timestamp > cs->last_timestamp)) { /* New frame */ uint8_t diff = packet[0] - cs->frameid_in;
/* Flush last frames' data and get ready for this frame */
Payload *p = malloc(sizeof(Payload) + cs->frame_size);
if (p) { if (diff != 0) {
pthread_mutex_lock(cs->queue_mutex); if (diff < 225) { /* New frame */
/* Flush last frames' data and get ready for this frame */
Payload *p = malloc(sizeof(Payload) + cs->frame_size);
if (buffer_full(cs->vbuf_raw)) { if (p) {
LOGGER_DEBUG("Dropped video frame"); pthread_mutex_lock(cs->queue_mutex);
Payload *tp;
buffer_read(cs->vbuf_raw, &tp); if (buffer_full(cs->vbuf_raw)) {
free(tp); LOGGER_DEBUG("Dropped video frame");
Payload *tp;
buffer_read(cs->vbuf_raw, &tp);
free(tp);
} else {
p->size = cs->frame_size;
memcpy(p->data, cs->frame_buf, cs->frame_size);
}
buffer_write(cs->vbuf_raw, p);
pthread_mutex_unlock(cs->queue_mutex);
} else { } else {
p->size = cs->frame_size; LOGGER_WARNING("Allocation failed! Program might misbehave!");
memcpy(p->data, cs->frame_buf, cs->frame_size); goto end;
} }
buffer_write(cs->vbuf_raw, p); cs->last_timestamp = msg->header->timestamp;
pthread_mutex_unlock(cs->queue_mutex); cs->frameid_in = packet[0];
} else { memset(cs->frame_buf, 0, cs->frame_size);
LOGGER_WARNING("Allocation failed! Program might misbehave!"); cs->frame_size = 0;
} else { /* Old frame; drop */
LOGGER_DEBUG("Old packet: %u", packet[0]);
goto end; goto end;
} }
}
cs->last_timestamp = msg->header->timestamp; uint8_t piece_number = packet[1];
cs->frameid_in = packet[0];
memset(cs->frame_buf, 0, cs->frame_size);
cs->frame_size = 0;
} else if (packet[0] < cs->frameid_in) { /* Old frame; drop */ uint32_t length_before_piece = ((piece_number - 1) * cs->video_frame_piece_size);
LOGGER_DEBUG("Old packet: %u", packet[0]); uint32_t framebuf_new_length = length_before_piece + (packet_size - VIDEOFRAME_HEADER_SIZE);
if (framebuf_new_length > cs->max_video_frame_size) {
goto end; goto end;
} }
/* Otherwise it's part of the frame so just process */ /* Otherwise it's part of the frame so just process */
/* LOGGER_DEBUG("Video Packet: %u %u", packet[0], packet[1]); */ /* LOGGER_DEBUG("Video Packet: %u %u", packet[0], packet[1]); */
memcpy(cs->frame_buf + cs->frame_size,
memcpy(cs->frame_buf + length_before_piece,
packet + VIDEOFRAME_HEADER_SIZE, packet + VIDEOFRAME_HEADER_SIZE,
packet_size - VIDEOFRAME_HEADER_SIZE); packet_size - VIDEOFRAME_HEADER_SIZE);
cs->frame_size += packet_size - VIDEOFRAME_HEADER_SIZE; if (framebuf_new_length > cs->frame_size) {
cs->frame_size = framebuf_new_length;
}
end: end:
rtp_free_msg(NULL, msg); rtp_free_msg(NULL, msg);