Commit 604a0f27 authored by Simon Morlat's avatar Simon Morlat

fix some bugs

parent 696fdb84
......@@ -853,16 +853,16 @@ usage: linphonec [-c file] [-s sipaddr] [-a] [-V] [-d level ] [-l logfile]\n\
#ifdef HAVE_X11_XLIB_H
static void sdl_x11_apply_video_params(){
static SDL_SysWMinfo info;
static bool_t wminfo_ready=FALSE;
bool_t wminfo_ready=FALSE;
if ( !wminfo_ready){
SDL_VERSION(&info.version);
if ( SDL_GetWMInfo(&info) ) {
if ( info.subsystem == SDL_SYSWM_X11 ) {
wminfo_ready=TRUE;
}
SDL_VERSION(&info.version);
if ( SDL_GetWMInfo(&info) ) {
if ( info.subsystem == SDL_SYSWM_X11 ) {
wminfo_ready=TRUE;
}
}
if ( !wminfo_ready) return;
{
......@@ -895,15 +895,17 @@ static void sdl_x11_apply_video_params(){
static void lpc_apply_video_params(){
if (lpc_video_params.refresh){
unsigned long wid=linphone_core_get_native_video_window_id (linphonec);
if (wid!=0){
lpc_video_params.refresh=FALSE;
static unsigned long prev_wid=0;
unsigned long wid=linphone_core_get_native_video_window_id (linphonec);
if (wid!=0 && (lpc_video_params.refresh || prev_wid!=wid)){
lpc_video_params.refresh=FALSE;
#ifdef HAVE_X11_XLIB_H
sdl_x11_apply_video_params();
sdl_x11_apply_video_params();
#endif
}
}
prev_wid=wid;
}
#endif
......
......@@ -1124,8 +1124,18 @@ static void process_media_control_xml(Sal *sal, eXosip_event_t *ev){
eXosip_call_build_answer(ev->tid,200,&ans);
if (ans)
eXosip_call_send_answer(ev->tid,200,ans);
return;
}
}
/*in all other cases we must say it is not implemented.*/
{
osip_message_t *ans=NULL;
eXosip_lock();
eXosip_call_build_answer(ev->tid,501,&ans);
if (ans)
eXosip_call_send_answer(ev->tid,501,ans);
eXosip_unlock();
}
}
static void process_dtmf_relay(Sal *sal, eXosip_event_t *ev){
......
......@@ -323,13 +323,14 @@ int sdp_to_media_description(sdp_message_t *msg, SalMediaDescription *desc){
payload_type_set_number(pt,ptn);
/* get the rtpmap associated to this codec, if any */
rtpmap=sdp_message_a_attr_value_get_with_pt(msg, i,ptn,"rtpmap");
payload_type_fill_from_rtpmap(pt,rtpmap);
/* get the fmtp, if any */
fmtp=sdp_message_a_attr_value_get_with_pt(msg, i, ptn,"fmtp");
payload_type_set_send_fmtp(pt,fmtp);
stream->payloads=ms_list_append(stream->payloads,pt);
ms_message("Found payload %s/%i fmtp=%s",pt->mime_type,pt->clock_rate,
pt->send_fmtp ? pt->send_fmtp : "");
if (payload_type_fill_from_rtpmap(pt,rtpmap)==0){
/* get the fmtp, if any */
fmtp=sdp_message_a_attr_value_get_with_pt(msg, i, ptn,"fmtp");
payload_type_set_send_fmtp(pt,fmtp);
stream->payloads=ms_list_append(stream->payloads,pt);
ms_message("Found payload %s/%i fmtp=%s",pt->mime_type,pt->clock_rate,
pt->send_fmtp ? pt->send_fmtp : "");
}
}
}
desc->nstreams=i;
......
......@@ -20,7 +20,6 @@ gtk/call_logs.ui
gtk/main.ui
gtk/sip_account.ui
gtk/chatroom.ui
gtk/incoming_call.ui
gtk/parameters.ui
gtk/buddylookup.ui
gtk/waiting.ui
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment