Changeset 5006 for pjproject

Timestamp:

Mar 20, 2015 10:23:30 AM (10 years ago)

Author:

ming

Message:

Re #1823: Related to r4996: Fixed undefined symbol error if video is not enabled. Also modify configure-android to not disable-video by default

Location:

pjproject/trunk

Files:

• configure-android (modified) (1 diff)
• pjsip/src/pjsua2/media.cpp (modified) (6 diffs)

pjproject/trunk/configure-android

@@ -165 +165 @@
 fi
 
-./configure --host=${TARGET_HOST} --disable-video $*
+./configure --host=${TARGET_HOST} $*

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

@@ -1016 +1016 @@
 {
     VideoWindowInfo vwi;
+#if PJSUA_HAS_VIDEO
     pjsua_vid_win_info pj_vwi;
     
@@ -1029 +1030 @@
     vwi.size.h = pj_vwi.size.h;
     
+#endif
     return vwi;
 }
@@ -1034 +1036 @@
 void VideoWindow::Show(bool show) throw(Error)
 {
+#if PJSUA_HAS_VIDEO
     PJSUA2_CHECK_EXPR( pjsua_vid_win_set_show(winId, show) );
-}   
+#else
+    PJ_UNUSED_ARG(show);
+#endif
+}
 
 void VideoWindow::setPos(const MediaCoordinate &pos) throw(Error)
 {
+#if PJSUA_HAS_VIDEO
     pjmedia_coord pj_pos;
     
@@ -1044 +1051 @@
     pj_pos.y = pos.y;
     PJSUA2_CHECK_EXPR( pjsua_vid_win_set_pos(winId, &pj_pos) );
+#else
+    PJ_UNUSED_ARG(pos);
+#endif
 }
 
 void VideoWindow::setSize(const MediaSize &size) throw(Error)
 {
+#if PJSUA_HAS_VIDEO
     pjmedia_rect_size pj_size;
 
@@ -1053 +1064 @@
     pj_size.h = size.h;
     PJSUA2_CHECK_EXPR( pjsua_vid_win_set_size(winId, &pj_size) );
+#else
+    PJ_UNUSED_ARG(size);
+#endif
 }
 
 void VideoWindow::rotate(int angle) throw(Error)
 {
+#if PJSUA_HAS_VIDEO
     PJSUA2_CHECK_EXPR( pjsua_vid_win_rotate(winId, angle) );
+#else
+    PJ_UNUSED_ARG(angle);
+#endif
 }
 
 void VideoWindow::setWindow(const VideoWindowHandle &win) throw(Error)
 {
+#if PJSUA_HAS_VIDEO
     pjmedia_vid_dev_hwnd vhwnd;
    
@@ -1067 +1086 @@
     vhwnd.info.window = win.handle.window;
     PJSUA2_CHECK_EXPR( pjsua_vid_win_set_win(winId, &vhwnd) );
+#else
+    PJ_UNUSED_ARG(win);
+#endif
 }