Merge pull request #35 from quiet/48khz

48khz

Author: brian-armstrong

quiet/src/main/jni/loopback.c

@@ -3,8 +3,8 @@
 // TODO fix include mess so we can include unistd.h
 extern int usleep(useconds_t);
 
-const int loopback_sample_rate = 44100;
-const int loopback_sleep = 23220;  // in microseconds
+const int loopback_sample_rate = 48000;
+const int loopback_sleep = 21333;  // in microseconds
 const int loopback_buffer_length = 1024;
 
 quiet_loopback_system *loopback_create() {

quiet/src/main/jni/network_interface.c

@@ -141,14 +141,14 @@ JNIEXPORT jvm_pointer JNICALL Java_org_quietmodem_Quiet_BaseNetworkInterface_nat
     jobject j_enc_profile = (*env)->GetObjectField(env, j_conf, cache.network_interface_config.encoder_profile);
     jvm_pointer j_enc_profile_ptr = (*env)->GetLongField(env, j_enc_profile, cache.encoder_profile.ptr);
     conf->encoder_opt = (quiet_encoder_options *)recover_pointer(j_enc_profile_ptr);
-    conf->encoder_rate = 44100;
+    conf->encoder_rate = 48000;
     size_t encoder_num_bufs = (*env)->GetLongField(env, j_enc_profile, cache.encoder_profile.num_bufs);
     size_t encoder_buf_len = (*env)->GetLongField(env, j_enc_profile, cache.encoder_profile.buf_len);
 
     jobject j_dec_profile = (*env)->GetObjectField(env, j_conf, cache.network_interface_config.decoder_profile);
     jvm_pointer j_dec_profile_ptr = (*env)->GetLongField(env, j_dec_profile, cache.decoder_profile.ptr);
     conf->decoder_opt = (quiet_decoder_options *)recover_pointer(j_dec_profile_ptr);
-    conf->decoder_rate = 44100;
+    conf->decoder_rate = 48000;
     size_t decoder_num_bufs = (*env)->GetLongField(env, j_dec_profile, cache.decoder_profile.num_bufs);
     size_t decoder_buf_len = (*env)->GetLongField(env, j_dec_profile, cache.decoder_profile.buf_len);
 

quiet/src/main/jni/receiver.c

@@ -34,7 +34,7 @@ quiet_android_decoder *android_decoder_create(JNIEnv *env, const quiet_decoder_o
                                               quiet_android_system *sys, bool is_loopback,
                                               size_t num_bufs, size_t buf_len) {
     quiet_android_decoder *d = calloc(1, sizeof(quiet_android_decoder));
-    d->dec = quiet_decoder_create(opt, 44100);
+    d->dec = quiet_decoder_create(opt, 48000);
     if (!d->dec) {
         android_decoder_destroy(d);
         throw_error(env, cache.system.init_exc_klass, decoder_error_format, quiet_get_last_error());

quiet/src/main/jni/transmitter.c

@@ -50,7 +50,7 @@ quiet_android_encoder *android_encoder_create(JNIEnv *env, const quiet_encoder_o
                                               quiet_android_system *sys, bool is_loopback,
                                               size_t num_bufs, size_t buf_len) {
     quiet_android_encoder *e = calloc(1, sizeof(quiet_android_encoder));
-    e->enc = quiet_encoder_create(opt, 44100);
+    e->enc = quiet_encoder_create(opt, 48000);
     if (!e->enc) {
         android_encoder_destroy(e);
         throw_error(env, cache.system.init_exc_klass, encoder_error_format, quiet_get_last_error());