mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-04-28 22:26:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'belle-sip' of ssh://git.linphone.org/linphone-private into belle-sip

Browse source
This commit is contained in:
Jehan Monnier 2013-06-10 17:40:00 +02:00
commit edadbeb040
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
coreapi/bellesip_sal/sal_op_call.c
View file

@ -81,13 +81,14 @@ static void sdp_process(SalOp *h){
static int set_sdp(belle_sip_message_t *msg,belle_sdp_session_description_t* session_desc) { static int set_sdp(belle_sip_message_t *msg,belle_sdp_session_description_t* session_desc) {
belle_sip_header_content_type_t* content_type ; belle_sip_header_content_type_t* content_type ;
belle_sip_header_content_length_t* content_length; belle_sip_header_content_length_t* content_length;
int length; belle_sip_error_code error = BELLE_SIP_OK;
unsigned int length = 0;
char buff[2048]; char buff[2048];
if (session_desc) { if (session_desc) {
content_type = belle_sip_header_content_type_create("application","sdp"); content_type = belle_sip_header_content_type_create("application","sdp");
length = belle_sip_object_marshal(BELLE_SIP_OBJECT(session_desc),buff,0,sizeof(buff)); error = belle_sip_object_marshal(BELLE_SIP_OBJECT(session_desc),buff,sizeof(buff),&length);
if (length>=sizeof(buff)) { if (error != BELLE_SIP_OK) {
ms_error("Buffer too small or sdp too big"); ms_error("Buffer too small or sdp too big");
return -1; return -1;
} }

4
coreapi/linphonecore.h
View file

@ -1400,8 +1400,8 @@ LINPHONE_PUBLIC void linphone_core_set_preferred_video_size_by_name(LinphoneCore
void linphone_core_enable_video_preview(LinphoneCore *lc, bool_t val); void linphone_core_enable_video_preview(LinphoneCore *lc, bool_t val);
bool_t linphone_core_video_preview_enabled(const LinphoneCore *lc); bool_t linphone_core_video_preview_enabled(const LinphoneCore *lc);
void linphone_core_enable_self_view(LinphoneCore *lc, bool_t val); LINPHONE_PUBLIC void linphone_core_enable_self_view(LinphoneCore *lc, bool_t val);
bool_t linphone_core_self_view_enabled(const LinphoneCore *lc); LINPHONE_PUBLIC bool_t linphone_core_self_view_enabled(const LinphoneCore *lc);
/* returns a null terminated static array of string describing the webcams */ /* returns a null terminated static array of string describing the webcams */