5 files changed, 93 insertions, 146 deletions

diff --git a/toxav/codec.c b/toxav/codec.c
index b7ca2784..1e8478bb 100644
--- a/toxav/codec.c
+++ b/toxav/codec.c
@@ -36,152 +36,96 @@
 #include "rtp.h"
 #include "codec.h"
 
-const uint16_t min_jbuf_size = 4;
-const uint16_t min_readiness_idx = 2; /* when is buffer ready to dqq */
-
-int empty_queue(JitterBuffer *q)
+JitterBuffer *create_queue(unsigned int capacity)
 {
-    while (q->size > 0) {
-        rtp_free_msg(NULL, q->queue[q->front]);
-        q->front++;
-
-        if (q->front == q->capacity)
-            q->front = 0;
+    unsigned int size = 1;
 
-        q->size--;
+    while (size <= (capacity + 4) * 2) {
+        size *= 2;
     }
 
-    q->id_set = 0;
-    q->queue_ready = 0;
-    return 0;
-}
-
-JitterBuffer *create_queue(int capacity)
-{
     JitterBuffer *q;
 
     if ( !(q = calloc(sizeof(JitterBuffer), 1)) ) return NULL;
 
-    if (!(q->queue = calloc(sizeof(RTPMessage *), capacity))) {
+    if (!(q->queue = calloc(sizeof(RTPMessage *), size))) {
         free(q);
         return NULL;
     }
 
-    q->size = 0;
-    q->capacity = capacity >= min_jbuf_size ? capacity : min_jbuf_size;
-    q->front = 0;
-    q->rear = -1;
-    q->queue_ready = 0;
-    q->current_id = 0;
-    q->current_ts = 0;
-    q->id_set = 0;
+    q->size = size;
+    q->capacity = capacity;
     return q;
 }
 
+static void clear_queue(JitterBuffer *q)
+{
+    for (; q->bottom != q->top; ++q->bottom) {
+        if (q->queue[q->bottom % q->size]) {
+            rtp_free_msg(NULL, q->queue[q->bottom % q->size]);
+            q->queue[q->bottom % q->size] = NULL;
+        }
+    }
+}
+
 void terminate_queue(JitterBuffer *q)
 {
     if (!q) return;
 
-    empty_queue(q);
+    clear_queue(q);
     free(q->queue);
-
-    LOGGER_DEBUG("Terminated jitter buffer: %p", q);
     free(q);
 }
 
-#define sequnum_older(sn_a, sn_b, ts_a, ts_b) (sn_a > sn_b || ts_a > ts_b)
-
-/* success is 0 when there is nothing to dequeue, 1 when there's a good packet, 2 when there's a lost packet */
-RTPMessage *dequeue(JitterBuffer *q, int *success)
+void queue(JitterBuffer *q, RTPMessage *pk)
 {
-    if (q->size == 0 || q->queue_ready == 0) { /* Empty queue */
-        q->queue_ready = 0;
-        *success = 0;
-        return NULL;
-    }
+    uint16_t sequnum = pk->header->sequnum;
 
-    int front = q->front;
+    unsigned int num = sequnum % q->size;
 
-    if (q->id_set == 0) {
-        q->current_id = q->queue[front]->header->sequnum;
-        q->current_ts = q->queue[front]->header->timestamp;
-        q->id_set = 1;
-    } else {
-        int next_id = q->queue[front]->header->sequnum;
-        int next_ts = q->queue[front]->header->timestamp;
-
-        /* if this packet is indeed the expected packet */
-        if (next_id == (q->current_id + 1) % MAX_SEQU_NUM) {
-            q->current_id = next_id;
-            q->current_ts = next_ts;
-        } else {
-            if (sequnum_older(next_id, q->current_id, next_ts, q->current_ts)) {
-                LOGGER_DEBUG("nextid: %d current: %d\n", next_id, q->current_id);
-                q->current_id = (q->current_id + 1) % MAX_SEQU_NUM;
-                *success = 2; /* tell the decoder the packet is lost */
-                return NULL;
-            } else {
-                LOGGER_DEBUG("Packet too old");
-                *success = 0;
-                return NULL;
-            }
-        }
+    if (sequnum - q->bottom > q->size) {
+        clear_queue(q);
+        q->bottom = sequnum;
+        q->queue[num] = pk;
+        q->top = sequnum + 1;
+        return;
     }
 
-    q->size--;
-    q->front++;
+    if (q->queue[num])
+        return;
 
-    if (q->front == q->capacity)
-        q->front = 0;
+    q->queue[num] = pk;
 
-    *success = 1;
-    q->current_id = q->queue[front]->header->sequnum;
-    q->current_ts = q->queue[front]->header->timestamp;
-    return q->queue[front];
+    if ((sequnum - q->bottom) >= (q->top - q->bottom))
+        q->top = sequnum + 1;
 }
 
-
-void queue(JitterBuffer *q, RTPMessage *pk)
+/* success is 0 when there is nothing to dequeue, 1 when there's a good packet, 2 when there's a lost packet */
+RTPMessage *dequeue(JitterBuffer *q, int *success)
 {
-    if (q->size == q->capacity) { /* Full, empty queue */
-        LOGGER_DEBUG("Queue full s(%d) c(%d), emptying...", q->size, q->capacity);
-        empty_queue(q);
+    if (q->top == q->bottom) {
+        *success = 0;
+        return NULL;
     }
 
-    if (q->size >= min_readiness_idx) q->queue_ready = 1;
-
-    ++q->size;
-    ++q->rear;
-
-    if (q->rear == q->capacity) q->rear = 0;
+    unsigned int num = q->bottom % q->size;
 
-    q->queue[q->rear] = pk;
-
-    int a;
-    int j;
-    a = q->rear;
-
-    for (j = 0; j < q->size - 1; ++j) {
-        int b = a - 1;
-
-        if (b < 0)
-            b += q->capacity;
-
-        if (sequnum_older(q->queue[b]->header->sequnum, q->queue[a]->header->sequnum,
-                          q->queue[b]->header->timestamp, q->queue[a]->header->timestamp)) {
-            RTPMessage *temp;
-            temp = q->queue[a];
-            q->queue[a] = q->queue[b];
-            q->queue[b] = temp;
-            LOGGER_DEBUG("Had to swap");
-        } else {
-            break;
-        }
-
-        a -= 1;
+    if (q->queue[num]) {
+        RTPMessage *ret = q->queue[num];
+        q->queue[num] = NULL;
+        ++q->bottom;
+        *success = 1;
+        return ret;
+    }
 
-        if (a < 0) a += q->capacity;
+    if (q->top - q->bottom > q->capacity) {
+        ++q->bottom;
+        *success = 2;
+        return NULL;
     }
+
+    *success = 0;
+    return NULL;
 }
 
 
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 {
 
 typedef struct _JitterBuffer {
     RTPMessage **queue;
-    uint16_t capacity;
-    uint16_t size;
-    uint16_t front;
-    uint16_t rear;
-    uint8_t queue_ready;
-    uint16_t current_id;
-    uint32_t current_ts;
-    uint8_t id_set;
+    unsigned int size;
+    unsigned int capacity;
+    uint16_t bottom;
+    uint16_t top;
 } JitterBuffer;
 
-JitterBuffer *create_queue(int capacity);
+JitterBuffer *create_queue(unsigned int capacity);
 void terminate_queue(JitterBuffer *q);
 void queue(JitterBuffer *q, RTPMessage *pk);
 RTPMessage *dequeue(JitterBuffer *q, int *success);
diff --git a/toxav/rtp.c b/toxav/rtp.c
index 17319f81..595c58cc 100644
--- a/toxav/rtp.c
+++ b/toxav/rtp.c
@@ -551,7 +551,7 @@ RTPSession *rtp_init_session ( int payload_type, Messenger *messenger, int frien
 
     _retu->dest = friend_num;
 
-    _retu->rsequnum = _retu->sequnum = 1;
+    _retu->rsequnum = _retu->sequnum = 0;
 
     _retu->ext_header = NULL; /* When needed allocate */
 
diff --git a/toxav/toxav.c b/toxav/toxav.c
index e4b8fe2e..47a94fba 100644
--- a/toxav/toxav.c
+++ b/toxav/toxav.c
@@ -51,6 +51,24 @@
 /* call index invalid: true if invalid */
 #define cii(c_idx, session) (c_idx < 0 || c_idx >= session->max_calls)
 
+
+const ToxAvCSettings av_DefaultSettings = {
+    TypeAudio,
+    
+    500,
+    1280,
+    720,
+    
+    64000,
+    20,
+    48000,
+    1
+};
+
+const uint32_t av_jbufdc = 3;
+const uint32_t av_VADd = 40;
+
+
 static const uint8_t audio_index = 0, video_index = 1;
 
 typedef struct _CallSpecific {
@@ -84,20 +102,7 @@ struct _ToxAv {
     uint32_t max_calls;
 };
 
-const ToxAvCodecSettings av_DefaultSettings = {
-    TypeAudio,
-    
-    500,
-    1280,
-    720,
-
-    64000,
-    20,
-    48000,
-    1
-};
-
-static MSICSettings msicsettings_cast (const ToxAvCodecSettings* from)
+static MSICSettings msicsettings_cast (const ToxAvCSettings* from)
 {
     MSICSettings csettings;
     csettings.call_type = from->call_type;
@@ -114,9 +119,9 @@ static MSICSettings msicsettings_cast (const ToxAvCodecSettings* from)
     return csettings;
 }
 
-static ToxAvCodecSettings toxavcsettings_cast (const MSICSettings* from)
+static ToxAvCSettings toxavcsettings_cast (const MSICSettings* from)
 {
-    ToxAvCodecSettings csettings;
+    ToxAvCSettings csettings;
     csettings.call_type = from->call_type;
     
     csettings.video_bitrate = from->video_bitrate;
@@ -237,7 +242,7 @@ void toxav_register_video_recv_callback (ToxAv *av, void (*callback)(ToxAv *, in
  * @retval 0 Success.
  * @retval ToxAvError On error.
  */
-int toxav_call (ToxAv* av, int32_t* call_index, int user, const ToxAvCodecSettings* csettings, int ringing_seconds )
+int toxav_call (ToxAv* av, int32_t* call_index, int user, const ToxAvCSettings* csettings, int ringing_seconds )
 {    
     return msi_invite(av->msi_session, call_index, msicsettings_cast(csettings), ringing_seconds * 1000, user);
 }
@@ -272,7 +277,7 @@ int toxav_hangup ( ToxAv *av, int32_t call_index )
  * @retval 0 Success.
  * @retval ToxAvError On error.
  */
-int toxav_answer ( ToxAv* av, int32_t call_index, const ToxAvCodecSettings* csettings )
+int toxav_answer ( ToxAv* av, int32_t call_index, const ToxAvCSettings* csettings )
 {
     if ( cii(call_index, av->msi_session) || !av->msi_session->calls[call_index] ) {
         return ErrorNoCall;
@@ -339,7 +344,7 @@ int toxav_cancel ( ToxAv *av, int32_t call_index, int peer_id, const char *reaso
  * @retval 0 Success.
  * @retval ToxAvError On error.
  */
-int toxav_change_settings(ToxAv* av, int32_t call_index, const ToxAvCodecSettings* csettings)
+int toxav_change_settings(ToxAv* av, int32_t call_index, const ToxAvCSettings* csettings)
 {
     if ( cii(call_index, av->msi_session) || !av->msi_session->calls[call_index] ) {
         return ErrorNoCall;
@@ -426,7 +431,7 @@ int toxav_prepare_transmission ( ToxAv* av, int32_t call_index, uint32_t jbuf_ca
         goto error;
     }
 
-    ToxAvCodecSettings csettings = toxavcsettings_cast(&av->msi_session->calls[call_index]->csettings_peer[0]);
+    ToxAvCSettings csettings = toxavcsettings_cast(&av->msi_session->calls[call_index]->csettings_peer[0]);
     LOGGER_DEBUG(
     "Type: %u \n"
     "Video bitrate: %u \n"
@@ -754,7 +759,7 @@ inline__ int toxav_prepare_audio_frame ( ToxAv *av, int32_t call_index, uint8_t
  * @retval ToxAvCallType On success.
  * @retval ToxAvError On error.
  */
-int toxav_get_peer_csettings ( ToxAv *av, int32_t call_index, int peer, ToxAvCodecSettings* dest )
+int toxav_get_peer_csettings ( ToxAv *av, int32_t call_index, int peer, ToxAvCSettings* dest )
 {
     if ( peer < 0 || cii(call_index, av->msi_session) || !av->msi_session->calls[call_index]
          || av->msi_session->calls[call_index]->peer_count <= peer )
diff --git a/toxav/toxav.h b/toxav/toxav.h
index 384e09a6..4dfcd224 100644
--- a/toxav/toxav.h
+++ b/toxav/toxav.h
@@ -129,9 +129,11 @@ typedef struct _ToxAvCodecSettings {
     uint16_t audio_frame_duration; /* In ms */
     uint32_t audio_sample_rate; /* In Hz */
     uint32_t audio_channels;
-} ToxAvCodecSettings;
+} ToxAvCSettings;
 
-extern const ToxAvCodecSettings av_DefaultSettings;
+extern const ToxAvCSettings av_DefaultSettings;
+extern const uint32_t av_jbufdc; /* Jitter buffer default capacity */
+extern const uint32_t av_VADd; /* VAD default treshold */
 
 /**
  * @brief Start new A/V session. There can only be one session at the time. If you register more
@@ -193,7 +195,7 @@ void toxav_register_video_recv_callback (ToxAv *av, void (*callback)(ToxAv *, in
  * @retval 0 Success.
  * @retval ToxAvError On error.
  */
-int toxav_call(ToxAv* av, int32_t* call_index, int user, const ToxAvCodecSettings* csettings, int ringing_seconds);
+int toxav_call(ToxAv* av, int32_t* call_index, int user, const ToxAvCSettings* csettings, int ringing_seconds);
 
 /**
  * @brief Hangup active call.
@@ -214,7 +216,7 @@ int toxav_hangup(ToxAv *av, int32_t call_index);
  * @retval 0 Success.
  * @retval ToxAvError On error.
  */
-int toxav_answer(ToxAv *av, int32_t call_index, const ToxAvCodecSettings* csettings );
+int toxav_answer(ToxAv *av, int32_t call_index, const ToxAvCSettings* csettings );
 
 /**
  * @brief Reject incomming call.
@@ -240,14 +242,14 @@ int toxav_reject(ToxAv *av, int32_t call_index, const char *reason);
 int toxav_cancel(ToxAv *av, int32_t call_index, int peer_id, const char *reason);
 
 /**
- * @brief Notify peer that we are changing call type
+ * @brief Notify peer that we are changing call settings
  *
  * @param av Handler.
  * @return int
  * @retval 0 Success.
  * @retval ToxAvError On error.
  */
-int toxav_change_settings(ToxAv *av, int32_t call_index, const ToxAvCodecSettings* csettings);
+int toxav_change_settings(ToxAv *av, int32_t call_index, const ToxAvCSettings* csettings);
 
 /**
  * @brief Terminate transmission. Note that transmission will be terminated without informing remote peer.
@@ -342,7 +344,7 @@ int toxav_prepare_audio_frame ( ToxAv *av, int32_t call_index, uint8_t *dest, in
  * @retval ToxAvCallType On success.
  * @retval ToxAvError On error.
  */
-int toxav_get_peer_csettings ( ToxAv *av, int32_t call_index, int peer, ToxAvCodecSettings* dest );
+int toxav_get_peer_csettings ( ToxAv *av, int32_t call_index, int peer, ToxAvCSettings* dest );
 
 /**
  * @brief Get id of peer participating in conversation