Changeset 3891 for pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

Timestamp:

Dec 1, 2011 9:06:14 AM (12 years ago)

Author:

nanang

Message:

Re #1419, implement media count manipulation per call basis:

• moved the media count setting from account setting to call setting
• introduced pjsua_call_setting, to be used by pjsua_call_make_call() and some new APIs: pjsua_call_answer2(), pjsua_call_reinvite2(), pjsua_call_update2()

File:

• pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c (modified) (22 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -135 +135 @@
 
     struct app_vid          vid;
+    unsigned                aud_cnt;
 } app_config;
 
@@ -403 +404 @@
     cfg->vid.vcapture_dev = PJMEDIA_VID_DEFAULT_CAPTURE_DEV;
     cfg->vid.vrender_dev = PJMEDIA_VID_DEFAULT_RENDER_DEV;
+    cfg->aud_cnt = 1;
 }
 
@@ -1456 +1458 @@
             break;
         case OPT_VIDEO:
-            app_config.vid.vid_cnt = 1;
-            app_config.vid.in_auto_show = PJ_TRUE;
-            app_config.vid.out_auto_transmit = PJ_TRUE;
+            cfg->vid.vid_cnt = 1;
+            cfg->vid.in_auto_show = PJ_TRUE;
+            cfg->vid.out_auto_transmit = PJ_TRUE;
             break;
         case OPT_EXTRA_AUDIO:
-            ++cur_acc->max_audio_cnt;
+            cfg->aud_cnt++;
             break;
 
@@ -1718 +1720 @@
     if (acc_cfg->mwi_enabled)
         pj_strcat2(result, "--mwi\n");
-
-    /* Video & extra audio */
-    for (i=0; i<acc_cfg->max_video_cnt; ++i) {
-        pj_strcat2(result, "--video\n");
-    }
-    for (i=1; i<acc_cfg->max_audio_cnt; ++i) {
-        pj_strcat2(result, "--extra-audio\n");
-    }
 }
 
@@ -1890 +1884 @@
 
     pj_strcat2(&cfg, "\n#\n# Media settings:\n#\n");
+
+    /* Video & extra audio */
+    for (i=0; i<config->vid.vid_cnt; ++i) {
+        pj_strcat2(&cfg, "--video\n");
+    }
+    for (i=1; i<config->aud_cnt; ++i) {
+        pj_strcat2(&cfg, "--extra-audio\n");
+    }
 
     /* SRTP */
@@ -2576 +2578 @@
     
     if (app_config.auto_answer > 0) {
-        pjsua_call_answer(call_id, app_config.auto_answer, NULL, NULL);
-    }
-
+        pjsua_call_setting call_opt;
+
+        pjsua_call_setting_default(&call_opt);
+        call_opt.audio_cnt = app_config.aud_cnt;
+        call_opt.video_cnt = app_config.vid.vid_cnt;
+
+        pjsua_call_answer2(call_id, &call_opt, app_config.auto_answer, NULL, NULL);
+    }
+    
     if (app_config.auto_answer < 200) {
+        char notif_st[80] = {0};
+
+#if PJSUA_HAS_VIDEO
+        if (call_info.rem_offerer && call_info.rem_video_cnt) {
+            snprintf(notif_st, sizeof(notif_st), 
+                     "To %s the video, type \"vid %s\" first, "
+                     "before answering the call!\n",
+                     (app_config.vid.vid_cnt? "reject":"accept"),
+                     (app_config.vid.vid_cnt? "disable":"enable"));
+        }
+#endif
+
         PJ_LOG(3,(THIS_FILE,
                   "Incoming call for account %d!\n"
+                  "Media count: %d audio & %d video\n"
+                  "%s"
                   "From: %s\n"
                   "To: %s\n"
                   "Press a to answer or h to reject call",
                   acc_id,
+                  call_info.rem_audio_cnt,
+                  call_info.rem_video_cnt,
+                  notif_st,
                   call_info.remote_info.ptr,
                   call_info.local_info.ptr));
@@ -2847 +2872 @@
         pjsua_call_hangup(call_id, 500, &reason, NULL);
     }
+
+#if PJSUA_HAS_VIDEO
+    /* Check if remote has just tried to enable video */
+    if (call_info.rem_offerer && call_info.rem_video_cnt)
+    {
+        int vid_idx;
+
+        /* Check if there is active video */
+        vid_idx = pjsua_call_get_vid_stream_idx(call_id);
+        if (vid_idx == -1 || call_info.media[vid_idx].dir == PJMEDIA_DIR_NONE) {
+            PJ_LOG(3,(THIS_FILE,
+                      "Just rejected incoming video offer on call %d"
+                      "use \"vid call add\" to enable video!",
+                      call_id));
+        }
+    }
+#endif
 }
 
