4 files changed, 136 insertions, 396 deletions

diff --git a/toxav/rtp.c b/toxav/rtp.c
index 653a22df..a6bcaf18 100644
--- a/toxav/rtp.c
+++ b/toxav/rtp.c
@@ -28,6 +28,7 @@
 
 #include "rtp.h"
 #include <stdlib.h>
+void toxav_handle_packet(RTPSession *_session, RTPMessage *_msg);
 
 #define size_32 4
 
@@ -372,11 +373,6 @@ int rtp_handle_packet ( void *object, const uint8_t *data, uint32_t length )
         return -1;
     }
 
-    if ( _session->queue_limit <= _session->queue_size ) {
-        LOGGER_WARNING("Queue limit reached!");
-        return -1;
-    }
-
     _msg = msg_parse ( data + 1, length - 1 );
 
     if ( !_msg ) {
@@ -390,18 +386,7 @@ int rtp_handle_packet ( void *object, const uint8_t *data, uint32_t length )
         _session->timestamp = _msg->header->timestamp;
     }
 
-    pthread_mutex_lock(&_session->mutex);
-
-    if ( _session->last_msg ) {
-        _session->last_msg->next = _msg;
-        _session->last_msg = _msg;
-    } else {
-        _session->last_msg = _session->oldest_msg = _msg;
-    }
-
-    _session->queue_size++;
-
-    pthread_mutex_unlock(&_session->mutex);
+    toxav_handle_packet(_session, _msg);
 
     return 0;
 }
@@ -467,105 +452,6 @@ RTPMessage *rtp_new_message ( RTPSession *session, const uint8_t *data, uint32_t
 }
 
 
-
-/**
- * @brief Release all messages held by session.
- *
- * @param session The session.
- * @return int
- * @retval -1 Error occurred.
- * @retval 0 Success.
- */
-int rtp_release_session_recv ( RTPSession *session )
-{
-    if ( !session ) {
-        LOGGER_WARNING("No session!");
-        return -1;
-    }
-
-    RTPMessage *_tmp, * _it;
-
-    pthread_mutex_lock(&session->mutex);
-
-    for ( _it = session->oldest_msg; _it; _it = _tmp ) {
-        _tmp = _it->next;
-        rtp_free_msg( session, _it);
-    }
-
-    session->last_msg = session->oldest_msg = NULL;
-    session->queue_size = 0;
-
-    pthread_mutex_unlock(&session->mutex);
-
-    return 0;
-}
-
-
-/**
- * @brief Call this to change queue limit
- *
- * @param session The session
- * @param limit new limit
- * @return void
- */
-void rtp_queue_adjust_limit(RTPSession *session, uint64_t limit)
-{
-    pthread_mutex_lock(&session->mutex);
-
-    RTPMessage *_tmp, * _it = session->oldest_msg;
-
-    for ( ; session->queue_size > limit; _it = _tmp ) {
-        _tmp = _it->next;
-        rtp_free_msg( session, _it);
-        session->queue_size --;
-    }
-
-    session->oldest_msg = _it;
-    session->queue_limit = limit;
-
-    pthread_mutex_unlock(&session->mutex);
-}
-
-
-/**
- * @brief Gets oldest message in the list.
- *
- * @param session Where the list is.
- * @return RTPMessage* The message. You _must_ call rtp_msg_free() to free it.
- * @retval NULL No messages in the list, or no list.
- */
-RTPMessage *rtp_recv_msg ( RTPSession *session )
-{
-    if ( !session ) {
-        LOGGER_WARNING("No session!");
-        return NULL;
-    }
-
-    pthread_mutex_lock(&session->mutex);
-
-    if ( session->queue_size == 0 ) {
-        pthread_mutex_unlock(&session->mutex);
-        return NULL;
-    }
-
-
-    RTPMessage *_retu = session->oldest_msg;
-
-    /*if (_retu)*/
-    session->oldest_msg = _retu->next;
-
-    if ( !session->oldest_msg )
-        session->last_msg = NULL;
-
-    session->queue_size --;
-
-    pthread_mutex_unlock(&session->mutex);
-
-
-    return _retu;
-}
-
-
 /**
  * @brief Sends data to _RTPSession::dest
  *
@@ -627,7 +513,6 @@ void rtp_free_msg ( RTPSession *session, RTPMessage *msg )
     free ( msg );
 }
 
-
 /**
  * @brief Must be called before calling any other rtp function. It's used
  *        to initialize RTP control session.
@@ -682,11 +567,6 @@ RTPSession *rtp_init_session ( int payload_type, Messenger *messenger, int frien
     /* Also set payload type as prefix */
     _retu->prefix = payload_type;
 
