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
db095d26
Commit
db095d26
authored
1 year ago
by
Kateryna Kostiuk
Committed by
Adrien Béraud
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
media: fix crash on finishing call
GitLab:
#925
Change-Id: I40a861b18ce075522e702edf4b60f12631a89fca
parent
ef8a40c9
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
src/media/media_recorder.cpp
+12
-4
12 additions, 4 deletions
src/media/media_recorder.cpp
with
12 additions
and
4 deletions
src/media/media_recorder.cpp
+
12
−
4
View file @
db095d26
...
...
@@ -688,13 +688,17 @@ MediaRecorder::flush()
if
(
videoFilter_
)
{
std
::
lock_guard
<
std
::
mutex
>
lk
(
mutexFilterVideo_
);
videoFilter_
->
flush
();
outputVideoFilter_
->
flush
();
if
(
outputVideoFilter_
)
{
outputVideoFilter_
->
flush
();
}
}
if
(
audioFilter_
)
{
std
::
lock_guard
<
std
::
mutex
>
lk
(
mutexFilterAudio_
);
audioFilter_
->
flush
();
outputAudioFilter_
->
flush
();
if
(
outputAudioFilter_
)
{
outputAudioFilter_
->
flush
();
}
}
if
(
encoder_
)
encoder_
->
flush
();
...
...
@@ -713,12 +717,16 @@ MediaRecorder::reset()
{
std
::
lock_guard
<
std
::
mutex
>
lk2
(
mutexFilterVideo_
);
videoFilter_
.
reset
();
outputVideoFilter_
.
reset
();
if
(
outputVideoFilter_
)
{
outputVideoFilter_
.
reset
();
}
}
{
std
::
lock_guard
<
std
::
mutex
>
lk2
(
mutexFilterAudio_
);
audioFilter_
.
reset
();
outputAudioFilter_
.
reset
();
if
(
outputAudioFilter_
)
{
outputAudioFilter_
.
reset
();
}
}
}
encoder_
.
reset
();
...
...
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