Implement pausing

1 files changed, 114 insertions, 59 deletions

diff --git a/toxav/av_test.c b/toxav/av_test.c
index 594e7232..41f5a758 100644
--- a/toxav/av_test.c
+++ b/toxav/av_test.c
@@ -16,13 +16,25 @@
 
 typedef struct {
     bool incoming;
-    bool ringing;
-    bool ended;
-    bool errored;
-    bool sending;
-    bool paused;
+    TOXAV_CALL_STATE state;
 } CallControl;
 
+const char* stringify_state(TOXAV_CALL_STATE s)
+{
+    static const char* strings[] =
+    {
+        "NOT SENDING",
+        "SENDING AUDIO",
+        "SENDING VIDEO",
+        "SENDING AUDIO AND VIDEO",
+        "PAUSED",
+        "END",
+        "ERROR"
+    };
+    
+    return strings [s];
+};
+
 
 /** 
  * Callbacks 
@@ -34,53 +46,9 @@ void t_toxav_call_cb(ToxAV *av, uint32_t friend_number, bool audio_enabled, bool
 }
 void t_toxav_call_state_cb(ToxAV *av, uint32_t friend_number, TOXAV_CALL_STATE state, void *user_data)
 {
-    printf("Handling CALL STATE callback: ");
-    
-    if (((CallControl*)user_data)->paused)
-        ((CallControl*)user_data)->paused = false;
-    
-    switch (state)
-    {            
-        case TOXAV_CALL_STATE_NOT_SENDING: {
-            printf("Not sending");
-            ((CallControl*)user_data)->sending = false;
-        } break;
-        
-        case TOXAV_CALL_STATE_SENDING_A: {
-            printf("Sending Audio");
-            ((CallControl*)user_data)->sending = true;
-        } break;
-        
-        case TOXAV_CALL_STATE_SENDING_V: {
-            printf("Sending Video");
-            ((CallControl*)user_data)->sending = true;
-        } break;
-        
-        case TOXAV_CALL_STATE_SENDING_AV: {
-            printf("Sending Both");
-            ((CallControl*)user_data)->sending = true;
-        } break;
-        
-        case TOXAV_CALL_STATE_PAUSED: {
-            printf("Paused");
-            ((CallControl*)user_data)->paused = true;
-            ((CallControl*)user_data)->sending = false;
-        } break;
-        
-        case TOXAV_CALL_STATE_END: {
-            printf("Ended");
-            ((CallControl*)user_data)->ended = true;
-            ((CallControl*)user_data)->sending = false;
-        } break;
-        
-        case TOXAV_CALL_STATE_ERROR: {
-            printf("Error");
-            ((CallControl*)user_data)->errored = true;
-            ((CallControl*)user_data)->sending = false;
-        } break;
-    }
+    printf("Handling CALL STATE callback: %s\n", stringify_state(state));
     
-    printf("\n");
+    ((CallControl*)user_data)->state = state;
 }
 void t_toxav_receive_video_frame_cb(ToxAV *av, uint32_t friend_number,
                                     uint16_t width, uint16_t height,
@@ -211,27 +179,24 @@ int main (int argc, char** argv)
         long long unsigned int start_time = time(NULL); \
         \
         \
-        while (!AliceCC.ended || !BobCC.ended) { \
+        while (BobCC.state != TOXAV_CALL_STATE_END) { \
             \
             if (BobCC.incoming) { \
                 TOXAV_ERR_ANSWER rc; \
-                toxav_answer(BobAV, 0, 48, 4000, &rc); \
+                toxav_answer(BobAV, 0, A_BR, V_BR, &rc); \
                 \
                 if (rc != TOXAV_ERR_ANSWER_OK) { \
                     printf("toxav_answer failed: %d\n", rc); \
                     exit(1); \
                 } \
                 BobCC.incoming = false; \
-                BobCC.sending = true; /* There is no more start callback when answering */\
-            } \
-            else if (AliceCC.sending && BobCC.sending) { \
+            } else { \
                 /* TODO rtp */ \
                 \
                 if (time(NULL) - start_time == 5) { \
                     \
                     TOXAV_ERR_CALL_CONTROL rc; \
                     toxav_call_control(AliceAV, 0, TOXAV_CALL_CONTROL_CANCEL, &rc); \
-                    AliceCC.ended = true; /* There is no more end callback when hanging up */\
                     \
                     if (rc != TOXAV_ERR_CALL_CONTROL_OK) { \
                         printf("toxav_call_control failed: %d\n", rc); \
@@ -286,7 +251,7 @@ int main (int argc, char** argv)
             }
         }
         
-        while (!AliceCC.ended)
+        while (AliceCC.state != TOXAV_CALL_STATE_END)
             iterate(Bsn, AliceAV, BobAV);
         
         printf("Success!\n");
@@ -323,9 +288,99 @@ int main (int argc, char** argv)
         }
         
         /* Alice will not receive end state */
