8 files changed, 117 insertions, 91 deletions

diff --git a/INSTALL.md b/INSTALL.md
index 1aed5375..6cdec95b 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -150,6 +150,14 @@ Grab the following packages:
   * https://gnu.org/software/automake/
   * https://github.com/jedisct1/libsodium
   * http://check.sourceforge.net/
+  * http://yasm.tortall.net/Download.html
+  * https://code.google.com/p/webm/downloads/list
+  * http://www.opus-codec.org/downloads/
+  * http://www.freedesktop.org/wiki/Software/pkg-config/
+
+You must install yasm before installing libvpx, otherwise libvpx will fail to make correctly.
+
+pkg-config is important for enabling a/v support in tox core, failure to install pkg-config will prevent tox core form finding the required libopus/libvpx libraries. (pkg-config may not configure properly, if you get an error about GLIB, run configure with the following parameter, --with-internal-glib).
 
 Uncompress and install them all. Make sure to follow the README as the instructions change, but they all follow the same pattern below:
 
@@ -159,9 +167,8 @@ make
 sudo make install
 ```
 
-In your local TOX repository:
+Compiling and installing Tox Core
 
-Then generate makefile, build and install tox:
 ```bash
 cd ProjectTox-Core
 autoreconf -i
@@ -170,12 +177,11 @@ make
 make install
 ```
 
-Do not install them from macports (or any dependencies for that matter) as they get shoved in the wrong directory
-(or the wrong version gets installed) and make your life more annoying.
+If after running ./configure you get an error about core being unable to find libsodium (and you have installed it) run the following in place of ./configure;
+
+./configure --with-libsodium-headers=/usr/local/include/ --with-libsodium-libs=/usr/local/lib
 
-Another thing: you may want to install is the latest gcc. This caused me a few problems as XCode from 4.3
-no longer includes gcc and instead uses LLVM-GCC, a nice install guide can be found at
-http://caiustheory.com/install-gcc-421-apple-build-56663-with-xcode-42
+Ensure you set the locations correctly depending on where you installed libsodium on your computer.
 
 <a name="windows" />
 ###Windows:
diff --git a/auto_tests/toxav_basic_test.c b/auto_tests/toxav_basic_test.c
index a1bccd7c..0a710746 100644
--- a/auto_tests/toxav_basic_test.c
+++ b/auto_tests/toxav_basic_test.c
@@ -199,7 +199,7 @@ START_TEST(test_AV_flows)
     printf("All set after %llu seconds! Starting call...\n", time(NULL) - cur_time);
 
     muhcaps = av_DefaultSettings;
-    muhcaps.video_height = muhcaps.video_width = 128;
+    muhcaps.max_video_height = muhcaps.max_video_width = 128;
 
     Status status_control = {
         {none, toxav_new(Alice, 1), NULL, -1},
diff --git a/toxav/codec.c b/toxav/codec.c
index fbf78d69..ae24a976 100644
--- a/toxav/codec.c
+++ b/toxav/codec.c
@@ -81,10 +81,10 @@ JitterBuffer *create_queue(int capacity)
 void terminate_queue(JitterBuffer *q)
 {
     if (!q) return;
-    
+
     empty_queue(q);
     free(q->queue);
-    
+
     LOGGER_DEBUG("Terminated jitter buffer: %p", q);
     free(q);
 }
@@ -217,6 +217,9 @@ int reconfigure_video_encoder_resolution(CodecState *cs, uint16_t width, uint16_
     if (cfg.g_w == width && cfg.g_h == height)
         return 0;
 
+    if (width * height > cs->max_width * cs->max_height)
+        return -1;
+
     LOGGER_DEBUG("New video resolution: %u %u", width, height);
     cfg.g_w = width;
     cfg.g_h = height;
@@ -249,7 +252,7 @@ int reconfigure_video_encoder_bitrate(CodecState *cs, uint32_t video_bitrate)
     return 0;
 }
 
-int init_video_encoder(CodecState *cs, uint16_t width, uint16_t height, uint32_t video_bitrate)
+int init_video_encoder(CodecState *cs, uint16_t max_width, uint16_t max_height, uint32_t video_bitrate)
 {
     vpx_codec_enc_cfg_t  cfg;
     int rc = vpx_codec_enc_config_default(VIDEO_CODEC_ENCODER_INTERFACE, &cfg, 0);
@@ -260,13 +263,18 @@ int init_video_encoder(CodecState *cs, uint16_t width, uint16_t height, uint32_t
     }
 
     cfg.rc_target_bitrate = video_bitrate;
-    cfg.g_w = 8192;
-    cfg.g_h = 8192;
+    cfg.g_w = max_width;
+    cfg.g_h = max_height;
     cfg.g_pass = VPX_RC_ONE_PASS;
     cfg.g_error_resilient = VPX_ERROR_RESILIENT_DEFAULT | VPX_ERROR_RESILIENT_PARTITIONS;
     cfg.g_lag_in_frames = 0;
     cfg.kf_min_dist = 0;
     cfg.kf_max_dist = 300;
+    cfg.kf_mode = VPX_KF_AUTO;
+
+    cs->max_width = max_width;
+    cs->max_height = max_height;
+    cs->bitrate = video_bitrate;
 
     rc = vpx_codec_enc_init_ver(&cs->v_encoder, VIDEO_CODEC_ENCODER_INTERFACE, &cfg, 0, VPX_ENCODER_ABI_VERSION);
 
@@ -282,9 +290,6 @@ int init_video_encoder(CodecState *cs, uint16_t width, uint16_t height, uint32_t
         return -1;
     }
 
-    if (reconfigure_video_encoder_resolution(cs, width, height) != 0)
-        return -1;
-
     return 0;
 }
 
@@ -322,8 +327,8 @@ CodecState *codec_init_session ( uint32_t audio_bitrate,
                                  uint32_t audio_sample_rate,
                                  uint32_t audio_channels,
                                  uint32_t audio_VAD_tolerance_ms,
-                                 uint16_t video_width,
-                                 uint16_t video_height,
+                                 uint16_t max_video_width,
+                                 uint16_t max_video_height,
                                  uint32_t video_bitrate )
 {
     CodecState *retu = calloc(sizeof(CodecState), 1);
@@ -334,11 +339,12 @@ CodecState *codec_init_session ( uint32_t audio_bitrate,
     retu->audio_sample_rate = audio_sample_rate;
 
     /* Encoders */
-    if (!video_width || !video_height) { /* Disable video */
+    if (!max_video_width || !max_video_height) { /* Disable video */
         /*video_width = 320;
         video_height = 240; */
     } else {
-        retu->capabilities |= ( 0 == init_video_encoder(retu, video_width, video_height, video_bitrate) ) ? v_encoding : 0;
+        retu->capabilities |= ( 0 == init_video_encoder(retu, max_video_width, max_video_height,
+                                video_bitrate) ) ? v_encoding : 0;
         retu->capabilities |= ( 0 == init_video_decoder(retu) ) ? v_decoding : 0;
     }
 
@@ -360,7 +366,7 @@ CodecState *codec_init_session ( uint32_t audio_bitrate,
 void codec_terminate_session ( CodecState *cs )
 {
     if (!cs) return;
-    
+
     if ( cs->audio_encoder )
         opus_encoder_destroy(cs->audio_encoder);
 
@@ -372,7 +378,7 @@ void codec_terminate_session ( CodecState *cs )
 
     if ( cs->capabilities & v_encoding )
         vpx_codec_destroy(&cs->v_encoder);
-    
+
     LOGGER_DEBUG("Terminated codec state: %p", cs);
     free(cs);
 }
diff --git a/toxav/codec.h b/toxav/codec.h
index d8e9f1a7..a464ec8f 100644
--- a/toxav/codec.h
+++ b/toxav/codec.h
@@ -56,6 +56,9 @@ typedef struct _CodecState {
 
     /* video decoding */
     vpx_codec_ctx_t  v_decoder;
+    int bitrate;
+    int max_width;
+    int max_height;
 
     /* audio encoding */
     OpusEncoder *audio_encoder;
diff --git a/toxav/rtp.c b/toxav/rtp.c
index 521e4b22..653a22df 100644
--- a/toxav/rtp.c
+++ b/toxav/rtp.c
@@ -705,7 +705,7 @@ RTPSession *rtp_init_session ( int payload_type, Messenger *messenger, int frien
  */
 void rtp_terminate_session ( RTPSession *session, Messenger *messenger )
 {
-    if ( !session ) return;    
+    if ( !session ) return;
 
     custom_lossy_packet_registerhandler(messenger, session->dest, session->prefix, NULL, NULL);
 
@@ -721,8 +721,8 @@ void rtp_terminate_session ( RTPSession *session, Messenger *messenger )
     pthread_mutex_destroy(&session->mutex);
 
     LOGGER_DEBUG("Terminated RTP session: %p", session);
-    
+
     /* And finally free session */
     free ( session );
-    
-}
\ No newline at end of file
+
+}
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));
diff --git a/toxav/toxav.h b/toxav/toxav.h
index 2e71c4da..b7659441 100644
--- a/toxav/toxav.h
+++ b/toxav/toxav.h
@@ -120,8 +120,8 @@ typedef enum {
  */
 typedef struct _ToxAvCodecSettings {
     uint32_t video_bitrate; /* In kbits/s */
-    uint16_t video_width; /* In px */
-    uint16_t video_height; /* In px */
+    uint16_t max_video_width; /* In px */
+    uint16_t max_video_height; /* In px */
 
     uint32_t audio_bitrate; /* In bits/s */
     uint16_t audio_frame_duration; /* In ms */
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 4344fdcb..2adbd870 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -2598,6 +2598,10 @@ static int friends_list_load(Messenger *m, const uint8_t *data, uint32_t length)
 
         if (temp.status >= 3) {
             int fnum = m_addfriend_norequest(m, temp.client_id);
+
+            if (fnum < 0)
+                continue;
+
             setfriendname(m, fnum, temp.name, ntohs(temp.name_length));
             set_friend_statusmessage(m, fnum, temp.statusmessage, ntohs(temp.statusmessage_length));
             set_friend_userstatus(m, fnum, temp.userstatus);