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

used define instead of constant.. removed unecessary value from packet

Browse Source
This commit is contained in:
notsecure 2014-06-23 15:16:31 -04:00
parent 4e7593a09c
commit 3303b29da1
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
toxav/toxav.c
View File

@ -42,6 +42,7 @@
#define MAX_VIDEOFRAME_SIZE 0x40000 /* 256KiB */ #define MAX_VIDEOFRAME_SIZE 0x40000 /* 256KiB */
#define VIDEOFRAME_PIECE_SIZE 0x500 /* 1.25 KiB*/ #define VIDEOFRAME_PIECE_SIZE 0x500 /* 1.25 KiB*/
#define VIDEOFRAME_HEADER_SIZE 0x2
#define inline__ inline __attribute__((always_inline)) #define inline__ inline __attribute__((always_inline))
@ -431,22 +432,21 @@ inline__ int toxav_send_rtp_payload ( ToxAv *av, int32_t call_index, ToxAvCallTy
uint8_t load[3 + VIDEOFRAME_PIECE_SIZE]; uint8_t load[3 + VIDEOFRAME_PIECE_SIZE];
load[0] = av->calls[call_index].frame_outid++; load[0] = av->calls[call_index].frame_outid++;
load[1] = numparts; load[1] = 0;
load[2] = 0;
int i; int i;
for(i = 0; i < numparts; i++) { for(i = 0; i < numparts; i++) {
memcpy(load + 3, payload, VIDEOFRAME_PIECE_SIZE); payload += VIDEOFRAME_PIECE_SIZE; memcpy(load + VIDEOFRAME_HEADER_SIZE, payload, VIDEOFRAME_PIECE_SIZE); payload += VIDEOFRAME_PIECE_SIZE;
if(send(load, 3 + VIDEOFRAME_PIECE_SIZE) != 0) { if(send(load, VIDEOFRAME_HEADER_SIZE + VIDEOFRAME_PIECE_SIZE) != 0) {
return -1; return -1;
} }
load[2]++; load[1]++;
} }
/* remainder = length % VIDEOFRAME_PIECE_SIZE, VIDEOFRAME_PIECE_SIZE if = 0 */ /* remainder = length % VIDEOFRAME_PIECE_SIZE, VIDEOFRAME_PIECE_SIZE if = 0 */
length = ((length - 1) % VIDEOFRAME_PIECE_SIZE) + 1; length = ((length - 1) % VIDEOFRAME_PIECE_SIZE) + 1;
memcpy(load + 3, payload, length); memcpy(load + VIDEOFRAME_HEADER_SIZE, payload, length);
return send(load, 3 + length); return send(load, VIDEOFRAME_HEADER_SIZE + length);
} }
} else { } else {
return -1; return -1;
@ -529,7 +529,7 @@ inline__ int toxav_recv_video ( ToxAv *av, int32_t call_index, vpx_image_t **out
int recved_size; int recved_size;
while((recved_size = toxav_recv_rtp_payload(av, call_index, TypeVideo, packet)) > 0) { while((recved_size = toxav_recv_rtp_payload(av, call_index, TypeVideo, packet)) > 0) {
if(recved_size < 3) { if(recved_size < VIDEOFRAME_HEADER_SIZE) {
continue; continue;
} }
@ -551,13 +551,13 @@ inline__ int toxav_recv_video ( ToxAv *av, int32_t call_index, vpx_image_t **out
continue; continue;
} }
if(packet[2] > (MAX_VIDEOFRAME_SIZE - VIDEOFRAME_PIECE_SIZE + 1) / VIDEOFRAME_PIECE_SIZE) { //TODO, fix this check? not sure if(packet[1] > (MAX_VIDEOFRAME_SIZE - VIDEOFRAME_PIECE_SIZE + 1) / VIDEOFRAME_PIECE_SIZE) { //TODO, fix this check? not sure
/* packet out of buffer range */ /* packet out of buffer range */
continue; continue;
} }
memcpy(call->frame_buf + packet[2] * VIDEOFRAME_PIECE_SIZE, packet + 3, recved_size - 3); memcpy(call->frame_buf + packet[1] * VIDEOFRAME_PIECE_SIZE, packet + VIDEOFRAME_HEADER_SIZE, recved_size - VIDEOFRAME_HEADER_SIZE);
uint32_t limit = packet[2] * VIDEOFRAME_PIECE_SIZE + recved_size - 3; uint32_t limit = packet[1] * VIDEOFRAME_PIECE_SIZE + recved_size - VIDEOFRAME_HEADER_SIZE;
if(limit > call->frame_limit) { if(limit > call->frame_limit) {
call->frame_limit = limit; call->frame_limit = limit;
} }