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
55d3577c
Commit
55d3577c
authored
10 years ago
by
Guillaume Roguez
Browse files
Options
Downloads
Patches
Plain Diff
sipcall: remove unneeded memory pool
Refs #62797 Change-Id: Iad49c0b44038dce012422e641d4bd8f881a97dfc
parent
d149220b
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
daemon/src/sip/sipcall.cpp
+1
-8
1 addition, 8 deletions
daemon/src/sip/sipcall.cpp
daemon/src/sip/sipcall.h
+0
-14
0 additions, 14 deletions
daemon/src/sip/sipcall.h
with
1 addition
and
22 deletions
daemon/src/sip/sipcall.cpp
+
1
−
8
View file @
55d3577c
...
@@ -70,8 +70,6 @@ getSettings()
...
@@ -70,8 +70,6 @@ getSettings()
}
}
#endif
#endif
static
const
int
INITIAL_SIZE
=
16384
;
static
const
int
INCREMENT_SIZE
=
INITIAL_SIZE
;
static
constexpr
int
DEFAULT_ICE_INIT_TIMEOUT
{
10
};
// seconds
static
constexpr
int
DEFAULT_ICE_INIT_TIMEOUT
{
10
};
// seconds
static
constexpr
int
DEFAULT_ICE_NEGO_TIMEOUT
{
60
};
// seconds
static
constexpr
int
DEFAULT_ICE_NEGO_TIMEOUT
{
60
};
// seconds
...
@@ -134,11 +132,8 @@ SIPCall::SIPCall(SIPAccountBase& account, const std::string& id, Call::CallType
...
@@ -134,11 +132,8 @@ SIPCall::SIPCall(SIPAccountBase& account, const std::string& id, Call::CallType
// The ID is used to associate video streams to calls
// The ID is used to associate video streams to calls
,
videortp_
(
id
,
getSettings
())
,
videortp_
(
id
,
getSettings
())
#endif
#endif
,
pool_
(
pj_pool_create
(
&
getSIPVoIPLink
()
->
getCachingPool
()
->
factory
,
id
.
c_str
(),
INITIAL_SIZE
,
INCREMENT_SIZE
,
NULL
))
,
sdp_
(
new
Sdp
(
id
))
,
sdp_
(
new
Sdp
(
id
))
{
{}
}
SIPCall
::~
SIPCall
()
SIPCall
::~
SIPCall
()
{
{
...
@@ -150,8 +145,6 @@ SIPCall::~SIPCall()
...
@@ -150,8 +145,6 @@ SIPCall::~SIPCall()
SFL_WARN
(
"Call was not properly removed from invite callbacks"
);
SFL_WARN
(
"Call was not properly removed from invite callbacks"
);
inv
->
mod_data
[
mod_ua_id
]
=
nullptr
;
inv
->
mod_data
[
mod_ua_id
]
=
nullptr
;
}
}
pj_pool_release
(
pool_
);
}
}
void
void
...
...
This diff is collapsed.
Click to expand it.
daemon/src/sip/sipcall.h
+
0
−
14
View file @
55d3577c
...
@@ -53,8 +53,6 @@
...
@@ -53,8 +53,6 @@
#include
<memory>
#include
<memory>
struct
pjsip_evsub
;
struct
pjsip_evsub
;
struct
pj_caching_pool
;
struct
pj_pool_t
;
struct
pjsip_inv_session
;
struct
pjsip_inv_session
;
class
Sdp
;
class
Sdp
;
...
@@ -122,13 +120,6 @@ class SIPCall : public Call
...
@@ -122,13 +120,6 @@ class SIPCall : public Call
}
}
#endif
#endif
/**
* Return the local memory pool for this call
*/
pj_pool_t
*
getMemoryPool
()
{
return
pool_
;
}
/**
/**
* The invite session to be reused in case of transfer
* The invite session to be reused in case of transfer
*/
*/
...
@@ -243,11 +234,6 @@ class SIPCall : public Call
...
@@ -243,11 +234,6 @@ class SIPCall : public Call
*/
*/
std
::
shared_ptr
<
SipTransport
>
transport_
{};
std
::
shared_ptr
<
SipTransport
>
transport_
{};
/**
* The pool to allocate memory, released once call hang up
*/
pj_pool_t
*
pool_
;
/**
/**
* The SDP session
* The SDP session
*/
*/
...
...
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