Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
liblinphone
Commits
a4f4d599
Commit
a4f4d599
authored
Sep 25, 2015
by
Simon Morlat
Browse files
fix ICE regression
parent
46e3ae72
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
coreapi/linphonecore.c
coreapi/linphonecore.c
+3
-2
coreapi/misc.c
coreapi/misc.c
+1
-2
coreapi/private.h
coreapi/private.h
+1
-1
No files found.
coreapi/linphonecore.c
View file @
a4f4d599
...
...
@@ -3479,10 +3479,10 @@ int linphone_core_start_accept_call_update(LinphoneCore *lc, LinphoneCall *call,
linphone_call_make_local_media_description
(
call
);
linphone_call_update_remote_session_id_and_ver
(
call
);
linphone_call_stop_ice_for_inactive_streams
(
call
);
sal_call_set_local_media_description
(
call
->
op
,
call
->
localdesc
);
sal_call_accept
(
call
->
op
);
md
=
sal_call_get_final_media_description
(
call
->
op
);
linphone_call_stop_ice_for_inactive_streams
(
call
,
md
);
if
(
md
&&
!
sal_media_description_empty
(
md
)){
linphone_core_update_streams
(
lc
,
call
,
md
,
next_state
);
}
...
...
@@ -3711,12 +3711,13 @@ int linphone_core_accept_call_with_params(LinphoneCore *lc, LinphoneCall *call,
}
linphone_call_update_remote_session_id_and_ver
(
call
);
linphone_call_stop_ice_for_inactive_streams
(
call
);
sal_call_accept
(
call
->
op
);
linphone_core_notify_display_status
(
lc
,
_
(
"Connected."
));
lc
->
current_call
=
call
;
linphone_call_set_state
(
call
,
LinphoneCallConnected
,
"Connected"
);
new_md
=
sal_call_get_final_media_description
(
call
->
op
);
linphone_call_stop_ice_for_inactive_streams
(
call
,
new_md
);
if
(
new_md
){
linphone_core_update_streams
(
lc
,
call
,
new_md
,
LinphoneCallStreamsRunning
);
linphone_call_set_state
(
call
,
LinphoneCallStreamsRunning
,
"Connected (streams running)"
);
...
...
coreapi/misc.c
View file @
a4f4d599
...
...
@@ -758,10 +758,9 @@ void linphone_core_update_ice_state_in_call_stats(LinphoneCall *call)
linphone_ice_state_to_string
(
call
->
stats
[
LINPHONE_CALL_STATS_AUDIO
].
ice_state
),
linphone_ice_state_to_string
(
call
->
stats
[
LINPHONE_CALL_STATS_VIDEO
].
ice_state
));
}
void
linphone_call_stop_ice_for_inactive_streams
(
LinphoneCall
*
call
)
{
void
linphone_call_stop_ice_for_inactive_streams
(
LinphoneCall
*
call
,
SalMediaDescription
*
desc
)
{
int
i
;
IceSession
*
session
=
call
->
ice_session
;
SalMediaDescription
*
desc
=
call
->
localdesc
;
if
(
session
==
NULL
)
return
;
if
(
ice_session_state
(
session
)
==
IS_Completed
)
return
;
...
...
coreapi/private.h
View file @
a4f4d599
...
...
@@ -437,7 +437,7 @@ void linphone_core_adapt_to_network(LinphoneCore *lc, int ping_time_ms, Linphone
int
linphone_core_gather_ice_candidates
(
LinphoneCore
*
lc
,
LinphoneCall
*
call
);
void
linphone_core_update_ice_state_in_call_stats
(
LinphoneCall
*
call
);
void
linphone_call_stats_fill
(
LinphoneCallStats
*
stats
,
MediaStream
*
ms
,
OrtpEvent
*
ev
);
void
linphone_call_stop_ice_for_inactive_streams
(
LinphoneCall
*
call
);
void
linphone_call_stop_ice_for_inactive_streams
(
LinphoneCall
*
call
,
SalMediaDescription
*
result
);
void
_update_local_media_description_from_ice
(
SalMediaDescription
*
desc
,
IceSession
*
session
);
void
linphone_call_update_local_media_description_from_ice_or_upnp
(
LinphoneCall
*
call
);
void
linphone_call_update_ice_from_remote_media_description
(
LinphoneCall
*
call
,
const
SalMediaDescription
*
md
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment