1 files changed, 70 insertions, 63 deletions

diff --git a/toxav/toxav.c b/toxav/toxav.c
index 19fcd854..81196af9 100644
--- a/toxav/toxav.c
+++ b/toxav/toxav.c
@@ -81,8 +81,8 @@ struct _ToxAv {
 
 const ToxAvCodecSettings av_DefaultSettings = {
     500,
-    800,
-    600,
+    1280,
+    720,
 
     64000,
     20,
@@ -300,7 +300,7 @@ int toxav_stop_call ( ToxAv *av, int32_t call_index )
 int toxav_prepare_transmission ( ToxAv *av, int32_t call_index, ToxAvCodecSettings *codec_settings, int support_video )
 {
     if ( !av->msi_session || cii(call_index, av->msi_session) ||
-         !av->msi_session->calls[call_index] || av->calls[call_index].call_active) {
+            !av->msi_session->calls[call_index] || av->calls[call_index].call_active) {
         LOGGER_ERROR("Error while starting RTP session: invalid call!\n");
         return ErrorInternal;
     }
@@ -350,17 +350,17 @@ int toxav_prepare_transmission ( ToxAv *av, int32_t call_index, ToxAvCodecSettin
                                         codec_settings->audio_sample_rate,
                                         codec_settings->audio_channels,
                                         codec_settings->audio_VAD_tolerance,
-                                        codec_settings->video_width,
-                                        codec_settings->video_height,
+                                        codec_settings->max_video_width,
+                                        codec_settings->max_video_height,
                                         codec_settings->video_bitrate) )) {
-        
-        if ( pthread_mutex_init(&call->mutex, NULL) != 0 ) goto error;        
-        
+
+        if ( pthread_mutex_init(&call->mutex, NULL) != 0 ) goto error;
+
         call->call_active = 1;
-        
+
         return ErrorNone;
     }
-    
+
 error:
     rtp_terminate_session(call->crtps[audio_index], av->messenger);
     rtp_terminate_session(call->crtps[video_index], av->messenger);
@@ -387,22 +387,27 @@ int toxav_kill_transmission ( ToxAv *av, int32_t call_index )
     }
 
     CallSpecific *call = &av->calls[call_index];
-    
+
     pthread_mutex_lock(&call->mutex);
