Changeset 4024

Timestamp:

Apr 5, 2012 4:41:24 AM (12 years ago)

Author:

nanang

Message:

More re #1478: AVI cleanup steps in pjsua app.

File:

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

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

@@ -140 +140 @@
     /* AVI to play */
     unsigned                avi_cnt;
-    pj_str_t                avi[MAX_AVI];
+    struct {
+        pj_str_t                path;
+        pjmedia_vid_dev_index   dev_id;
+        pjsua_conf_port_id      slot;
+    } avi[MAX_AVI];
     pj_bool_t               avi_auto_play;
-    pjmedia_vid_dev_index   avi_dev_id;
-    pjsua_conf_port_id      avi_slot;
+    int                     avi_def_idx;
+
 } app_config;
 
@@ -411 +415 @@
     cfg->ring_slot = PJSUA_INVALID_ID;
 
-    cfg->avi_dev_id = PJMEDIA_VID_INVALID_DEV;
-    cfg->avi_slot = PJSUA_INVALID_ID;
-
     for (i=0; i<PJ_ARRAY_SIZE(cfg->acc_cfg); ++i)
         pjsua_acc_config_default(&cfg->acc_cfg[i]);
@@ -423 +424 @@
     cfg->vid.vrender_dev = PJMEDIA_VID_DEFAULT_RENDER_DEV;
     cfg->aud_cnt = 1;
+
+    cfg->avi_def_idx = PJSUA_INVALID_ID;
 }
 
@@ -1518 +1521 @@
                 return -1;
             }
-            app_config.avi[app_config.avi_cnt++] = pj_str(pj_optarg);
+            app_config.avi[app_config.avi_cnt++].path = pj_str(pj_optarg);
             break;
 
@@ -2112 +2115 @@
     }
     for (i=0; i<config->avi_cnt; ++i) {
-        pj_ansi_sprintf(line, "--play-avi %s\n", config->avi[i].ptr);
+        pj_ansi_sprintf(line, "--play-avi %s\n", config->avi[i].path.ptr);
         pj_strcat2(&cfg, line);
     }
@@ -2828 +2831 @@
         /* Stream AVI, if desired */
         if (app_config.avi_auto_play &&
-            app_config.avi_slot != PJSUA_INVALID_ID)
+            app_config.avi_def_idx != PJSUA_INVALID_ID &&
+            app_config.avi[app_config.avi_def_idx].slot != PJSUA_INVALID_ID)
         {
-            pjsua_conf_connect(app_config.avi_slot, call_conf_slot);
+            pjsua_conf_connect(app_config.avi[app_config.avi_def_idx].slot,
+                               call_conf_slot);
             disconnect_mic = PJ_TRUE;
         }
@@ -4023 +4028 @@
 
     if (app_config.avi_auto_play &&
-        app_config.avi_dev_id != PJMEDIA_VID_INVALID_DEV)
+        app_config.avi_def_idx != PJSUA_INVALID_ID &&
+        app_config.avi[app_config.avi_def_idx].dev_id != PJMEDIA_VID_INVALID_DEV)
     {
-        acc_cfg->vid_cap_dev = app_config.avi_dev_id;
+        acc_cfg->vid_cap_dev = app_config.avi[app_config.avi_def_idx].dev_id;
     }
 }
@@ -5705 +5711 @@
             unsigned strm_idx, strm_cnt;
 
+            app_config.avi[i].dev_id = PJMEDIA_VID_INVALID_DEV;
+            app_config.avi[i].slot = PJSUA_INVALID_ID;
+
             pjmedia_avi_dev_param_default(&avdp);
-            avdp.path = app_config.avi[i];
+            avdp.path = app_config.avi[i].path;
 
             status =  pjmedia_avi_dev_alloc(avi_factory, &avdp, &avid);
@@ -5718 +5727 @@
             PJ_LOG(4,(THIS_FILE, "AVI player %.*s created, dev_id=%d",
                       (int)avdp.title.slen, avdp.title.ptr, avid));
-            app_config.avi_dev_id = avid;
+
+            app_config.avi[i].dev_id = avid;
+            if (app_config.avi_def_idx == PJSUA_INVALID_ID)
+                app_config.avi_def_idx = i;
 
             strm_cnt = pjmedia_avi_streams_get_num_streams(avdp.avi_streams);
@@ -5741 +5753 @@
                                   (int)avdp.title.slen, avdp.title.ptr,
                                   slot));
-                        app_config.avi_slot = slot;
+                        app_config.avi[i].slot = slot;
                     }
                 } else {
@@ -6037 +6049 @@
     }
 #endif
+
+    /* Close avi devs and ports */
+    for (i=0; i<app_config.avi_cnt; ++i) {
+        if (app_config.avi[i].slot != PJSUA_INVALID_ID)
+            pjsua_conf_remove_port(app_config.avi[i].slot);
+        if (app_config.avi[i].dev_id != PJMEDIA_VID_INVALID_DEV)
+            pjmedia_avi_dev_free(app_config.avi[i].dev_id);
+    }
 
     /* Close ringback port */