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
5cff77e3
Commit
5cff77e3
authored
13 years ago
by
Rafaël Carré
Browse files
Options
Downloads
Patches
Plain Diff
Fix crash on hold
parent
13dadfa2
Branches
Branches containing commit
Tags
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/AudioRtpFactory.cpp
+5
-12
5 additions, 12 deletions
daemon/src/audio/audiortp/AudioRtpFactory.cpp
with
5 additions
and
12 deletions
daemon/src/audio/audiortp/AudioRtpFactory.cpp
+
5
−
12
View file @
5cff77e3
...
...
@@ -52,7 +52,7 @@ AudioRtpFactory::AudioRtpFactory(SIPCall *ca) : _rtpSession (NULL), remoteContex
AudioRtpFactory
::~
AudioRtpFactory
()
{
stop
()
;
delete
_rtpSession
;
}
void
AudioRtpFactory
::
initAudioRtpConfig
()
...
...
@@ -86,8 +86,6 @@ void AudioRtpFactory::initAudioSymmetricRtpSession ()
{
ost
::
MutexLock
m
(
_audioRtpThreadMutex
);
_debug
(
"AudioRtpFactory: Srtp enable: %d "
,
_srtpEnabled
);
if
(
_srtpEnabled
)
{
std
::
string
zidFilename
(
Manager
::
instance
().
voipPreferences
.
getZidFile
());
...
...
@@ -99,7 +97,6 @@ void AudioRtpFactory::initAudioSymmetricRtpSession ()
// TODO: be careful with that. The hello hash is computed asynchronously. Maybe it's
// not even available at that point.
ca_
->
getLocalSDP
()
->
setZrtpHash
(
static_cast
<
AudioZrtpSession
*>
(
_rtpSession
)
->
getHelloHash
());
_debug
(
"AudioRtpFactory: Zrtp hello hash fed to SDP"
);
}
break
;
...
...
@@ -112,7 +109,6 @@ void AudioRtpFactory::initAudioSymmetricRtpSession ()
}
}
else
{
_rtpSession
=
new
AudioSymmetricRtpSession
(
ca_
);
_debug
(
"AudioRtpFactory: Starting a symmetric unencrypted rtp session"
);
}
}
...
...
@@ -151,8 +147,6 @@ void AudioRtpFactory::stop (void)
int
AudioRtpFactory
::
getSessionMedia
()
{
_info
(
"AudioRtpFactory: Update session media"
);
if
(
_rtpSession
==
NULL
)
{
throw
AudioRtpFactoryException
(
"AudioRtpFactory: Error: RTP session was null when trying to get session media type"
);
}
...
...
@@ -170,10 +164,8 @@ void AudioRtpFactory::updateSessionMedia (AudioCodec *audiocodec)
void
AudioRtpFactory
::
updateDestinationIpAddress
(
void
)
{
if
(
_rtpSession
==
NULL
)
{
throw
AudioRtpFactoryException
(
"AudioRtpFactory: Error: RtpSession was null when trying to update IP address"
);
}
_rtpSession
->
updateDestinationIpAddress
();
if
(
_rtpSession
)
_rtpSession
->
updateDestinationIpAddress
();
}
sfl
::
AudioZrtpSession
*
AudioRtpFactory
::
getAudioZrtpSession
()
...
...
@@ -205,7 +197,8 @@ void AudioRtpFactory::setRemoteCryptoInfo (sfl::SdesNegotiator& nego)
void
AudioRtpFactory
::
setDtmfPayloadType
(
unsigned
int
payloadType
)
{
_rtpSession
->
setDtmfPayloadType
(
payloadType
);
if
(
_rtpSession
)
_rtpSession
->
setDtmfPayloadType
(
payloadType
);
}
void
AudioRtpFactory
::
sendDtmfDigit
(
int
digit
)
...
...
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