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
6b1a4479
Commit
6b1a4479
authored
Oct 03, 2012
by
Ghislain MARY
Browse files
Prevent double update of local media description + fix crash when edge detection deactivates video.
parent
55f67676
Changes
1
Hide whitespace changes
Inline
Side-by-side
coreapi/linphonecore.c
View file @
6b1a4479
...
...
@@ -2537,7 +2537,6 @@ void linphone_core_notify_incoming_call(LinphoneCore *lc, LinphoneCall *call){
int
linphone_core_start_update_call
(
LinphoneCore
*
lc
,
LinphoneCall
*
call
){
const
char
*
subject
;
call
->
camera_active
=
call
->
params
.
has_video
;
update_local_media_description
(
lc
,
call
);
if
(
call
->
ice_session
!=
NULL
)
linphone_core_update_local_media_description_from_ice
(
call
->
localdesc
,
call
->
ice_session
);
...
...
@@ -2577,10 +2576,10 @@ int linphone_core_update_call(LinphoneCore *lc, LinphoneCall *call, const Linpho
call
->
videostream
->
ice_check_list
=
NULL
;
}
call
->
params
=
*
params
;
update_local_media_description
(
lc
,
call
);
if
((
call
->
ice_session
!=
NULL
)
&&
!
has_video
&&
params
->
has_video
)
{
/* Defer call update until the ICE candidates gathering process has finished. */
ms_message
(
"Defer call update to gather ICE candidates"
);
update_local_media_description
(
lc
,
call
);
linphone_call_init_video_stream
(
call
);
video_stream_prepare_video
(
call
->
videostream
);
if
(
linphone_core_gather_ice_candidates
(
lc
,
call
)
<
0
)
{
...
...
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