Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
f3af752f
Commit
f3af752f
authored
12 years ago
by
Tristan Matthews
Browse files
Options
Downloads
Patches
Plain Diff
* #9832: AudioRtpFactory: cleanup logging
parent
eec9ac2b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
daemon/src/audio/audiortp/audio_rtp_factory.cpp
+5
-7
5 additions, 7 deletions
daemon/src/audio/audiortp/audio_rtp_factory.cpp
with
5 additions
and
7 deletions
daemon/src/audio/audiortp/audio_rtp_factory.cpp
+
5
−
7
View file @
f3af752f
...
...
@@ -28,8 +28,6 @@
* as that of the covered work.
*/
#include
"audio_rtp_factory.h"
#include
"audio_zrtp_session.h"
#include
"audio_srtp_session.h"
...
...
@@ -112,13 +110,13 @@ void AudioRtpFactory::initSession()
void
AudioRtpFactory
::
start
(
AudioCodec
*
audiocodec
)
{
if
(
rtpSession_
==
NULL
)
throw
AudioRtpFactoryException
(
"
AudioRtpFactory: Error:
RTP session was null when trying to start audio thread"
);
throw
AudioRtpFactoryException
(
"RTP session was null when trying to start audio thread"
);
if
(
keyExchangeProtocol_
==
SDES
and
cachedLocalContext_
and
cachedRemoteContext_
)
static_cast
<
AudioSrtpSession
*>
(
rtpSession_
)
->
restoreCryptoContext
(
cachedLocalContext_
,
cachedRemoteContext_
);
if
(
rtpSession_
->
startRtpThread
(
*
audiocodec
)
!=
0
)
throw
AudioRtpFactoryException
(
"
AudioRtpFactory: Error:
Failed to start AudioRtpSession thread"
);
throw
AudioRtpFactoryException
(
"Failed to start AudioRtpSession thread"
);
}
void
AudioRtpFactory
::
stop
()
...
...
@@ -132,7 +130,7 @@ void AudioRtpFactory::stop()
int
AudioRtpFactory
::
getSessionMedia
()
{
if
(
rtpSession_
==
NULL
)
throw
AudioRtpFactoryException
(
"
AudioRtpFactory: Error:
RTP session was null when trying to get session media type"
);
throw
AudioRtpFactoryException
(
"RTP session was null when trying to get session media type"
);
return
rtpSession_
->
getCodecPayloadType
();
}
...
...
@@ -140,7 +138,7 @@ int AudioRtpFactory::getSessionMedia()
void
AudioRtpFactory
::
updateSessionMedia
(
AudioCodec
*
audiocodec
)
{
if
(
rtpSession_
==
NULL
)
throw
AudioRtpFactoryException
(
"
AudioRtpFactory: Error:
rtpSession_ was
null
when trying to update IP address"
);
throw
AudioRtpFactoryException
(
"rtpSession_ was
NULL
when trying to update IP address"
);
rtpSession_
->
updateSessionMedia
(
*
audiocodec
);
}
...
...
@@ -156,7 +154,7 @@ sfl::AudioZrtpSession * AudioRtpFactory::getAudioZrtpSession()
if
(
keyExchangeProtocol_
==
ZRTP
)
return
static_cast
<
AudioZrtpSession
*>
(
rtpSession_
);
else
throw
AudioRtpFactoryException
(
"
RTP: Error:
rtpSession_ is NULL in getAudioZrtpSession"
);
throw
AudioRtpFactoryException
(
"rtpSession_ is NULL in getAudioZrtpSession"
);
}
void
sfl
::
AudioRtpFactory
::
initLocalCryptoInfo
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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