3 files changed, 75 insertions, 60 deletions

diff --git a/auto_tests/Makefile.inc b/auto_tests/Makefile.inc
index 5e101f60..55a52541 100644
--- a/auto_tests/Makefile.inc
+++ b/auto_tests/Makefile.inc
@@ -1,9 +1,7 @@
 if BUILD_TESTS
 
-TESTS = messenger_autotest crypto_test network_test assoc_test onion_test TCP_test tox_test 
-#toxav_basic_test toxav_many_test
-check_PROGRAMS = messenger_autotest crypto_test network_test assoc_test onion_test TCP_test tox_test 
-#toxav_basic_test toxav_many_test
+TESTS = messenger_autotest crypto_test network_test assoc_test onion_test TCP_test tox_test
+check_PROGRAMS = messenger_autotest crypto_test network_test assoc_test onion_test TCP_test tox_test
 
 AUTOTEST_CFLAGS = \
                          $(LIBSODIUM_CFLAGS) \
@@ -20,11 +18,11 @@ AUTOTEST_LDADD = \
                         $(CHECK_LIBS)
 
 
-#Tests don't work atm
+
 if BUILD_AV
-#TESTS += toxav_basic_test
-#check_PROGRAMS += toxav_basic_test
-#AUTOTEST_LDADD += libtoxav.la
+TESTS += toxav_basic_test toxav_many_test
+check_PROGRAMS += toxav_basic_test toxav_many_test
+AUTOTEST_LDADD += libtoxav.la
 endif
 
 messenger_autotest_SOURCES = ../auto_tests/messenger_test.c
@@ -76,20 +74,20 @@ tox_test_CFLAGS = $(AUTOTEST_CFLAGS)
 tox_test_LDADD = $(AUTOTEST_LDADD)
 
 
-#Tests don't work atm
+
 if BUILD_AV
-#toxav_basic_test_SOURCES = ../auto_tests/toxav_basic_test.c
+toxav_basic_test_SOURCES = ../auto_tests/toxav_basic_test.c
 
-#toxav_basic_test_CFLAGS = $(AUTOTEST_CFLAGS)
+toxav_basic_test_CFLAGS = $(AUTOTEST_CFLAGS)
 
-#toxav_basic_test_LDADD = $(AUTOTEST_LDADD)
+toxav_basic_test_LDADD = $(AUTOTEST_LDADD)
 
 
-#toxav_many_test_SOURCES = ../auto_tests/toxav_many_test.c
+toxav_many_test_SOURCES = ../auto_tests/toxav_many_test.c
 
-#toxav_many_test_CFLAGS = $(AUTOTEST_CFLAGS)
+toxav_many_test_CFLAGS = $(AUTOTEST_CFLAGS)
 
-#toxav_many_test_LDADD = $(AUTOTEST_LDADD)
+toxav_many_test_LDADD = $(AUTOTEST_LDADD)
 endif
 
 endif
diff --git a/auto_tests/toxav_basic_test.c b/auto_tests/toxav_basic_test.c
index c0162582..116a519a 100644
--- a/auto_tests/toxav_basic_test.c
+++ b/auto_tests/toxav_basic_test.c
@@ -13,6 +13,7 @@
 
 #include "../toxcore/tox.h"
 #include "../toxcore/logger.h"
+#include "../toxcore/crypto_core.h"
 #include "../toxav/toxav.h"
 
 #if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
@@ -159,6 +160,7 @@ case 3: /* Wait for Both to have status ended */\
 if (status_control.Alice.status == Ended && status_control.Bob.status == Ended) running = 0; break; } c_sleep(20); } } printf("\n");
 
 START_TEST(test_AV_flows)
