Changeset 3667 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

Timestamp:

Jul 19, 2011 11:11:07 AM (13 years ago)

Author:

nanang

Message:

Fixed #1271: protected all video features with PJMEDIA_HAS_VIDEO macro setting.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c (modified) (4 diffs)

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

@@ -1248 +1248 @@
         call_med->tp_st = PJSUA_MED_TP_IDLE;
 
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
         /* While in initial call, set default video devices */
         if (type == PJMEDIA_TYPE_VIDEO) {
@@ -1263 +1264 @@
             }
         }
+#endif
+
     } else if (call_med->tp_st == PJSUA_MED_TP_DISABLED) {
         /* Media is being reenabled. */
@@ -1651 +1654 @@
                                                     &tpinfo.sock_info, 0, &m);
             break;
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
         case PJMEDIA_TYPE_VIDEO:
             status = pjmedia_endpt_create_video_sdp(pjsua_var.med_endpt, pool,
                                                     &tpinfo.sock_info, 0, &m);
             break;
+#endif
         default:
             pj_assert(!"Invalid call_med media type");
@@ -2125 +2130 @@
             }
             break;
-#if PJMEDIA_HAS_VIDEO
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
         case PJMEDIA_TYPE_VIDEO:
             status = video_channel_update(call_med, tmp_pool,