-    _retu->oldest_msg = _retu->last_msg = NULL;
-    _retu->queue_limit = 100; /* Default */
-    _retu->queue_size = 0;
-
-    pthread_mutex_init(&_retu->mutex, NULL);
     /*
      *
      */
@@ -709,17 +589,9 @@ void rtp_terminate_session ( RTPSession *session, Messenger *messenger )
 
     custom_lossy_packet_registerhandler(messenger, session->dest, session->prefix, NULL, NULL);
 
-    rtp_release_session_recv(session);
-
-    pthread_mutex_lock(&session->mutex);
-
     free ( session->ext_header );
     free ( session->csrc );
 
-    pthread_mutex_unlock(&session->mutex);
-
-    pthread_mutex_destroy(&session->mutex);
-
     LOGGER_DEBUG("Terminated RTP session: %p", session);
 
     /* And finally free session */
diff --git a/toxav/rtp.h b/toxav/rtp.h
index 727839c6..45128285 100644
--- a/toxav/rtp.h
+++ b/toxav/rtp.h
@@ -105,17 +105,12 @@ typedef struct _RTPSession {
      */
     RTPExtHeader   *ext_header;
 
-    RTPMessage     *oldest_msg;
-    RTPMessage     *last_msg; /* tail */
-
-    uint64_t        queue_limit;/* Default 100; modify per thy liking */
-    uint64_t        queue_size; /* currently holding << messages */
-
     /* Msg prefix for core to know when recving */
     uint8_t         prefix;
 
-    pthread_mutex_t mutex;
     int             dest;
+    int32_t         call_index;
+    struct _ToxAv *av;
 
 } RTPSession;
 
@@ -172,7 +167,6 @@ int rtp_send_msg ( RTPSession *session, Messenger *messenger, const uint8_t *dat
  */
 void rtp_free_msg ( RTPSession *session, RTPMessage *msg );
 
-
 /**
  * @brief Must be called before calling any other rtp function. It's used
  *        to initialize RTP control session.
diff --git a/toxav/toxav.c b/toxav/toxav.c
index 151a1e64..38114ad1 100644
--- a/toxav/toxav.c
+++ b/toxav/toxav.c
@@ -76,6 +76,10 @@ struct _ToxAv {
     Messenger *messenger;
     MSISession *msi_session; /** Main msi session */
     CallSpecific *calls; /** Per-call params */
+
+    void (*audio_callback)(ToxAv*, int32_t, int16_t*, int);
+    void (*video_callback)(ToxAv*, int32_t, vpx_image_t*);
+
     uint32_t max_calls;
 };
 
@@ -169,6 +173,28 @@ void toxav_register_callstate_callback ( ToxAVCallback callback, ToxAvCallbackID
 }
 
 /**
+ * @brief Register callback for recieving audio data
+ *
+ * @param callback The callback
+ * @return void
+ */
+void toxav_register_audio_recv_callback (ToxAv *av, void (*callback)(ToxAv*, int32_t, int16_t*, int))
+{
+    av->audio_callback = callback;
+}
+
+/**
+ * @brief Register callback for recieving video data
+ *
+ * @param callback The callback
+ * @return void
+ */
+void toxav_register_video_recv_callback (ToxAv *av, void (*callback)(ToxAv*, int32_t, vpx_image_t*))
+{
+   av->video_callback = callback;
+}
+
+/**
  * @brief Call user. Use its friend_id.
  *
  * @param av Handler.
@@ -316,17 +342,21 @@ int toxav_prepare_transmission ( ToxAv *av, int32_t call_index, ToxAvCodecSettin
         return ErrorInternal;
     }
 
+    call->crtps[audio_index]->call_index = call_index;
+    call->crtps[audio_index]->av = av;
 
     if ( support_video ) {
         call->crtps[video_index] =
             rtp_init_session(type_video, av->messenger, av->msi_session->calls[call_index]->peers[0]);
 
-
         if ( !call->crtps[video_index] ) {
             LOGGER_ERROR("Error while starting video RTP session!\n");
             goto error;
         }
 
+        call->crtps[video_index]->call_index = call_index;
+        call->crtps[video_index]->av = av;
+
         call->frame_limit = 0;
         call->frame_id = 0;
         call->frame_outid = 0;
@@ -475,140 +505,6 @@ inline__ int toxav_send_rtp_payload ( ToxAv *av, int32_t call_index, ToxAvCallTy
 }
 
 /**
- * @brief Receive RTP payload.
- *
- * @param av Handler.
- * @param type Type of the payload.
- * @param dest Storage.
- * @return int
- * @retval ToxAvError On Error.
- * @retval >=0 Size of received payload.
- */
-inline__ int toxav_recv_rtp_payload ( ToxAv *av, int32_t call_index, ToxAvCallType type, uint8_t *dest )
-{
-    if ( !dest ) return ErrorInternal;
-
-    CallSpecific *call = &av->calls[call_index];
-
-    if ( !call->crtps[type - TypeAudio] ) return ErrorNoRtpSession;
-
-    RTPMessage *message;
-
-    if ( type == TypeAudio ) {
-
-        do {
-            message = rtp_recv_msg(call->crtps[audio_index]);
-
-            if (message) {
-                /* push the packet into the queue */
-                queue(call->j_buf, message);
-            }
-        } while (message);
-
-        int success = 0;
-        message = dequeue(call->j_buf, &success);
-
-        if ( success == 2) return ErrorAudioPacketLost;
-    } else {
-        message = rtp_recv_msg(call->crtps[video_index]);
-    }
-
-    if ( message ) {
-        memcpy(dest, message->data, message->length);
-
-        int length = message->length;
-
-        rtp_free_msg(NULL, message);
-
-        return length;
-    }
-
-    return 0;
-}
-
-/**
- * @brief Receive decoded video packet.
- *
- * @param av Handler.
- * @param output Storage.
- * @return int
- * @retval 0 Success.
- * @retval ToxAvError On Error.
- */
-inline__ int toxav_recv_video ( ToxAv *av, int32_t call_index, vpx_image_t **output)
-{
-    if ( !output ) return ErrorInternal;
-
-    if (cii(call_index, av->msi_session)) {
-        LOGGER_WARNING("Invalid call index: %d", call_index);
-        return ErrorNoCall;
-    }
-
-    CallSpecific *call = &av->calls[call_index];
-    pthread_mutex_lock(&call->mutex);
-
-    if (!call->call_active) {
-        pthread_mutex_unlock(&call->mutex);
-        LOGGER_WARNING("Action on inactive call: %d", call_index);
-        return ErrorNoCall;
-    }
-
-    uint8_t packet [RTP_PAYLOAD_SIZE];
-    int recved_size;
-
-    while ((recved_size = toxav_recv_rtp_payload(av, call_index, TypeVideo, packet)) > 0) {
-        if (recved_size < VIDEOFRAME_HEADER_SIZE) {
-            continue;
-        }
-
-        uint8_t i = packet[0] - call->frame_id;
-
-        if (i == 0) {
-            /* piece of current frame */
-        } else if (i > 0 && i < 128) {
-            /* recieved a piece of a frame ahead, flush current frame and start reading this new frame */
-            int rc = vpx_codec_decode(&call->cs->v_decoder, call->frame_buf, call->frame_limit, NULL, 0);
-            call->frame_id = packet[0];
-            memset(call->frame_buf, 0, call->frame_limit);
-            call->frame_limit = 0;
-
-            if (rc != VPX_CODEC_OK) {
-                LOGGER_ERROR("Error decoding video: %u %s\n", i, vpx_codec_err_to_string(rc));
-            }
-        } else {
-            /* old packet, dont read */
-            LOGGER_DEBUG("Old packet: %u\n", i);
-            continue;
-        }
-
-        if (packet[1] > (MAX_VIDEOFRAME_SIZE - VIDEOFRAME_PIECE_SIZE + 1) /
-                VIDEOFRAME_PIECE_SIZE) { //TODO, fix this check? not sure
-            /* packet out of buffer range */
-            continue;
-        }
-
-        LOGGER_DEBUG("Video Packet: %u %u\n", packet[0], packet[1]);
-        memcpy(call->frame_buf + packet[1] * VIDEOFRAME_PIECE_SIZE, packet + VIDEOFRAME_HEADER_SIZE,
-               recved_size - VIDEOFRAME_HEADER_SIZE);
-        uint32_t limit = packet[1] * VIDEOFRAME_PIECE_SIZE + recved_size - VIDEOFRAME_HEADER_SIZE;
-
-        if (limit > call->frame_limit) {
-            call->frame_limit = limit;
-            LOGGER_DEBUG("Limit: %u\n", call->frame_limit);
-        }
-    }
-
-    vpx_codec_iter_t iter = NULL;
-    vpx_image_t *img;
-    img = vpx_codec_get_frame(&call->cs->v_decoder, &iter);
-
-    *output = img;
-
-    pthread_mutex_unlock(&call->mutex);
-    return ErrorNone;
-}
-
-/**
  * @brief Encode and send video packet.
  *
  * @param av Handler.
@@ -704,67 +600,6 @@ inline__ int toxav_prepare_video_frame(ToxAv *av, int32_t call_index, uint8_t *d
 }
 
 /**
- * @brief Receive decoded audio frame.
- *
- * @param av Handler.
- * @param frame_size The size of dest in frames/samples (one frame/sample is 16 bits or 2 bytes
- *                   and corresponds to one sample of audio.)
- * @param dest Destination of the raw audio (16 bit signed pcm with AUDIO_CHANNELS channels).
- *             Make sure it has enough space for frame_size frames/samples.
- * @return int
- * @retval >=0 Size of received data in frames/samples.
- * @retval ToxAvError On error.
- */
-inline__ int toxav_recv_audio ( ToxAv *av, int32_t call_index, int frame_size, int16_t *dest )
-{
-    if ( !dest ) return ErrorInternal;
-
-    if (cii(call_index, av->msi_session)) {
-        LOGGER_WARNING("Invalid call index: %d", call_index);
-        return ErrorNoCall;
-    }
-
-
-    CallSpecific *call = &av->calls[call_index];
-    pthread_mutex_lock(&call->mutex);
-
-
-    if (!call->call_active) {
-        pthread_mutex_unlock(&call->mutex);
-        LOGGER_WARNING("Action on inactive call: %d", call_index);
-        return ErrorNoCall;
-    }
-
-    uint8_t packet [RTP_PAYLOAD_SIZE];
-
-    int recved_size = toxav_recv_rtp_payload(av, call_index, TypeAudio, packet);
-
-    if ( recved_size == ErrorAudioPacketLost ) {
-        int dec_size = opus_decode(call->cs->audio_decoder, NULL, 0, dest, frame_size, 1);
-
-        pthread_mutex_unlock(&call->mutex);
-
-        if ( dec_size < 0 ) {
-            LOGGER_WARNING("Decoding error: %s", opus_strerror(dec_size));
-            return ErrorInternal;
-        } else return dec_size;
-
-    } else if ( recved_size ) {
-        int dec_size = opus_decode(call->cs->audio_decoder, packet, recved_size, dest, frame_size, 0);
-
-        pthread_mutex_unlock(&call->mutex);
-
-        if ( dec_size < 0 ) {
-            LOGGER_WARNING("Decoding error: %s", opus_strerror(dec_size));
-            return ErrorInternal;
-        } else return dec_size;
-    } else {
-        pthread_mutex_unlock(&call->mutex);
-        return 0; /* Nothing received */
-    }
-}
-
-/**
  * @brief Send audio frame.
  *
  * @param av Handler.
@@ -905,42 +740,6 @@ inline__ int toxav_capability_supported ( ToxAv *av, int32_t call_index, ToxAvCa
     /* 0 is error here */
 }
 
