Changeset 5992

Timestamp:

May 15, 2019 2:57:44 AM (5 years ago)

Author:

nanang

Message:

Re #2181: Fixed undefined reference linking errors when PJSUA_HAS_VIDEO is not set.

Location:

pjproject/trunk/pjsip/src/pjsua2

Files:

• endpoint.cpp (modified) (2 diffs)
• media.cpp (modified) (5 diffs)

pjproject/trunk/pjsip/src/pjsua2/endpoint.cpp

@@ -2068 +2068 @@
 VideoMediaVector Endpoint::mediaEnumVidPorts() const throw(Error)
 {
+#if PJSUA_HAS_VIDEO
     VideoMediaVector vmv;
     pjsua_conf_port_id ids[PJSUA_MAX_CONF_PORTS];
@@ -2080 +2081 @@
 
     return vmv;
+#else
+    PJSUA2_RAISE_ERROR(PJ_EINVALIDOP);
+#endif
 }
 

pjproject/trunk/pjsip/src/pjsua2/media.cpp

@@ -1869 +1869 @@
      throw(Error)
 {
+#if PJSUA_HAS_VIDEO
     if (!pool) {
         PJSUA2_RAISE_ERROR3(PJ_EINVAL, "registerMediaPort()",
@@ -1885 +1886 @@
                                                (pjmedia_port*)port, NULL,
                                                &id) );
+#else
+    PJ_UNUSED_ARG(port);
+    PJ_UNUSED_ARG(pool);
+    PJSUA2_RAISE_ERROR(PJ_EINVALIDOP);
+#endif
 }
 
 void VideoMedia::unregisterMediaPort()
 {
+#if PJSUA_HAS_VIDEO
     if (id != PJSUA_INVALID_ID) {
         pjsua_vid_conf_remove_port(id);
         id = PJSUA_INVALID_ID;
     }
+#endif
 }
 
@@ -1911 +1919 @@
 VidConfPortInfo VideoMedia::getPortInfoFromId(int port_id) throw(Error)
 {
+#if PJSUA_HAS_VIDEO
     pjsua_vid_conf_port_info pj_info;
     VidConfPortInfo pi;
@@ -1917 +1926 @@
     pi.fromPj(pj_info);
     return pi;
+#else
+    PJ_UNUSED_ARG(port_id);
+    PJSUA2_RAISE_ERROR(PJ_EINVALIDOP);
+#endif
 }
 
@@ -1924 +1937 @@
 {
     PJ_UNUSED_ARG(param);
+#if PJSUA_HAS_VIDEO
     PJSUA2_CHECK_EXPR( pjsua_vid_conf_connect(id, sink.id, NULL) );
+#else
+    PJ_UNUSED_ARG(sink);
+    PJSUA2_RAISE_ERROR(PJ_EINVALIDOP);
+#endif
 }
 
 void VideoMedia::stopTransmit(const VideoMedia &sink) const throw(Error)
 {
+#if PJSUA_HAS_VIDEO
     PJSUA2_CHECK_EXPR( pjsua_vid_conf_disconnect(id, sink.id) );
-}
+#else
+    PJ_UNUSED_ARG(sink);
+    PJSUA2_RAISE_ERROR(PJ_EINVALIDOP);
+#endif
+}