Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
savoirfairelinux
jami-daemon
Commits
4c43f650
Commit
4c43f650
authored
Aug 02, 2012
by
Tristan Matthews
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* #12426: sdp/video: don't bother parsing empty SDP descriptions
parent
d17e3dcb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
daemon/src/sip/sdp.cpp
daemon/src/sip/sdp.cpp
+1
-1
daemon/src/video/video_rtp_session.cpp
daemon/src/video/video_rtp_session.cpp
+6
-2
No files found.
daemon/src/sip/sdp.cpp
View file @
4c43f650
...
...
@@ -473,7 +473,7 @@ string Sdp::getIncomingVideoDescription() const
if
(
videoIdx
==
activeLocalSession_
->
media_count
)
{
DEBUG
(
"No video present in local session"
);
return
ss
.
str
()
;
return
""
;
}
// get direction string
...
...
daemon/src/video/video_rtp_session.cpp
View file @
4c43f650
...
...
@@ -53,13 +53,17 @@ void VideoRtpSession::updateSDP(const Sdp &sdp)
{
string
desc
(
sdp
.
getIncomingVideoDescription
());
// if port has changed
if
(
desc
!=
rxArgs_
[
"receiving_sdp"
])
{
if
(
not
desc
.
empty
()
and
desc
!=
rxArgs_
[
"receiving_sdp"
])
{
rxArgs_
[
"receiving_sdp"
]
=
desc
;
DEBUG
(
"Updated incoming SDP to:
\n
%s"
,
rxArgs_
[
"receiving_sdp"
].
c_str
());
}
if
(
desc
.
find
(
"sendrecv"
)
!=
string
::
npos
)
{
if
(
desc
.
empty
())
{
DEBUG
(
"Video is inactive"
);
receiving_
=
false
;
sending_
=
false
;
}
else
if
(
desc
.
find
(
"sendrecv"
)
!=
string
::
npos
)
{
DEBUG
(
"Sending and receiving video"
);
receiving_
=
true
;
sending_
=
true
;
...
...
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