-    
-    if (!call->call_active){ 
+
+    if (!call->call_active) {
         pthread_mutex_unlock(&call->mutex);
         LOGGER_WARNING("Action on inactive call: %d", call_index);
         return ErrorNoCall;
     }
-    
+
+
     call->call_active = 0;
 
-    rtp_terminate_session(call->crtps[audio_index], av->messenger); call->crtps[audio_index] = NULL;
-    rtp_terminate_session(call->crtps[video_index], av->messenger); call->crtps[video_index] = NULL;
-    terminate_queue(call->j_buf); call->j_buf = NULL;
-    codec_terminate_session(call->cs); call->cs = NULL;
-    
+    rtp_terminate_session(call->crtps[audio_index], av->messenger);
+    call->crtps[audio_index] = NULL;
+    rtp_terminate_session(call->crtps[video_index], av->messenger);
+    call->crtps[video_index] = NULL;
+    terminate_queue(call->j_buf);
+    call->j_buf = NULL;
+    codec_terminate_session(call->cs);
+    call->cs = NULL;
+
     pthread_mutex_unlock(&call->mutex);
     pthread_mutex_destroy(&call->mutex);
 
@@ -424,9 +429,10 @@ int toxav_kill_transmission ( ToxAv *av, int32_t call_index )
 inline__ int toxav_send_rtp_payload ( ToxAv *av, int32_t call_index, ToxAvCallType type, const uint8_t *payload,
                                       unsigned int length )
 {
-    CallSpecific* call = &av->calls[call_index];
+    CallSpecific *call = &av->calls[call_index];
+
     if (call->crtps[type - TypeAudio]) {
-        
+
         if (type == TypeAudio) {
             return rtp_send_msg(call->crtps[type - TypeAudio], av->messenger, payload, length);
         } else {
@@ -447,10 +453,10 @@ inline__ int toxav_send_rtp_payload ( ToxAv *av, int32_t call_index, ToxAvCallTy
             for (i = 0; i < numparts; i++) {
                 memcpy(load + VIDEOFRAME_HEADER_SIZE, payload, VIDEOFRAME_PIECE_SIZE);
                 payload += VIDEOFRAME_PIECE_SIZE;
-                
-                if (rtp_send_msg(call->crtps[type - TypeAudio], av->messenger, 
+
+                if (rtp_send_msg(call->crtps[type - TypeAudio], av->messenger,
                                  load, VIDEOFRAME_HEADER_SIZE + VIDEOFRAME_PIECE_SIZE) != 0) {
-                    
+
                     return ErrorInternal;
                 }
 
@@ -460,7 +466,7 @@ inline__ int toxav_send_rtp_payload ( ToxAv *av, int32_t call_index, ToxAvCallTy
             /* remainder = length % VIDEOFRAME_PIECE_SIZE, VIDEOFRAME_PIECE_SIZE if = 0 */
             length = ((length - 1) % VIDEOFRAME_PIECE_SIZE) + 1;
             memcpy(load + VIDEOFRAME_HEADER_SIZE, payload, length);
-            
+
             return rtp_send_msg(call->crtps[type - TypeAudio], av->messenger, load, VIDEOFRAME_HEADER_SIZE + length);
         }
     } else {
@@ -483,9 +489,9 @@ inline__ int toxav_recv_rtp_payload ( ToxAv *av, int32_t call_index, ToxAvCallTy
     if ( !dest ) return ErrorInternal;
 
     CallSpecific *call = &av->calls[call_index];
-    
+
     if ( !call->crtps[type - TypeAudio] ) return ErrorNoRtpSession;
-    
+
     RTPMessage *message;
 
     if ( type == TypeAudio ) {
@@ -538,16 +544,15 @@ inline__ int toxav_recv_video ( ToxAv *av, int32_t call_index, vpx_image_t **out
         return ErrorNoCall;
     }
 
-    CallSpecific *call = &av->calls[call_index];    
+    CallSpecific *call = &av->calls[call_index];
     pthread_mutex_lock(&call->mutex);
-    
-    if (!call->call_active){ 
+
+    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;
 
@@ -598,7 +603,7 @@ inline__ int toxav_recv_video ( ToxAv *av, int32_t call_index, vpx_image_t **out
     img = vpx_codec_get_frame(&call->cs->v_decoder, &iter);
 
     *output = img;
-    
+
     pthread_mutex_unlock(&call->mutex);
     return ErrorNone;
 }
@@ -619,19 +624,19 @@ inline__ int toxav_send_video ( ToxAv *av, int32_t call_index, const uint8_t *fr
         return ErrorNoCall;
     }
 
-    CallSpecific* call = &av->calls[call_index];
+    CallSpecific *call = &av->calls[call_index];
     pthread_mutex_lock(&call->mutex);
-    
-    
-    if (!call->call_active){ 
+
+
+    if (!call->call_active) {
         pthread_mutex_unlock(&call->mutex);
         LOGGER_WARNING("Action on inactive call: %d", call_index);
         return ErrorNoCall;
     }
-    
+
     int rc = toxav_send_rtp_payload(av, call_index, TypeVideo, frame, frame_size);
     pthread_mutex_unlock(&call->mutex);
-    
+
     return rc;
 }
 
@@ -656,14 +661,17 @@ inline__ int toxav_prepare_video_frame(ToxAv *av, int32_t call_index, uint8_t *d
 
     CallSpecific *call = &av->calls[call_index];
     pthread_mutex_lock(&call->mutex);
-    
-    if (!call->call_active){ 
+
+    if (!call->call_active) {
         pthread_mutex_unlock(&call->mutex);
         LOGGER_WARNING("Action on inactive call: %d", call_index);
         return ErrorNoCall;
     }
-    
-    reconfigure_video_encoder_resolution(call->cs, input->d_w, input->d_h);
+
+    if (reconfigure_video_encoder_resolution(call->cs, input->d_w, input->d_h) != 0) {
+        pthread_mutex_unlock(&call->mutex);
+        return ErrorInternal;
+    }
 
     int rc = vpx_codec_encode(&call->cs->v_encoder, input, call->cs->frame_counter, 1, 0, MAX_ENCODE_TIME_US);
 
@@ -681,7 +689,7 @@ inline__ int toxav_prepare_video_frame(ToxAv *av, int32_t call_index, uint8_t *d
 
     while ( (pkt = vpx_codec_get_cx_data(&call->cs->v_encoder, &iter)) ) {
         if (pkt->kind == VPX_CODEC_CX_FRAME_PKT) {
-            if ( copied + pkt->data.frame.sz > dest_max ) { 
+            if ( copied + pkt->data.frame.sz > dest_max ) {
                 pthread_mutex_unlock(&call->mutex);
                 return ErrorPacketTooLarge;
             }
@@ -719,9 +727,9 @@ inline__ int toxav_recv_audio ( ToxAv *av, int32_t call_index, int frame_size, i
 
     CallSpecific *call = &av->calls[call_index];
     pthread_mutex_lock(&call->mutex);
-    
-    
-    if (!call->call_active){ 
+
+
+    if (!call->call_active) {
         pthread_mutex_unlock(&call->mutex);
         LOGGER_WARNING("Action on inactive call: %d", call_index);
         return ErrorNoCall;
@@ -733,9 +741,9 @@ inline__ int toxav_recv_audio ( ToxAv *av, int32_t call_index, int frame_size, i
 
     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;
@@ -743,9 +751,9 @@ inline__ int toxav_recv_audio ( ToxAv *av, int32_t call_index, int frame_size, i
 
     } 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;
@@ -774,19 +782,19 @@ inline__ int toxav_send_audio ( ToxAv *av, int32_t call_index, const uint8_t *fr
         return ErrorNoCall;
     }
 
-    CallSpecific* call = &av->calls[call_index];
+    CallSpecific *call = &av->calls[call_index];
     pthread_mutex_lock(&call->mutex);
-    
-    
-    if (!call->call_active){ 
+
+
+    if (!call->call_active) {
         pthread_mutex_unlock(&call->mutex);
         LOGGER_WARNING("Action on inactive call: %d", call_index);
         return ErrorNoCall;
     }
-    
+
     int rc = toxav_send_rtp_payload(av, call_index, TypeAudio, frame, frame_size);
     pthread_mutex_unlock(&call->mutex);
-    
+
     return rc;
 }
 
@@ -810,19 +818,18 @@ inline__ int toxav_prepare_audio_frame ( ToxAv *av, int32_t call_index, uint8_t
         return ErrorNoCall;
     }
 
-    CallSpecific* call = &av->calls[call_index];
+    CallSpecific *call = &av->calls[call_index];
     pthread_mutex_lock(&call->mutex);
-    
-    
-    if (!call->call_active){ 
+
+
+    if (!call->call_active) {
         pthread_mutex_unlock(&call->mutex);
         LOGGER_WARNING("Action on inactive call: %d", call_index);
         return ErrorNoCall;
     }
-    
-    int32_t rc = opus_encode(call->cs->audio_encoder, frame, frame_size, dest, dest_max);
-    pthread_mutex_unlock(&call->mutex);    
 
+    int32_t rc = opus_encode(call->cs->audio_encoder, frame, frame_size, dest, dest_max);
+    pthread_mutex_unlock(&call->mutex);
 
     if (rc < 0) {
         LOGGER_ERROR("Failed to encode payload: %s\n", opus_strerror(rc));