diff options
author | mannol <eniz_vukovic@hotmail.com> | 2014-07-27 00:26:58 +0200 |
---|---|---|
committer | mannol <eniz_vukovic@hotmail.com> | 2014-07-27 00:26:58 +0200 |
commit | fc230c86714eb05b69c4a8b9501332a8e32b3e49 (patch) | |
tree | 087cf6a68cf4ebd785999aa66649198d9047e3dd /toxav/codec.h | |
parent | 54e7d29589b8c2e1e58d438adab972174ac7dd52 (diff) | |
parent | d052bbc3ebb378c9a69bbd7e35f001da2e2782aa (diff) |
Fixed tests and conflicts
Diffstat (limited to 'toxav/codec.h')
-rw-r--r-- | toxav/codec.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/toxav/codec.h b/toxav/codec.h index a464ec8f..755673f3 100644 --- a/toxav/codec.h +++ b/toxav/codec.h | |||
@@ -78,17 +78,13 @@ typedef struct _CodecState { | |||
78 | 78 | ||
79 | typedef struct _JitterBuffer { | 79 | typedef struct _JitterBuffer { |
80 | RTPMessage **queue; | 80 | RTPMessage **queue; |
81 | uint16_t capacity; | 81 | unsigned int size; |
82 | uint16_t size; | 82 | unsigned int capacity; |
83 | uint16_t front; | 83 | uint16_t bottom; |
84 | uint16_t rear; | 84 | uint16_t top; |
85 | uint8_t queue_ready; | ||
86 | uint16_t current_id; | ||
87 | uint32_t current_ts; | ||
88 | uint8_t id_set; | ||
89 | } JitterBuffer; | 85 | } JitterBuffer; |
90 | 86 | ||
91 | JitterBuffer *create_queue(int capacity); | 87 | JitterBuffer *create_queue(unsigned int capacity); |
92 | void terminate_queue(JitterBuffer *q); | 88 | void terminate_queue(JitterBuffer *q); |
93 | void queue(JitterBuffer *q, RTPMessage *pk); | 89 | void queue(JitterBuffer *q, RTPMessage *pk); |
94 | RTPMessage *dequeue(JitterBuffer *q, int *success); | 90 | RTPMessage *dequeue(JitterBuffer *q, int *success); |