sysmocom
/
pjproject
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@5006 74dad513-b988-da41-8d7b-12977e46ad98
This commit is contained in:
Sauw Ming 2015-03-20 10:23:30 +00:00
parent b058a4c57f
commit 0214c2d053
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure-android
View File

@ -164,4 +164,4 @@ if test "1" = "1"; then
echo " RANLIB = ${RANLIB}"
fi
./configure --host=${TARGET_HOST} --disable-video $*
./configure --host=${TARGET_HOST} $*

24
pjsip/src/pjsua2/media.cpp
View File

@ -1015,6 +1015,7 @@ VideoWindow::VideoWindow(pjsua_vid_win_id win_id)
VideoWindowInfo VideoWindow::getInfo() const throw(Error)
{
VideoWindowInfo vwi;
#if PJSUA_HAS_VIDEO
pjsua_vid_win_info pj_vwi;
PJSUA2_CHECK_EXPR( pjsua_vid_win_get_info(winId, &pj_vwi) );
@ -1028,44 +1029,65 @@ VideoWindowInfo VideoWindow::getInfo() const throw(Error)
vwi.size.w = pj_vwi.size.w;
vwi.size.h = pj_vwi.size.h;
#endif
return vwi;
}
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;
pj_pos.x = pos.x;
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;
pj_size.w = size.w;
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;
vhwnd.type = win.type;
vhwnd.info.window = win.handle.window;
PJSUA2_CHECK_EXPR( pjsua_vid_win_set_win(winId, &vhwnd) );
#else
PJ_UNUSED_ARG(win);
#endif
}
///////////////////////////////////////////////////////////////////////////////