+// int test_AV_flows()
 {
     long long unsigned int cur_time = time(NULL);
     Tox *bootstrap_node = tox_new(0);
@@ -200,11 +202,10 @@ START_TEST(test_AV_flows)
     muhcaps.video_height = muhcaps.video_width = 128;
 
     Status status_control = {
-        {none, toxav_new(Alice, 1), NULL},
-        {none, toxav_new(Bob, 1), NULL},
+        {none, toxav_new(Alice, 1), NULL, -1},
+        {none, toxav_new(Bob, 1), NULL, -1},
     };
-
-
+    
     ck_assert_msg(status_control.Alice.av || status_control.Bob.av, "Failed to create 2 toxav instances");
 
 
@@ -222,9 +223,11 @@ START_TEST(test_AV_flows)
     toxav_register_callstate_callback(callback_requ_timeout, av_OnRequestTimeout, &status_control);
 
 
-
-    int16_t sample_payload[10] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
-    uint8_t prepared_payload[1000];
+    const int frame_size = (av_DefaultSettings.audio_sample_rate * av_DefaultSettings.audio_frame_duration / 1000);
+    int16_t sample_payload[frame_size];
+    randombytes_salsa20_random_buf(sample_payload, sizeof(int16_t) * frame_size);
+    
+    uint8_t prepared_payload[RTP_PAYLOAD_SIZE];
     int payload_size;
     
     vpx_image_t *sample_image = vpx_img_alloc(NULL, VPX_IMG_FMT_I420, 128, 128, 1);
@@ -241,30 +244,34 @@ START_TEST(test_AV_flows)
     /*
      * Call with audio only on both sides. Alice calls Bob.
      */
+
+    
     CALL_AND_START_LOOP(TypeAudio, TypeAudio) {
         /* Both send */
-        int payload_size = toxav_prepare_audio_frame(status_control.Alice.av, status_control.Alice.call_index, prepared_payload, 1000, sample_payload, 120);
-        if (!( payload_size > 0 )) { /* FIXME: this will always fail */
+        payload_size = toxav_prepare_audio_frame(status_control.Alice.av, status_control.Alice.call_index, prepared_payload, 1000, sample_payload, frame_size);
+        if ( payload_size < 0 ) {
             ck_assert_msg ( 0, "Failed to encode payload" );
         }
-        
         toxav_send_audio(status_control.Alice.av, status_control.Alice.call_index, prepared_payload, payload_size);
+        
+        payload_size = toxav_prepare_audio_frame(status_control.Bob.av, status_control.Bob.call_index, prepared_payload, 1000, sample_payload, frame_size);
+        if ( payload_size < 0 ) {
+            ck_assert_msg ( 0, "Failed to encode payload" );
+        }
         toxav_send_audio(status_control.Bob.av, status_control.Bob.call_index, prepared_payload, payload_size);
-
+        
         /* Both receive */
-        int16_t storage[10];
+        int16_t storage[frame_size];
         int recved;
 
         /* Payload from Bob */
-        recved = toxav_recv_audio(status_control.Alice.av, status_control.Alice.call_index, 120, storage);
+        recved = toxav_recv_audio(status_control.Alice.av, status_control.Alice.call_index, frame_size, storage);
 
         if ( recved ) {
             /*ck_assert_msg(recved == 10 && memcmp(storage, sample_payload, 10) == 0, "Payload from Bob is invalid");*/
-            memset(storage, 0, 10);
         }
 
-        /* Payload from Alice */
-        recved = toxav_recv_audio(status_control.Bob.av, status_control.Bob.call_index, 120, storage);
+        recved = toxav_recv_audio(status_control.Bob.av, status_control.Bob.call_index, frame_size, storage);
 
         if ( recved ) {
             /*ck_assert_msg(recved == 10 && memcmp(storage, sample_payload, 10) == 0, "Payload from Alice is invalid");*/
@@ -286,28 +293,30 @@ START_TEST(test_AV_flows)
      * Call with audio on both sides and video on one side. Alice calls Bob.
      */
     CALL_AND_START_LOOP(TypeAudio, TypeVideo) {
-        /* Both send */
-        int payload_size = toxav_prepare_audio_frame(status_control.Alice.av, status_control.Alice.call_index, prepared_payload, 1000, sample_payload, 120);
-        if (!( payload_size > 0 )) { /* FIXME: this will always fail */
+        /* Both send */        
+        payload_size = toxav_prepare_audio_frame(status_control.Alice.av, status_control.Alice.call_index, prepared_payload, 1000, sample_payload, frame_size);
+        if ( payload_size < 0 ) {
             ck_assert_msg ( 0, "Failed to encode payload" );
         }
-        
         toxav_send_audio(status_control.Alice.av, status_control.Alice.call_index, prepared_payload, payload_size);
         
+        payload_size = toxav_prepare_audio_frame(status_control.Bob.av, status_control.Bob.call_index, prepared_payload, 1000, sample_payload, frame_size);
+        if ( payload_size < 0 ) {
+            ck_assert_msg ( 0, "Failed to encode payload" );
+        }
         toxav_send_audio(status_control.Bob.av, status_control.Bob.call_index, prepared_payload, payload_size);
 //         toxav_send_video(status_control.Bob.av, status_control.Bob.call_index, sample_image);
 
         /* Both receive */
-        int16_t storage[10];
+        int16_t storage[frame_size];
         vpx_image_t *video_storage;
         int recved;
 
         /* Payload from Bob */
-        recved = toxav_recv_audio(status_control.Alice.av, status_control.Alice.call_index, 120, storage);
+        recved = toxav_recv_audio(status_control.Alice.av, status_control.Alice.call_index, frame_size, storage);
 
         if ( recved ) {
             /*ck_assert_msg(recved == 10 && memcmp(storage, sample_payload, 10) == 0, "Payload from Bob is invalid");*/
-            memset(storage, 0, 10);
         }
 
         /* Video payload */
@@ -324,7 +333,7 @@ START_TEST(test_AV_flows)
 
 
         /* Payload from Alice */
-        recved = toxav_recv_audio(status_control.Bob.av, status_control.Bob.call_index, 120, storage);
+        recved = toxav_recv_audio(status_control.Bob.av, status_control.Bob.call_index, frame_size, storage);
 
         if ( recved ) {
             /*ck_assert_msg(recved == 10 && memcmp(storage, sample_payload, 10) == 0, "Payload from Alice is invalid");*/
@@ -347,28 +356,32 @@ START_TEST(test_AV_flows)
      */
     CALL_AND_START_LOOP(TypeVideo, TypeVideo) {
         /* Both send */
-        int payload_size = toxav_prepare_audio_frame(status_control.Alice.av, status_control.Alice.call_index, prepared_payload, 1000, sample_payload, 120);
-        if (!( payload_size > 0 )) { /* FIXME: this will always fail */
+        
+        payload_size = toxav_prepare_audio_frame(status_control.Alice.av, status_control.Alice.call_index, prepared_payload, 1000, sample_payload, frame_size);
+        if ( payload_size < 0 ) {
             ck_assert_msg ( 0, "Failed to encode payload" );
         }
+        toxav_send_audio(status_control.Alice.av, status_control.Alice.call_index, prepared_payload, payload_size);
         
-        toxav_send_audio(status_control.Alice.av, status_control.Alice.call_index, prepared_payload, payload_size);        
-//         toxav_send_video(status_control.Alice.av, status_control.Alice.call_index, sample_image);
-        
+        payload_size = toxav_prepare_audio_frame(status_control.Bob.av, status_control.Bob.call_index, prepared_payload, 1000, sample_payload, frame_size);
+        if ( payload_size < 0 ) {
+            ck_assert_msg ( 0, "Failed to encode payload" );
+        }
         toxav_send_audio(status_control.Bob.av, status_control.Bob.call_index, prepared_payload, payload_size);
+        
+//         toxav_send_video(status_control.Alice.av, status_control.Alice.call_index, sample_image);
 //         toxav_send_video(status_control.Bob.av, status_control.Bob.call_index, sample_image);
 
         /* Both receive */
-        int16_t storage[10];
+        int16_t storage[frame_size];
         vpx_image_t *video_storage;
         int recved;
 
         /* Payload from Bob */
-        recved = toxav_recv_audio(status_control.Alice.av, status_control.Alice.call_index, 120, storage);
+        recved = toxav_recv_audio(status_control.Alice.av, status_control.Alice.call_index, frame_size, storage);
 
         if ( recved ) {
             /*ck_assert_msg(recved == 10 && memcmp(storage, sample_payload, 10) == 0, "Payload from Bob is invalid");*/
-            memset(storage, 0, 10);
         }
 
         /* Video payload */
@@ -385,7 +398,7 @@ START_TEST(test_AV_flows)
 
 
         /* Payload from Alice */
-        recved = toxav_recv_audio(status_control.Bob.av, status_control.Bob.call_index, 120, storage);
+        recved = toxav_recv_audio(status_control.Bob.av, status_control.Bob.call_index, frame_size, storage);
 
         if ( recved ) {
             /*ck_assert_msg(recved == 10 && memcmp(storage, sample_payload, 10) == 0, "Payload from Alice is invalid");*/
@@ -437,7 +450,6 @@ START_TEST(test_AV_flows)
                     toxav_call(status_control.Alice.av, &status_control.Alice.call_index, 0, TypeAudio, 10);
                     step++;
                     break;
-                    \
 
                 case 1: /* Bob */
                     if (status_control.Bob.status == Ringing) {
@@ -491,7 +503,7 @@ START_TEST(test_AV_flows)
                     break;
 
                 case 2:  /* Wait for Both to have status ended */
-                    if (status_control.Alice.status == Ended && status_control.Bob.status == Cancel) running = 0;
+                    if (status_control.Bob.status == Cancel) running = 0;
 
                     break;
             }
@@ -521,7 +533,7 @@ Suite *tox_suite(void)
 
     TCase *tc_av_flows = tcase_create("AV_flows");
     tcase_add_test(tc_av_flows, test_AV_flows);
-    tcase_set_timeout(tc_av_flows, 100); /* Timeout on 100 too much? */
+    tcase_set_timeout(tc_av_flows, 200);
     suite_add_tcase(s, tc_av_flows);
     
     return s;
@@ -539,4 +551,6 @@ int main(int argc, char *argv[])
     srunner_free(test_runner);
 
     return number_failed;
+    
+//     return test_AV_flows();
 }
diff --git a/auto_tests/toxav_many_test.c b/auto_tests/toxav_many_test.c
index b499b439..f9a24012 100644
--- a/auto_tests/toxav_many_test.c
+++ b/auto_tests/toxav_many_test.c
@@ -13,6 +13,7 @@
 
 #include "../toxcore/tox.h"
 #include "../toxcore/logger.h"
+#include "../toxcore/crypto_core.h"
 #include "../toxav/toxav.h"
 
 #if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
@@ -131,9 +132,11 @@ void* in_thread_call (void* arg)
     int step = 0,running = 1; 
     int call_idx;
     
+    const int frame_size = (av_DefaultSettings.audio_sample_rate * av_DefaultSettings.audio_frame_duration / 1000);
+    int16_t sample_payload[frame_size];
+    randombytes_salsa20_random_buf(sample_payload, sizeof(int16_t) * frame_size);
     
-    int16_t sample_payload[10] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
-    uint8_t prepared_payload[1000];
+    uint8_t prepared_payload[RTP_PAYLOAD_SIZE];
     
     
     /* NOTE: CALLEE WILL ALWAHYS NEED CALL_IDX == 0 */
@@ -162,37 +165,37 @@ void* in_thread_call (void* arg)
                     toxav_prepare_transmission(this_call->Callee.av, 0, &cast, 1);
                     toxav_prepare_transmission(this_call->Caller.av, call_idx, &cast, 1);
                     
-                    int payload_size = toxav_prepare_audio_frame(this_call->Caller.av, call_idx, prepared_payload, 1000, sample_payload, 120);
-                    if (!( payload_size > 0 )) {
+                    int payload_size = toxav_prepare_audio_frame(this_call->Caller.av, call_idx, prepared_payload, RTP_PAYLOAD_SIZE, sample_payload, frame_size);
+                    if ( payload_size < 0 ) {
                         ck_assert_msg ( 0, "Failed to encode payload" );
                     }
                     
+                    
                     while (time(NULL) - start < 10) { /* 10 seconds */
                         /* Both send */
                         toxav_send_audio(this_call->Caller.av, call_idx, prepared_payload, payload_size);
                         
                         toxav_send_audio(this_call->Callee.av, 0, prepared_payload, payload_size);
                         
-                        call_print(time(NULL) - start, "Blaaah");
                         /* Both receive */
-                        int16_t storage[1000];
+                        int16_t storage[RTP_PAYLOAD_SIZE];
                         int recved;
                         
                         /* Payload from CALLER */
-                        recved = toxav_recv_audio(this_call->Callee.av, 0, 120, storage);
+                        recved = toxav_recv_audio(this_call->Callee.av, 0, frame_size, storage);
                         
                         if ( recved ) {
                             /*ck_assert_msg(recved == 10 && memcmp(storage, sample_payload, 10) == 0, "Payload from CALLER is invalid");*/
                         }
                         
                         /* Payload from CALLEE */
-                        recved = toxav_recv_audio(this_call->Caller.av, call_idx, 120, storage);
+                        recved = toxav_recv_audio(this_call->Caller.av, call_idx, frame_size, storage);
                         
                         if ( recved ) {
                             /*ck_assert_msg(recved == 10 && memcmp(storage, sample_payload, 10) == 0, "Payload from CALLEE is invalid");*/
                         }
                          
-                        //c_sleep(20);
+                        c_sleep(20);
                     }
                     
                     step++; /* This terminates the loop */