1 files changed, 16 insertions, 13 deletions

diff --git a/toxav/codec.c b/toxav/codec.c
index 020cde81..776ca940 100644
--- a/toxav/codec.c
+++ b/toxav/codec.c
@@ -362,21 +362,22 @@ void cs_do(CSSession *cs)
 {
     /* Codec session should always be protected by call mutex so no need to check for cs validity
      */
-    
+
     if (!cs) return;
-    
+
     Payload *p;
     int rc;
-    
+
     pthread_mutex_lock(cs->queue_mutex);
+
     if (cs->abuf_raw && !buffer_empty(cs->abuf_raw)) {
         /* Decode audio */
         buffer_read(cs->abuf_raw, &p);
-        
+
         /* Leave space for (possibly) other thread to queue more data after we read it here */
         pthread_mutex_unlock(cs->queue_mutex);
-        
-        
+
+
         uint16_t fsize = (cs->audio_decoder_channels *
                           (cs->audio_decoder_sample_rate * cs->audio_decoder_frame_duration) / 1000);
         int16_t tmp[fsize];
@@ -389,17 +390,17 @@ void cs_do(CSSession *cs)
         else if (cs->acb.first)
             /* Play */
             cs->acb.first(cs->agent, cs->call_idx, tmp, rc, cs->acb.second);
-        
+
         pthread_mutex_lock(cs->queue_mutex);
     }
 
     if (cs->vbuf_raw && !buffer_empty(cs->vbuf_raw)) {
         /* Decode video */
         buffer_read(cs->vbuf_raw, &p);
-        
+
         /* Leave space for (possibly) other thread to queue more data after we read it here */
         pthread_mutex_unlock(cs->queue_mutex);
-        
+
         rc = vpx_codec_decode(&cs->v_decoder, p->data, p->size, NULL, MAX_DECODE_TIME_US);
         free(p);
 
@@ -413,9 +414,11 @@ void cs_do(CSSession *cs)
             for (; dest; dest = vpx_codec_get_frame(&cs->v_decoder, &iter)) {
                 if (cs->vcb.first)
                     cs->vcb.first(cs->agent, cs->call_idx, dest, cs->vcb.second);
+
                 vpx_img_free(dest);
             }
         }
+
         return;
     }
 
@@ -477,7 +480,7 @@ CSSession *cs_new(const ToxAvCSettings *cs_self, const ToxAvCSettings *cs_peer,
         LOGGER_WARNING("Failed to create recursive mutex!");
         return NULL;
     }
-    
+
     if ( !(cs->j_buf = jbuf_new(jbuf_size)) ) {
         LOGGER_WARNING("Jitter buffer creaton failed!");
         goto error;
@@ -518,14 +521,14 @@ CSSession *cs_new(const ToxAvCSettings *cs_self, const ToxAvCSettings *cs_peer,
 
         if ( !(cs->vbuf_raw = buffer_new(VIDEO_DECODE_BUFFER_SIZE)) ) goto error;
     }
-    
+
     return cs;
 
 error:
     LOGGER_WARNING("Error initializing codec session! Application might misbehave!");
-    
+
     pthread_mutex_destroy(cs->queue_mutex);
-    
+
     buffer_free(cs->abuf_raw);
 
     if ( cs->audio_encoder ) opus_encoder_destroy(cs->audio_encoder);