diff --git a/toxav/codec.c b/toxav/codec.c
index 772b0a9d..f3d24969 100644
--- a/toxav/codec.c
+++ b/toxav/codec.c
@@ -220,6 +220,11 @@ 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_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;
 
     rc = vpx_codec_enc_init_ver(&cs->v_encoder, VIDEO_CODEC_ENCODER_INTERFACE, &cfg, 0, VPX_ENCODER_ABI_VERSION);
 
@@ -228,6 +233,7 @@ int init_video_encoder(CodecState *cs, uint16_t width, uint16_t height, uint32_t
         return -1;
     }
 
+    rc = vpx_codec_control(&cs->v_encoder, VP8E_SET_CPUUSED, 7);
     return 0;
 }
 
diff --git a/toxav/toxav.c b/toxav/toxav.c
index 4afb025d..dcab06d0 100644
--- a/toxav/toxav.c
+++ b/toxav/toxav.c
@@ -38,7 +38,7 @@
 #include <string.h>
 
 /* Assume 60 fps*/
-#define MAX_ENCODE_TIME_US ((1000 / 60) * 1000)
+#define MAX_ENCODE_TIME_US ((1000 / 24) * 1000)
 
 #define MAX_VIDEOFRAME_SIZE 0x40000 /* 256KiB */
 #define VIDEOFRAME_PIECE_SIZE 0x500 /* 1.25 KiB*/
@@ -77,7 +77,7 @@ struct _ToxAv {
 };
 
 const ToxAvCodecSettings av_DefaultSettings = {
-    1000,
+    2000,
     800,
     600,