Changeset 5006
- Timestamp:
- Mar 20, 2015 10:23:30 AM (10 years ago)
- Location:
- pjproject/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/configure-android
r4828 r5006 165 165 fi 166 166 167 ./configure --host=${TARGET_HOST} --disable-video$*167 ./configure --host=${TARGET_HOST} $* -
pjproject/trunk/pjsip/src/pjsua2/media.cpp
r4996 r5006 1016 1016 { 1017 1017 VideoWindowInfo vwi; 1018 #if PJSUA_HAS_VIDEO 1018 1019 pjsua_vid_win_info pj_vwi; 1019 1020 … … 1029 1030 vwi.size.h = pj_vwi.size.h; 1030 1031 1032 #endif 1031 1033 return vwi; 1032 1034 } … … 1034 1036 void VideoWindow::Show(bool show) throw(Error) 1035 1037 { 1038 #if PJSUA_HAS_VIDEO 1036 1039 PJSUA2_CHECK_EXPR( pjsua_vid_win_set_show(winId, show) ); 1037 } 1040 #else 1041 PJ_UNUSED_ARG(show); 1042 #endif 1043 } 1038 1044 1039 1045 void VideoWindow::setPos(const MediaCoordinate &pos) throw(Error) 1040 1046 { 1047 #if PJSUA_HAS_VIDEO 1041 1048 pjmedia_coord pj_pos; 1042 1049 … … 1044 1051 pj_pos.y = pos.y; 1045 1052 PJSUA2_CHECK_EXPR( pjsua_vid_win_set_pos(winId, &pj_pos) ); 1053 #else 1054 PJ_UNUSED_ARG(pos); 1055 #endif 1046 1056 } 1047 1057 1048 1058 void VideoWindow::setSize(const MediaSize &size) throw(Error) 1049 1059 { 1060 #if PJSUA_HAS_VIDEO 1050 1061 pjmedia_rect_size pj_size; 1051 1062 … … 1053 1064 pj_size.h = size.h; 1054 1065 PJSUA2_CHECK_EXPR( pjsua_vid_win_set_size(winId, &pj_size) ); 1066 #else 1067 PJ_UNUSED_ARG(size); 1068 #endif 1055 1069 } 1056 1070 1057 1071 void VideoWindow::rotate(int angle) throw(Error) 1058 1072 { 1073 #if PJSUA_HAS_VIDEO 1059 1074 PJSUA2_CHECK_EXPR( pjsua_vid_win_rotate(winId, angle) ); 1075 #else 1076 PJ_UNUSED_ARG(angle); 1077 #endif 1060 1078 } 1061 1079 1062 1080 void VideoWindow::setWindow(const VideoWindowHandle &win) throw(Error) 1063 1081 { 1082 #if PJSUA_HAS_VIDEO 1064 1083 pjmedia_vid_dev_hwnd vhwnd; 1065 1084 … … 1067 1086 vhwnd.info.window = win.handle.window; 1068 1087 PJSUA2_CHECK_EXPR( pjsua_vid_win_set_win(winId, &vhwnd) ); 1088 #else 1089 PJ_UNUSED_ARG(win); 1090 #endif 1069 1091 } 1070 1092
Note: See TracChangeset
for help on using the changeset viewer.