Changeset 5006 for pjproject


Ignore:
Timestamp:
Mar 20, 2015 10:23:30 AM (6 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:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/configure-android

    r4828 r5006  
    165165fi 
    166166 
    167 ./configure --host=${TARGET_HOST} --disable-video $* 
     167./configure --host=${TARGET_HOST} $* 
  • pjproject/trunk/pjsip/src/pjsua2/media.cpp

    r4996 r5006  
    10161016{ 
    10171017    VideoWindowInfo vwi; 
     1018#if PJSUA_HAS_VIDEO 
    10181019    pjsua_vid_win_info pj_vwi; 
    10191020     
     
    10291030    vwi.size.h = pj_vwi.size.h; 
    10301031     
     1032#endif 
    10311033    return vwi; 
    10321034} 
     
    10341036void VideoWindow::Show(bool show) throw(Error) 
    10351037{ 
     1038#if PJSUA_HAS_VIDEO 
    10361039    PJSUA2_CHECK_EXPR( pjsua_vid_win_set_show(winId, show) ); 
    1037 }    
     1040#else 
     1041    PJ_UNUSED_ARG(show); 
     1042#endif 
     1043} 
    10381044 
    10391045void VideoWindow::setPos(const MediaCoordinate &pos) throw(Error) 
    10401046{ 
     1047#if PJSUA_HAS_VIDEO 
    10411048    pjmedia_coord pj_pos; 
    10421049     
     
    10441051    pj_pos.y = pos.y; 
    10451052    PJSUA2_CHECK_EXPR( pjsua_vid_win_set_pos(winId, &pj_pos) ); 
     1053#else 
     1054    PJ_UNUSED_ARG(pos); 
     1055#endif 
    10461056} 
    10471057 
    10481058void VideoWindow::setSize(const MediaSize &size) throw(Error) 
    10491059{ 
     1060#if PJSUA_HAS_VIDEO 
    10501061    pjmedia_rect_size pj_size; 
    10511062 
     
    10531064    pj_size.h = size.h; 
    10541065    PJSUA2_CHECK_EXPR( pjsua_vid_win_set_size(winId, &pj_size) ); 
     1066#else 
     1067    PJ_UNUSED_ARG(size); 
     1068#endif 
    10551069} 
    10561070 
    10571071void VideoWindow::rotate(int angle) throw(Error) 
    10581072{ 
     1073#if PJSUA_HAS_VIDEO 
    10591074    PJSUA2_CHECK_EXPR( pjsua_vid_win_rotate(winId, angle) ); 
     1075#else 
     1076    PJ_UNUSED_ARG(angle); 
     1077#endif 
    10601078} 
    10611079 
    10621080void VideoWindow::setWindow(const VideoWindowHandle &win) throw(Error) 
    10631081{ 
     1082#if PJSUA_HAS_VIDEO 
    10641083    pjmedia_vid_dev_hwnd vhwnd; 
    10651084    
     
    10671086    vhwnd.info.window = win.handle.window; 
    10681087    PJSUA2_CHECK_EXPR( pjsua_vid_win_set_win(winId, &vhwnd) ); 
     1088#else 
     1089    PJ_UNUSED_ARG(win); 
     1090#endif 
    10691091} 
    10701092 
Note: See TracChangeset for help on using the changeset viewer.