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
d8cf4e97
Commit
d8cf4e97
authored
5 years ago
by
Pierre Lespagnol
Committed by
Sébastien Blin
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
conference: fix switch input for conference
Change-Id: I9a4dbce6a574da439a627f99cb60e5aa0926bc7c
parent
151e8412
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/media/video/video_input.cpp
+8
-0
8 additions, 0 deletions
src/media/video/video_input.cpp
src/media/video/video_input.h
+2
-0
2 additions, 0 deletions
src/media/video/video_input.h
src/media/video/video_mixer.cpp
+11
-1
11 additions, 1 deletion
src/media/video/video_mixer.cpp
with
21 additions
and
1 deletion
src/media/video/video_input.cpp
+
8
−
0
View file @
d8cf4e97
...
...
@@ -334,6 +334,14 @@ VideoInput::deleteDecoder()
decoder_
.
reset
();
}
void
VideoInput
::
stopInput
()
{
clearOptions
();
loop_
.
stop
();
}
void
VideoInput
::
clearOptions
()
{
decOpts_
=
{};
...
...
This diff is collapsed.
Click to expand it.
src/media/video/video_input.h
+
2
−
0
View file @
d8cf4e97
...
...
@@ -84,6 +84,8 @@ public:
*/
void
*
obtainFrame
(
int
length
);
void
releaseFrame
(
void
*
frame
);
#else
void
stopInput
();
#endif
private
:
...
...
This diff is collapsed.
Click to expand it.
src/media/video/video_mixer.cpp
+
11
−
1
View file @
d8cf4e97
...
...
@@ -91,10 +91,20 @@ VideoMixer::~VideoMixer()
void
VideoMixer
::
switchInput
(
const
std
::
string
&
input
)
{
// Detach videoInput from mixer
videoLocal_
->
detach
(
this
);
if
(
auto
local
=
videoLocal_
)
{
if
(
auto
localInput
=
std
::
dynamic_pointer_cast
<
VideoInput
>
(
local
))
if
(
auto
localInput
=
std
::
dynamic_pointer_cast
<
VideoInput
>
(
local
))
{
#if !VIDEO_CLIENT_INPUT
// Stop old VideoInput
localInput
->
stopInput
();
#endif
// Start new VideoInput
localInput
->
switchInput
(
input
);
}
}
// Re-attach videoInput to mixer
videoLocal_
->
attach
(
this
);
}
void
...
...
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