3 files changed, 25 insertions, 25 deletions

diff --git a/toxav/msi.c b/toxav/msi.c
index 9695029a..ee7a95f3 100644
--- a/toxav/msi.c
+++ b/toxav/msi.c
@@ -1002,18 +1002,18 @@ int send_error ( MSISession *session, MSICall *call, MSICallError errid, uint32_
  */
 void add_peer( MSICall *call, int peer_id )
 {
-    uint32_t* peers = !call->peers ? peers = calloc(sizeof(uint32_t), 1) :
-    realloc( call->peers, sizeof(uint32_t) * call->peer_count);
-        
+    uint32_t *peers = !call->peers ? peers = calloc(sizeof(uint32_t), 1) :
+                      realloc( call->peers, sizeof(uint32_t) * call->peer_count);
+
     if (!peers) {
         LOGGER_WARNING("Allocation failed! Program might misbehave!");
         return;
     }
-    
+
     call->peer_count ++;
     call->peers = peers;
     call->peers[call->peer_count - 1] = peer_id;
-    
+
     LOGGER_DEBUG("Added peer: %d", peer_id);
 }
 
@@ -1038,12 +1038,12 @@ MSICall *init_call ( MSISession *session, int peers, int ringing_timeout )
 
     for (; _call_idx < session->max_calls; _call_idx ++) {
         if ( !session->calls[_call_idx] ) {
-            
+
             if (!(session->calls[_call_idx] = calloc ( sizeof ( MSICall ), 1 ))) {
                 LOGGER_WARNING("Allocation failed! Program might misbehave!");
                 return NULL;
             }
-            
+
             break;
         }
     }
@@ -1455,7 +1455,7 @@ int handle_recv_error ( MSISession *session, MSICall *call, MSIMessage *msg )
  *
  *
  */
-void msi_handle_packet ( Messenger *messenger, int source, uint8_t *data, uint16_t length, void *object )
+void msi_handle_packet ( Messenger *messenger, int source, const uint8_t *data, uint16_t length, void *object )
 {
     LOGGER_DEBUG("Got msi message");
     /* Unused */
@@ -1610,7 +1610,7 @@ MSISession *msi_init_session ( Messenger *messenger, int32_t max_calls )
         free(_retu);
         return NULL;
     }
-    
+
     _retu->max_calls = max_calls;
 
     _retu->frequ = 10000; /* default value? */
@@ -1663,8 +1663,6 @@ int msi_terminate_session ( MSISession *session )
     timer_terminate_session(session->timer_handler);
     
     pthread_mutex_destroy(&session->mutex);
-
-//     timer_terminate_session();
     
     LOGGER_DEBUG("Terminated session: %p", session);
     free ( session );
diff --git a/toxav/rtp.c b/toxav/rtp.c
index ca37bf47..9ba3b6a3 100644
--- a/toxav/rtp.c
+++ b/toxav/rtp.c
@@ -105,16 +105,16 @@ RTPHeader *extract_header ( const uint8_t *payload, int length )
     }
 
     RTPHeader *_retu = calloc(1, sizeof (RTPHeader));
-    
+
     if ( !_retu ) {
         LOGGER_WARNING("Alloc failed! Program might misbehave!");
         return NULL;
     }
-    
+
     bytes_to_U16(&_retu->sequnum, payload);
 
     const uint8_t *_it = payload + 2;
-    
+
     _retu->flags = *_it;
     ++_it;
 
@@ -178,7 +178,7 @@ RTPExtHeader *extract_ext_header ( const uint8_t *payload, uint16_t length )
     const uint8_t *_it = payload;
 
     RTPExtHeader *_retu = calloc(1, sizeof (RTPExtHeader));
-    
+
     if ( !_retu ) {
         LOGGER_WARNING("Alloc failed! Program might misbehave!");
         return NULL;
@@ -290,7 +290,7 @@ uint8_t *add_ext_header ( RTPExtHeader *header, uint8_t *payload )
 RTPHeader *build_header ( RTPSession *session )
 {
     RTPHeader *_retu = calloc ( 1, sizeof (RTPHeader) );
-    
+
     if ( !_retu ) {
         LOGGER_WARNING("Alloc failed! Program might misbehave!");
         return NULL;
@@ -386,7 +386,7 @@ RTPMessage *msg_parse ( const uint8_t *data, int length )
  * @retval -1 Error occurred.
  * @retval 0 Success.
  */
-int rtp_handle_packet ( void *object, uint8_t *data, uint32_t length )
+int rtp_handle_packet ( void *object, const uint8_t *data, uint32_t length )
 {
     RTPSession *_session = object;
     RTPMessage *_msg;
@@ -451,7 +451,7 @@ RTPMessage *rtp_new_message ( RTPSession *session, const uint8_t *data, uint32_t
 
     uint8_t *_from_pos;
     RTPMessage *_retu = calloc(1, sizeof (RTPMessage));
-    
+
     if ( !_retu ) {
         LOGGER_WARNING("Alloc failed! Program might misbehave!");
         return NULL;
@@ -465,7 +465,7 @@ RTPMessage *rtp_new_message ( RTPSession *session, const uint8_t *data, uint32_t
     uint32_t _total_length = length + _retu->header->length + 1;
 
     _retu->data[0] = session->prefix;
-    
+
     if ( _retu->ext_header ) {
         _total_length += ( 4 /* Minimum ext header len */ + _retu->ext_header->length * size_32 );
 
@@ -617,10 +617,10 @@ int rtp_send_msg ( RTPSession *session, Messenger *messenger, const uint8_t *dat
     }
 
 
-    /* Set sequ number */    
+    /* Set sequ number */
     session->sequnum = session->sequnum >= MAX_SEQU_NUM ? 0 : session->sequnum + 1;
     rtp_free_msg ( session, msg );
-    
+
     return 0;
 }
 
@@ -665,7 +665,7 @@ void rtp_free_msg ( RTPSession *session, RTPMessage *msg )
 RTPSession *rtp_init_session ( int payload_type, Messenger *messenger, int friend_num )
 {
     RTPSession *_retu = calloc(1, sizeof(RTPSession));
-    
+
     if ( !_retu ) {
         LOGGER_WARNING("Alloc failed! Program might misbehave!");
         return NULL;
diff --git a/toxav/toxav.c b/toxav/toxav.c
index 02c5a970..743d7fcf 100644
--- a/toxav/toxav.c
+++ b/toxav/toxav.c
@@ -447,7 +447,7 @@ inline__ int toxav_send_rtp_payload ( ToxAv *av, int32_t call_index, ToxAvCallTy
             /* number of pieces - 1*/
             uint8_t numparts = (length - 1) / VIDEOFRAME_PIECE_SIZE;
 
-            uint8_t load[3 + VIDEOFRAME_PIECE_SIZE];
+            uint8_t load[2 + VIDEOFRAME_PIECE_SIZE];
             load[0] = av->calls[call_index].frame_outid++;
             load[1] = 0;
 
@@ -569,11 +569,11 @@ inline__ int toxav_recv_video ( ToxAv *av, int32_t call_index, vpx_image_t **out
             call->frame_limit = 0;
 
             if (rc != VPX_CODEC_OK) {
-                LOGGER_ERROR("Error decoding video: %s\n", vpx_codec_err_to_string(rc));
-                return ErrorInternal;
+                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;
         }
 
@@ -583,12 +583,14 @@ inline__ int toxav_recv_video ( ToxAv *av, int32_t call_index, vpx_image_t **out
             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);
         }
     }