Changeset 3892

Timestamp:

Dec 1, 2011 10:02:54 AM (13 years ago)

Author:

nanang

Message:

Misc (re #1393): fix linking error "app_config_init_video() not found" when video is disabled, also some compile warnings (unused variables).

Location:

pjproject/trunk

Files:

• pjsip-apps/src/pjsua/pjsua_app.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_call.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (3 diffs)

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

@@ -4188 +4188 @@
 }
 
+#else
+
+static void app_config_init_video(pjsua_acc_config *acc_cfg)
+{
+    PJ_UNUSED_ARG(acc_cfg);
+}
+
 #endif /* PJSUA_HAS_VIDEO */
 

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

@@ -3521 +3521 @@
     pjmedia_sdp_session *answer;
     unsigned i;
-    int vid_idx;
     pj_status_t status;
 
@@ -3532 +3531 @@
               call->index));
     pj_log_push_indent();
-
-#if 0 && PJMEDIA_HAS_VIDEO
-    /* If current session has no video, let's just stay with no video.
-     * If application want to enable video, it must send re-INVITE
-     * with video.
-     */
-    vid_idx = pjsua_call_get_vid_stream_idx(call->index);
-    if (vid_idx == -1 || call->media[vid_idx].dir == PJMEDIA_DIR_NONE)
-        call->opt.video_cnt = 0;
-#endif
 
     /* Re-init media for the new remote offer before creating SDP */

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -1398 +1398 @@
                                   pjsua_med_tp_state_cb cb)
 {
-    pjsua_acc *acc = &pjsua_var.acc[call_med->call->acc_id];
     pj_status_t status = PJ_SUCCESS;
 
@@ -1410 +1409 @@
     if (call_med->tp == NULL) {
 #if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
+        pjsua_acc *acc = &pjsua_var.acc[call_med->call->acc_id];
+
         /* While in initial call, set default video devices */
         if (type == PJMEDIA_TYPE_VIDEO) {
@@ -2553 +2554 @@
 #else
     PJ_UNUSED_ARG(STR_VIDEO);
-    mvidcnt = 0;
+    mvidcnt = mtotvidcnt = 0;
 #endif