@@ -3423 +3465 @@
 {
 #if PJSUA_HAS_VIDEO
+    pj_bool_t vid_enabled = (app_config.vid.vid_cnt > 0);
+
     puts("+=============================================================================+");
     puts("|                            Video commands:                                  |");
     puts("|                                                                             |");
     puts("| vid help                  Show this help screen                             |");
+    puts("| vid enable|disable        Enable or disable video in next offer/answer      |");
     puts("| vid acc show              Show current account video settings               |");
-    puts("| vid acc enable|disable    Enable or disable video on current account        |");
     puts("| vid acc autorx on|off     Automatically show incoming video on/off          |");
     puts("| vid acc autotx on|off     Automatically offer video on/off                  |");
@@ -3436 +3480 @@
     puts("| vid call tx on|off N      Enable/disable video tx for stream N in curr call |");
     puts("| vid call add              Add video stream for current call                 |");
-    puts("| vid call enable/disable N Enable/disable stream #N in current call          |");
+    puts("| vid call enable|disable N Enable/disable stream #N in current call          |");
     puts("| vid call cap N ID         Set capture dev ID for stream #N in current call  |");
     puts("| vid dev list              List all video devices                            |");
@@ -3448 +3492 @@
     puts("| vid win move ID X Y       Move window ID to position X,Y                    |");
     puts("| vid win resize ID w h     Resize window ID to the specified width, height   |");
+    puts("+=============================================================================+");
+    printf("| Video will be %s in the next offer/answer %s                            |\n",
+           (vid_enabled? "enabled" : "disabled"), (vid_enabled? " " : ""));
     puts("+=============================================================================+");
 #endif
@@ -3864 +3911 @@
 static void app_config_init_video(pjsua_acc_config *acc_cfg)
 {
-    acc_cfg->max_video_cnt = app_config.vid.vid_cnt;
     acc_cfg->vid_in_auto_show = app_config.vid.in_auto_show;
     acc_cfg->vid_out_auto_transmit = app_config.vid.out_auto_transmit;
@@ -3880 +3926 @@
     PJ_LOG(3,(THIS_FILE,
               "Account %d:\n"
-              "  Video count:      %d\n"
               "  RX auto show:     %d\n"
               "  TX auto transmit: %d\n"
@@ -3886 +3931 @@
               "  Render dev:       %d",
               acc_id,
-              acc_cfg->max_video_cnt,
               acc_cfg->vid_in_auto_show,
               acc_cfg->vid_out_auto_transmit,
@@ -3907 +3951 @@
     if (argc == 1 || strcmp(argv[1], "help")==0) {
         vid_show_help();
+    } else if (argc == 2 && (strcmp(argv[1], "enable")==0 ||
+                             strcmp(argv[1], "disable")==0))
+    {
+        pj_bool_t enabled = (strcmp(argv[1], "enable")==0);
+        app_config.vid.vid_cnt = (enabled ? 1 : 0);
+        PJ_LOG(3,(THIS_FILE, "Video will be %s in next offer/answer",
+                  (enabled?"enabled":"disabled")));
     } else if (strcmp(argv[1], "acc")==0) {
         pjsua_acc_config acc_cfg;
@@ -3915 +3966 @@
         if (argc == 3 && strcmp(argv[2], "show")==0) {
             app_config_show_video(current_acc, &acc_cfg);
-
-        } else if (argc == 3 && (strcmp(argv[2], "enable")==0 ||
-                                 strcmp(argv[2], "disable")==0))
-        {
-            int enabled = (strcmp(argv[2], "enable")==0);
-            acc_cfg.max_video_cnt = (enabled ? 1 : 0);
-            if (enabled) {
-                app_config_init_video(&acc_cfg);
-                acc_cfg.max_video_cnt = (enabled ? 1 : 0);
-            }
-            changed = PJ_TRUE;
         } else if (argc == 4 && strcmp(argv[2], "autorx")==0) {
             int on = (strcmp(argv[3], "on")==0);
@@ -4166 +4206 @@
     pjsua_call_info call_info;
     pjsua_acc_info acc_info;
-
+    pjsua_call_setting call_opt;
+
+    pjsua_call_setting_default(&call_opt);
+    call_opt.audio_cnt = app_config.aud_cnt;
+    call_opt.video_cnt = app_config.vid.vid_cnt;
 
     /* If user specifies URI to call, then call the URI */
     if (uri_to_call->slen) {
-        pjsua_call_make_call( current_acc, uri_to_call, 0, NULL, NULL, NULL);
+        pjsua_call_make_call( current_acc, uri_to_call, &call_opt, NULL, NULL, NULL);
     }
 
@@ -4205 +4249 @@
         }
 
+        /* Update call setting */
+        pjsua_call_setting_default(&call_opt);
+        call_opt.audio_cnt = app_config.aud_cnt;
+        call_opt.video_cnt = app_config.vid.vid_cnt;
+
         switch (menuin[0]) {
 
@@ -4234 +4283 @@
             pjsua_msg_data_init(&msg_data);
             TEST_MULTIPART(&msg_data);
-            pjsua_call_make_call( current_acc, &tmp, 0, NULL, &msg_data, NULL);
+            pjsua_call_make_call( current_acc, &tmp, &call_opt, NULL, &msg_data, NULL);
             break;
 
@@ -4266 +4315 @@
                 pj_status_t status;
             
-                status = pjsua_call_make_call(current_acc, &tmp, 0, NULL,
+                status = pjsua_call_make_call(current_acc, &tmp, &call_opt, NULL,
                                               NULL, NULL);
                 if (status != PJ_SUCCESS)
@@ -4403 +4452 @@
                 }
 
-                pjsua_call_answer(current_call, st_code, NULL, &msg_data);
+                pjsua_call_answer2(current_call, &call_opt, st_code, NULL, &msg_data);
             }
 
@@ -4592 +4641 @@
                  * re-INVITE
                  */
-                pjsua_call_reinvite(current_call, PJ_TRUE, NULL);
+                call_opt.flag |= PJSUA_CALL_UNHOLD;
+                pjsua_call_reinvite2(current_call, &call_opt, NULL);
 
             } else {
@@ -4605 +4655 @@
             if (current_call != -1) {
                 
-                pjsua_call_update(current_call, 0, NULL);
+                pjsua_call_update2(current_call, &call_opt, NULL);
 
             } else {