4 files changed, 54 insertions, 30 deletions

diff --git a/toxav/codec.c b/toxav/codec.c
index 4abb7f8c..fbf78d69 100644
--- a/toxav/codec.c
+++ b/toxav/codec.c
@@ -210,6 +210,44 @@ int init_audio_decoder(CodecState *cs, uint32_t audio_channels)
     return 0;
 }
 
+int reconfigure_video_encoder_resolution(CodecState *cs, uint16_t width, uint16_t height)
+{
+    vpx_codec_enc_cfg_t cfg = *cs->v_encoder.config.enc;
+
+    if (cfg.g_w == width && cfg.g_h == height)
+        return 0;
+
+    LOGGER_DEBUG("New video resolution: %u %u", width, height);
+    cfg.g_w = width;
+    cfg.g_h = height;
+    int rc = vpx_codec_enc_config_set(&cs->v_encoder, &cfg);
+
+    if ( rc != VPX_CODEC_OK) {
+        LOGGER_ERROR("Failed to set encoder control setting: %s", vpx_codec_err_to_string(rc));
+        return -1;
+    }
+
+    return 0;
+}
+
+int reconfigure_video_encoder_bitrate(CodecState *cs, uint32_t video_bitrate)
+{
+    vpx_codec_enc_cfg_t cfg = *cs->v_encoder.config.enc;
+
+    if (cfg.rc_target_bitrate == video_bitrate)
+        return 0;
+
+    LOGGER_DEBUG("New video bitrate: %u", video_bitrate);
+    cfg.rc_target_bitrate = video_bitrate;
+    int rc = vpx_codec_enc_config_set(&cs->v_encoder, &cfg);
+
+    if ( rc != VPX_CODEC_OK) {
+        LOGGER_ERROR("Failed to set encoder control setting: %s", vpx_codec_err_to_string(rc));
+        return -1;
+    }
+
+    return 0;
+}
 
 int init_video_encoder(CodecState *cs, uint16_t width, uint16_t height, uint32_t video_bitrate)
 {
@@ -222,8 +260,8 @@ int init_video_encoder(CodecState *cs, uint16_t width, uint16_t height, uint32_t
     }
 
     cfg.rc_target_bitrate = video_bitrate;
-    cfg.g_w = width;
-    cfg.g_h = height;
+    cfg.g_w = 8192;
+    cfg.g_h = 8192;
     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;
@@ -244,6 +282,9 @@ 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;
 }
 
diff --git a/toxav/codec.h b/toxav/codec.h
index 7ddf2943..d8e9f1a7 100644
--- a/toxav/codec.h
+++ b/toxav/codec.h
@@ -102,6 +102,11 @@ CodecState *codec_init_session ( uint32_t audio_bitrate,
 
 void codec_terminate_session(CodecState *cs);
 
+/* Reconfigure video encoder
+   return 0 on success.
+   return -1 on failure. */
+int reconfigure_video_encoder_resolution(CodecState *cs, uint16_t width, uint16_t height);
+int reconfigure_video_encoder_bitrate(CodecState *cs, uint32_t video_bitrate);
 
 /* Calculate energy and return 1 if has voice, 0 if not */
 int energy_VAD(CodecState *cs, int16_t *PCM, uint16_t frame_size, float energy);
diff --git a/toxav/rtp.c b/toxav/rtp.c
index 39e622bf..521e4b22 100644
--- a/toxav/rtp.c
+++ b/toxav/rtp.c
@@ -29,10 +29,6 @@
 #include "rtp.h"
 #include <stdlib.h>
 
-
-#define PAYLOAD_ID_VALUE_OPUS 1
-#define PAYLOAD_ID_VALUE_VP8  2
-
 #define size_32 4
 
 #define ADD_FLAG_VERSION(_h, _v) do { ( _h->flags ) &= 0x3F; ( _h->flags ) |= ( ( ( _v ) << 6 ) & 0xC0 ); } while(0)
@@ -68,26 +64,6 @@ inline__ int check_late_message (RTPSession *session, RTPMessage *msg)
     return ( msg->header->sequnum < session->rsequnum && msg->header->timestamp < session->timestamp ) ? 0 : -1;
 }
 
-/**
- * @brief Speaks for it self.
- *
- */
-static const uint32_t payload_table[] = {
-    8000, 8000, 8000, 8000, 8000, 8000, 16000, 8000, 8000, 8000,        /*    0-9    */
-    44100, 44100, 0, 0, 90000, 8000, 11025, 22050, 0, 0,                /*   10-19   */
-    0, 0, 0, 0, 0, 90000, 90000, 0, 90000, 0,                           /*   20-29   */
-    0, 90000, 90000, 90000, 90000, 0, 0, 0, 0, 0,                       /*   30-39   */
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0,                                       /*   40-49   */
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0,                                       /*   50-59   */
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0,                                       /*   60-69   */
-    PAYLOAD_ID_VALUE_OPUS, PAYLOAD_ID_VALUE_VP8, 0, 0, 0, 0, 0, 0, 0, 0,/*   70-79   */
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0,                                       /*   80-89   */
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0,                                       /*   90-99   */
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0,                                       /*  100-109  */
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0,                                       /*  110-119  */
-    0, 0, 0, 0, 0, 0, 0, 0                                              /*  120-127  */
-};
-
 
 /**
  * @brief Extracts header from payload.
@@ -686,7 +662,7 @@ RTPSession *rtp_init_session ( int payload_type, Messenger *messenger, int frien
     _retu->csrc      = NULL;        /* Container */
     _retu->ssrc      = random_int();
     _retu->marker    = 0;
-    _retu->payload_type = payload_table[payload_type];
+    _retu->payload_type = payload_type % 128;
 
     _retu->dest = friend_num;
 
diff --git a/toxav/toxav.c b/toxav/toxav.c
index 894c12e4..6ffef077 100644
--- a/toxav/toxav.c
+++ b/toxav/toxav.c
@@ -636,6 +636,8 @@ 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);
+    
+    reconfigure_video_encoder_resolution(call->cs, input->d_w, input->d_h);
 
     int rc = vpx_codec_encode(&call->cs->v_encoder, input, call->cs->frame_counter, 1, 0, MAX_ENCODE_TIME_US);
 
@@ -825,11 +827,11 @@ int toxav_get_peer_id ( ToxAv *av, int32_t call_index, int peer )
  * @return int
  * @retval ToxAvError No peer id
  */
-ToxAvCallState toxav_get_call_state(ToxAv* av, int32_t call_index)
-{    
+ToxAvCallState toxav_get_call_state(ToxAv *av, int32_t call_index)
+{
     if ( cii(call_index, av->msi_session) || !av->msi_session->calls[call_index] )
         return av_CallNonExistant;
-    
+
     return av->msi_session->calls[call_index]->state;
 
 }