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
8e1cae02
Commit
8e1cae02
authored
11 years ago
by
Tristan Matthews
Browse files
Options
Downloads
Patches
Plain Diff
* #30408: video: fix memory leak
VideoEncoder need not be allocated dynamically.
parent
fafcd55e
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
daemon/src/video/video_sender.cpp
+16
-13
16 additions, 13 deletions
daemon/src/video/video_sender.cpp
daemon/src/video/video_sender.h
+2
-1
2 additions, 1 deletion
daemon/src/video/video_sender.h
with
18 additions
and
14 deletions
daemon/src/video/video_sender.cpp
+
16
−
13
View file @
8e1cae02
...
@@ -56,16 +56,19 @@ VideoSender::VideoSender(const std::string &id,
...
@@ -56,16 +56,19 @@ VideoSender::VideoSender(const std::string &id,
,
sdp_
()
,
sdp_
()
{
setup
();
}
{
setup
();
}
VideoSender
::~
VideoSender
()
{
delete
muxContext_
;
}
bool
VideoSender
::
setup
()
bool
VideoSender
::
setup
()
{
{
const
char
*
enc_name
=
args_
[
"codec"
].
c_str
();
const
char
*
enc_name
=
args_
[
"codec"
].
c_str
();
videoEncoder_
=
new
VideoEncoder
();
/* Encoder setup */
/* Encoder setup */
if
(
!
args_
[
"width"
].
empty
())
{
if
(
!
args_
[
"width"
].
empty
())
{
const
char
*
s
=
args_
[
"width"
].
c_str
();
const
char
*
s
=
args_
[
"width"
].
c_str
();
videoEncoder_
->
setOption
(
"width"
,
s
);
videoEncoder_
.
setOption
(
"width"
,
s
);
}
else
{
}
else
{
ERROR
(
"width option not set"
);
ERROR
(
"width option not set"
);
return
false
;
return
false
;
...
@@ -73,39 +76,39 @@ bool VideoSender::setup()
...
@@ -73,39 +76,39 @@ bool VideoSender::setup()
if
(
!
args_
[
"height"
].
empty
())
{
if
(
!
args_
[
"height"
].
empty
())
{
const
char
*
s
=
args_
[
"height"
].
c_str
();
const
char
*
s
=
args_
[
"height"
].
c_str
();
videoEncoder_
->
setOption
(
"height"
,
s
);
videoEncoder_
.
setOption
(
"height"
,
s
);
}
else
{
}
else
{
ERROR
(
"height option not set"
);
ERROR
(
"height option not set"
);
return
false
;
return
false
;
}
}
videoEncoder_
->
setOption
(
"bitrate"
,
args_
[
"bitrate"
].
c_str
());
videoEncoder_
.
setOption
(
"bitrate"
,
args_
[
"bitrate"
].
c_str
());
if
(
!
args_
[
"framerate"
].
empty
())
if
(
!
args_
[
"framerate"
].
empty
())
videoEncoder_
->
setOption
(
"framerate"
,
args_
[
"framerate"
].
c_str
());
videoEncoder_
.
setOption
(
"framerate"
,
args_
[
"framerate"
].
c_str
());
if
(
!
args_
[
"parameters"
].
empty
())
if
(
!
args_
[
"parameters"
].
empty
())
videoEncoder_
->
setOption
(
"parameters"
,
args_
[
"parameters"
].
c_str
());
videoEncoder_
.
setOption
(
"parameters"
,
args_
[
"parameters"
].
c_str
());
if
(
!
args_
[
"payload_type"
].
empty
())
{
if
(
!
args_
[
"payload_type"
].
empty
())
{
DEBUG
(
"Writing stream header for payload type %s"
,
DEBUG
(
"Writing stream header for payload type %s"
,
args_
[
"payload_type"
].
c_str
());
args_
[
"payload_type"
].
c_str
());
videoEncoder_
->
setOption
(
"payload_type"
,
args_
[
"payload_type"
].
c_str
());
videoEncoder_
.
setOption
(
"payload_type"
,
args_
[
"payload_type"
].
c_str
());
}
}
if
(
videoEncoder_
->
openOutput
(
enc_name
,
"rtp"
,
args_
[
"destination"
].
c_str
(),
if
(
videoEncoder_
.
openOutput
(
enc_name
,
"rtp"
,
args_
[
"destination"
].
c_str
(),
NULL
))
{
NULL
))
{
ERROR
(
"encoder openOutput() failed"
);
ERROR
(
"encoder openOutput() failed"
);
return
false
;
return
false
;
}
}
videoEncoder_
->
setIOContext
(
muxContext_
);
videoEncoder_
.
setIOContext
(
muxContext_
);
if
(
videoEncoder_
->
startIO
())
{
if
(
videoEncoder_
.
startIO
())
{
ERROR
(
"encoder start failed"
);
ERROR
(
"encoder start failed"
);
return
false
;
return
false
;
}
}
videoEncoder_
->
print_sdp
(
sdp_
);
videoEncoder_
.
print_sdp
(
sdp_
);
return
true
;
return
true
;
}
}
...
@@ -116,7 +119,7 @@ void VideoSender::encodeAndSendVideo(VideoFrame& input_frame)
...
@@ -116,7 +119,7 @@ void VideoSender::encodeAndSendVideo(VideoFrame& input_frame)
if
(
is_keyframe
)
if
(
is_keyframe
)
atomic_decrement
(
&
forceKeyFrame_
);
atomic_decrement
(
&
forceKeyFrame_
);
if
(
videoEncoder_
->
encode
(
input_frame
,
is_keyframe
,
frameNumber_
++
)
<
0
)
if
(
videoEncoder_
.
encode
(
input_frame
,
is_keyframe
,
frameNumber_
++
)
<
0
)
ERROR
(
"encoding failed"
);
ERROR
(
"encoding failed"
);
}
}
...
...
This diff is collapsed.
Click to expand it.
daemon/src/video/video_sender.h
+
2
−
1
View file @
8e1cae02
...
@@ -50,6 +50,7 @@ public:
...
@@ -50,6 +50,7 @@ public:
VideoSender
(
const
std
::
string
&
id
,
VideoSender
(
const
std
::
string
&
id
,
const
std
::
map
<
std
::
string
,
std
::
string
>
&
args
,
const
std
::
map
<
std
::
string
,
std
::
string
>
&
args
,
SocketPair
&
socketPair
);
SocketPair
&
socketPair
);
virtual
~
VideoSender
();
std
::
string
getSDP
()
const
{
return
sdp_
;
}
std
::
string
getSDP
()
const
{
return
sdp_
;
}
void
forceKeyFrame
();
void
forceKeyFrame
();
...
@@ -66,7 +67,7 @@ private:
...
@@ -66,7 +67,7 @@ private:
std
::
map
<
std
::
string
,
std
::
string
>
args_
;
std
::
map
<
std
::
string
,
std
::
string
>
args_
;
const
std
::
string
&
id_
;
const
std
::
string
&
id_
;
VideoEncoder
*
videoEncoder_
;
VideoEncoder
videoEncoder_
;
int
forceKeyFrame_
;
int
forceKeyFrame_
;
int
frameNumber_
;
int
frameNumber_
;
...
...
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