-        while (!BobCC.ended)
+        while (BobCC.state != TOXAV_CALL_STATE_END)
+            iterate(Bsn, AliceAV, BobAV);
+        
+        printf("Success!\n");
+    }
+    
+    { /* Check Mute-Unmute etc */
+        printf("\nTrying mute functionality...\n");
+        
+        
+        memset(&AliceCC, 0, sizeof(CallControl));
+        memset(&BobCC, 0, sizeof(CallControl));
+        
+        /* Assume sending audio and video */
+        {
+            TOXAV_ERR_CALL rc;
+            toxav_call(AliceAV, 0, 48, 1000, &rc);
+            
+            if (rc != TOXAV_ERR_CALL_OK) {
+                printf("toxav_call failed: %d\n", rc);
+                exit(1);
+            }
+        }
+        
+        while (!BobCC.incoming)
             iterate(Bsn, AliceAV, BobAV);
         
+        /* At first try all stuff while in invalid state */
+        assert(!toxav_call_control(AliceAV, 0, TOXAV_CALL_CONTROL_PAUSE, NULL));
+        assert(!toxav_call_control(AliceAV, 0, TOXAV_CALL_CONTROL_RESUME, NULL));
+        assert(!toxav_call_control(AliceAV, 0, TOXAV_CALL_CONTROL_MUTE_AUDIO, NULL));
+        assert(!toxav_call_control(AliceAV, 0, TOXAV_CALL_CONTROL_MUTE_VIDEO, NULL));
+        assert(!toxav_call_control(AliceAV, 0, TOXAV_CALL_CONTROL_UNMUTE_AUDIO, NULL));
+        assert(!toxav_call_control(AliceAV, 0, TOXAV_CALL_CONTROL_UNMUTE_VIDEO, NULL));
+        
+        {
+            TOXAV_ERR_ANSWER rc;
+            toxav_answer(BobAV, 0, 48, 4000, &rc);
+            
+            if (rc != TOXAV_ERR_ANSWER_OK) {
+                printf("toxav_answer failed: %d\n", rc);
+                exit(1);
+            }
+        }
+        
+        iterate(Bsn, AliceAV, BobAV);
+        
+        /* Pause and Resume */
+        printf("Pause and Resume\n");
+        assert(toxav_call_control(AliceAV, 0, TOXAV_CALL_CONTROL_PAUSE, NULL));
+        iterate(Bsn, AliceAV, BobAV);
+        assert(BobCC.state == TOXAV_CALL_STATE_PAUSED);
+        assert(toxav_call_control(AliceAV, 0, TOXAV_CALL_CONTROL_RESUME, NULL));
+        iterate(Bsn, AliceAV, BobAV);
+        assert(BobCC.state == TOXAV_CALL_STATE_SENDING_AV);
+        
+        /* Mute/Unmute single */
+        printf("Mute/Unmute single\n");
+        assert(toxav_call_control(AliceAV, 0, TOXAV_CALL_CONTROL_MUTE_AUDIO, NULL));
+        iterate(Bsn, AliceAV, BobAV);
+        assert(BobCC.state == TOXAV_CALL_CONTROL_MUTE_AUDIO);
+        assert(toxav_call_control(AliceAV, 0, TOXAV_CALL_CONTROL_UNMUTE_AUDIO, NULL));
+        iterate(Bsn, AliceAV, BobAV);
+        assert(BobCC.state == TOXAV_CALL_CONTROL_UNMUTE_AUDIO);
+        
+        /* Mute/Unmute both */
+        printf("Mute/Unmute both\n");
+        assert(toxav_call_control(AliceAV, 0, TOXAV_CALL_CONTROL_MUTE_AUDIO, NULL));
+        iterate(Bsn, AliceAV, BobAV);
+        assert(BobCC.state == TOXAV_CALL_STATE_SENDING_V);
+        assert(toxav_call_control(AliceAV, 0, TOXAV_CALL_CONTROL_MUTE_VIDEO, NULL));
+        iterate(Bsn, AliceAV, BobAV);
+        assert(BobCC.state == TOXAV_CALL_STATE_NOT_SENDING);
+        assert(toxav_call_control(AliceAV, 0, TOXAV_CALL_CONTROL_UNMUTE_AUDIO, NULL));
+        iterate(Bsn, AliceAV, BobAV);
+        assert(BobCC.state == TOXAV_CALL_STATE_SENDING_A);
+        assert(toxav_call_control(AliceAV, 0, TOXAV_CALL_CONTROL_UNMUTE_VIDEO, NULL));
+        iterate(Bsn, AliceAV, BobAV);
+        assert(BobCC.state == TOXAV_CALL_STATE_SENDING_AV);
+        
+        {
+            TOXAV_ERR_CALL_CONTROL rc;
+            toxav_call_control(AliceAV, 0, TOXAV_CALL_CONTROL_CANCEL, &rc);
+        
+            if (rc != TOXAV_ERR_CALL_CONTROL_OK) {
+                printf("toxav_call_control failed: %d\n", rc);
+                exit(1);
+            }
+        }
+        
+        iterate(Bsn, AliceAV, BobAV);
+        assert(BobCC.state == TOXAV_CALL_STATE_END);
+        
         printf("Success!\n");
     }