-/**
- * @brief Set queue limit
- *
- * @param av Handler
- * @param call_index index
- * @param limit the limit
- * @return void
- */
-inline__ int toxav_set_audio_queue_limit(ToxAv *av, int32_t call_index, uint64_t limit)
-{
-    if ( av->calls[call_index].crtps[audio_index] )
-        rtp_queue_adjust_limit(av->calls[call_index].crtps[audio_index], limit);
-    else
-        return ErrorNoRtpSession;
-
-    return ErrorNone;
-}
-
-/**
- * @brief Set queue limit
- *
- * @param av Handler
- * @param call_index index
- * @param limit the limit
- * @return void
- */
-inline__ int toxav_set_video_queue_limit(ToxAv *av, int32_t call_index, uint64_t limit)
-{
-    if ( av->calls[call_index].crtps[video_index] )
-        rtp_queue_adjust_limit(av->calls[call_index].crtps[video_index], limit);
-    else
-        return ErrorNoRtpSession;
-
-    return ErrorNone;
-}
-
 inline__ Tox *toxav_get_tox(ToxAv *av)
 {
     return (Tox *)av->messenger;
@@ -952,3 +751,87 @@ int toxav_has_activity(ToxAv *av, int32_t call_index, int16_t *PCM, uint16_t fra
 
     return energy_VAD(av->calls[call_index].cs, PCM, frame_size, ref_energy);
 }
+
+void toxav_handle_packet(RTPSession *_session, RTPMessage *_msg)
+{
+    ToxAv *av = _session->av;
+    int32_t call_index = _session->call_index;
+    CallSpecific *call = &av->calls[call_index];
+
+    if(_session->payload_type == type_audio % 128) {
+        queue(call->j_buf, _msg);
+
+        int success = 0, dec_size;
+        int frame_size = 960;
+        int16_t dest[frame_size];
+
+        while((_msg = dequeue(call->j_buf, &success)) || success == 2) {
+            if(success == 2) {
+                dec_size = opus_decode(call->cs->audio_decoder, NULL, 0, dest, frame_size, 1);
+            } else {
+                dec_size = opus_decode(call->cs->audio_decoder, _msg->data, _msg->length, dest, frame_size, 0);
+                rtp_free_msg(NULL, _msg);
+            }
+
+            if(dec_size < 0) {
+                LOGGER_WARNING("Decoding error: %s", opus_strerror(dec_size));
+                continue;
+            }
+
+            av->audio_callback(av, call_index, dest, frame_size);
+        }
+    } else {
+        uint8_t *packet = _msg->data;
+        int recved_size = _msg->length;
+
+        if(recved_size < VIDEOFRAME_HEADER_SIZE) {
+            goto end;
+        }
+
+        uint8_t i = packet[0] - call->frame_id;
+
+        if (i == 0) {
+            /* piece of current frame */
+        } else if (i > 0 && i < 128) {
+            /* recieved a piece of a frame ahead, flush current frame and start reading this new frame */
+            int rc = vpx_codec_decode(&call->cs->v_decoder, call->frame_buf, call->frame_limit, NULL, 0);
+            call->frame_id = packet[0];
+            memset(call->frame_buf, 0, call->frame_limit);
+            call->frame_limit = 0;
+
+            if (rc != VPX_CODEC_OK) {
+                LOGGER_ERROR("Error decoding video: %u %s\n", i, vpx_codec_err_to_string(rc));
+            }
+        } else {
+            /* old packet, dont read */
+            LOGGER_DEBUG("Old packet: %u\n", i);
+            goto end;
+        }
+
+        if (packet[1] > (MAX_VIDEOFRAME_SIZE - VIDEOFRAME_PIECE_SIZE + 1) /
+                VIDEOFRAME_PIECE_SIZE) { //TODO, fix this check? not sure
+            /* packet out of buffer range */
+            goto end;
+        }
+
+        LOGGER_DEBUG("Video Packet: %u %u\n", packet[0], packet[1]);
+        memcpy(call->frame_buf + packet[1] * VIDEOFRAME_PIECE_SIZE, packet + VIDEOFRAME_HEADER_SIZE,
+               recved_size - VIDEOFRAME_HEADER_SIZE);
+        uint32_t limit = packet[1] * VIDEOFRAME_PIECE_SIZE + recved_size - VIDEOFRAME_HEADER_SIZE;
+
+        if (limit > call->frame_limit) {
+            call->frame_limit = limit;
+            LOGGER_DEBUG("Limit: %u\n", call->frame_limit);
+        }
+
+        end:;
+        vpx_codec_iter_t iter = NULL;
+        vpx_image_t *img;
+        img = vpx_codec_get_frame(&call->cs->v_decoder, &iter);
+        if(img) {
+            av->video_callback(av, call_index, img);
+        }
+
+        rtp_free_msg(NULL, _msg);
+    }
+}
diff --git a/toxav/toxav.h b/toxav/toxav.h
index b7659441..6a35fccf 100644
--- a/toxav/toxav.h
+++ b/toxav/toxav.h
@@ -165,6 +165,22 @@ void toxav_kill(ToxAv *av);
 void toxav_register_callstate_callback (ToxAVCallback callback, ToxAvCallbackID id, void *userdata);
 
 /**
+ * @brief Register callback for recieving audio data
+ *
+ * @param callback The callback
+ * @return void
+ */
+void toxav_register_audio_recv_callback (ToxAv *av, void (*callback)(ToxAv*, int32_t, int16_t*, int));
+
+/**
+ * @brief Register callback for recieving video data
+ *
+ * @param callback The callback
+ * @return void
+ */
+void toxav_register_video_recv_callback (ToxAv *av, void (*callback)(ToxAv*, int32_t, vpx_image_t*));
+
+/**
  * @brief Call user. Use its friend_id.
  *
  * @param av Handler.
@@ -253,31 +269,6 @@ int toxav_prepare_transmission(ToxAv *av, int32_t call_index, ToxAvCodecSettings
 int toxav_kill_transmission(ToxAv *av, int32_t call_index);
 
 /**
- * @brief Receive decoded video packet.
- *
- * @param av Handler.
- * @param output Storage.
- * @return int
- * @retval 0 Success.
- * @retval ToxAvError On Error.
- */
-int toxav_recv_video ( ToxAv *av, int32_t call_index, vpx_image_t **output);
-
-/**
- * @brief Receive decoded audio frame.
- *
- * @param av Handler.
- * @param frame_size The size of dest in frames/samples (one frame/sample is 16 bits or 2 bytes
- *                   and corresponds to one sample of audio.)
- * @param dest Destination of the raw audio (16 bit signed pcm with AUDIO_CHANNELS channels).
- *             Make sure it has enough space for frame_size frames/samples.
- * @return int
- * @retval >=0 Size of received data in frames/samples.
- * @retval ToxAvError On error.
- */
-int toxav_recv_audio( ToxAv *av, int32_t call_index, int frame_size, int16_t *dest );
-
-/**
  * @brief Encode and send video packet.
  *
  * @param av Handler.
@@ -399,4 +390,4 @@ int toxav_has_activity ( ToxAv *av, int32_t call_index, int16_t *PCM, uint16_t f
 }
 #endif
 
-#endif /* __TOXAV */
\ No newline at end of file
+#endif /* __TOXAV */