Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
liblinphone
Commits
53859fc1
Commit
53859fc1
authored
14 years ago
by
Simon Morlat
Browse files
Options
Download
Patches
Plain Diff
bugfixes in pause/resume
parent
8647ec6a
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
coreapi/callbacks.c
+1
-0
coreapi/callbacks.c
coreapi/offeranswer.c
+6
-9
coreapi/offeranswer.c
with
7 additions
and
9 deletions
coreapi/callbacks.c
+
1
−
0
View file @
53859fc1
...
@@ -362,6 +362,7 @@ static void call_updating(SalOp *op){
...
@@ -362,6 +362,7 @@ static void call_updating(SalOp *op){
if
(
md
&&
!
sal_media_description_empty
(
md
))
if
(
md
&&
!
sal_media_description_empty
(
md
))
{
{
if
(
sal_media_description_has_dir
(
call
->
localdesc
,
SalStreamSendRecv
)){
if
(
sal_media_description_has_dir
(
call
->
localdesc
,
SalStreamSendRecv
)){
ms_message
(
"Our local status is SalStreamSendRecv"
);
if
(
sal_media_description_has_dir
(
md
,
SalStreamRecvOnly
)
||
sal_media_description_has_dir
(
md
,
SalStreamInactive
)){
if
(
sal_media_description_has_dir
(
md
,
SalStreamRecvOnly
)
||
sal_media_description_has_dir
(
md
,
SalStreamInactive
)){
/* we are being paused */
/* we are being paused */
if
(
lc
->
vtable
.
display_status
)
if
(
lc
->
vtable
.
display_status
)
...
...
This diff is collapsed.
Click to expand it.
coreapi/offeranswer.c
+
6
−
9
View file @
53859fc1
...
@@ -133,19 +133,16 @@ static SalStreamDir compute_dir_incoming(SalStreamDir local, SalStreamDir offere
...
@@ -133,19 +133,16 @@ static SalStreamDir compute_dir_incoming(SalStreamDir local, SalStreamDir offere
res
=
SalStreamSendOnly
;
res
=
SalStreamSendOnly
;
if
(
offered
==
SalStreamInactive
)
if
(
offered
==
SalStreamInactive
)
res
=
SalStreamInactive
;
res
=
SalStreamInactive
;
else
res
=
SalStreamSendRecv
;
}
else
if
(
local
==
SalStreamSendOnly
){
}
else
if
(
local
==
SalStreamSendOnly
){
if
(
offered
==
SalStreamSendOnly
)
res
=
SalStreamInactive
;
if
(
offered
==
SalStreamRecvOnly
)
if
(
offered
==
SalStreamRecvOnly
)
res
=
SalStreamSendOnly
;
res
=
SalStreamSendOnly
;
if
(
offered
==
SalStreamInactive
)
else
res
=
SalStreamInactive
;
res
=
SalStreamInactive
;
}
else
if
(
local
==
SalStreamRecvOnly
){
}
else
if
(
local
==
SalStreamRecvOnly
){
if
(
offered
==
SalStreamSendOnly
)
if
(
offered
==
SalStreamSendOnly
||
offered
==
SalStreamSendRecv
)
res
=
SalStreamRecvOnly
;
res
=
SalStreamRecvOnly
;
if
(
offered
==
SalStreamRecvOnly
)
else
res
=
SalStreamInactive
;
if
(
offered
==
SalStreamInactive
)
res
=
SalStreamInactive
;
res
=
SalStreamInactive
;
}
else
res
=
SalStreamInactive
;
}
else
res
=
SalStreamInactive
;
return
res
;
return
res
;
...
@@ -177,7 +174,7 @@ static void initiate_incoming(const SalStreamDescription *local_cap,
...
@@ -177,7 +174,7 @@ static void initiate_incoming(const SalStreamDescription *local_cap,
result
->
payloads
=
match_payloads
(
local_cap
->
payloads
,
remote_offer
->
payloads
,
FALSE
,
one_matching_codec
);
result
->
payloads
=
match_payloads
(
local_cap
->
payloads
,
remote_offer
->
payloads
,
FALSE
,
one_matching_codec
);
result
->
proto
=
local_cap
->
proto
;
result
->
proto
=
local_cap
->
proto
;
result
->
type
=
local_cap
->
type
;
result
->
type
=
local_cap
->
type
;
result
->
dir
=
compute_dir_incoming
(
result
->
dir
,
remote_offer
->
dir
);
result
->
dir
=
compute_dir_incoming
(
local_cap
->
dir
,
remote_offer
->
dir
);
if
(
result
->
payloads
&&
!
only_telephone_event
(
result
->
payloads
)){
if
(
result
->
payloads
&&
!
only_telephone_event
(
result
->
payloads
)){
strcpy
(
result
->
addr
,
local_cap
->
addr
);
strcpy
(
result
->
addr
,
local_cap
->
addr
);
result
->
port
=
local_cap
->
port
;
result
->
port
=
local_cap
->
port
;
...
...
This diff is collapsed.
Click to expand it.
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets