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
dad5e42c
Commit
dad5e42c
authored
2 years ago
by
Aline Gondim Santos
Committed by
Sébastien Blin
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
swarmcalls: avoid grayscale video in macos
Change-Id: I5283d3a0459e031baa7eb0b1d481333aa683c79b
parent
bbf8cca2
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitignore
+1
-0
1 addition, 0 deletions
.gitignore
contrib/.gitignore
+1
-0
1 addition, 0 deletions
contrib/.gitignore
src/media/video/video_mixer.cpp
+14
-0
14 additions, 0 deletions
src/media/video/video_mixer.cpp
with
16 additions
and
0 deletions
.gitignore
+
1
−
0
View file @
dad5e42c
...
...
@@ -104,6 +104,7 @@ tools/.vscode/
# Mac
.DS_Store
build-macos*
# Android
/build-android-*/
...
...
This diff is collapsed.
Click to expand it.
contrib/.gitignore
+
1
−
0
View file @
dad5e42c
...
...
@@ -5,3 +5,4 @@ x86_64-*
arm*
aarch64*
i686*
apple*
This diff is collapsed.
Click to expand it.
src/media/video/video_mixer.cpp
+
14
−
0
View file @
dad5e42c
...
...
@@ -469,6 +469,15 @@ VideoMixer::calc_position(std::unique_ptr<VideoMixerSource>& source,
}
else
{
cell_width
=
width_
/
zoom
;
cell_height
=
height_
/
zoom
;
if
(
n
==
1
)
{
// On some platforms (at least macOS/android) - Having one frame at the same
// size of the mixer cause it to be grey.
// Removing some pixels solve this. We use 16 because it's a multiple of 8
// (value that we prefer for video management)
cell_width
-=
16
;
cell_height
-=
16
;
}
}
if
(
currentLayout_
==
Layout
::
ONE_BIG_WITH_SMALL
)
{
if
(
index
==
0
)
{
...
...
@@ -487,6 +496,11 @@ VideoMixer::calc_position(std::unique_ptr<VideoMixerSource>& source,
cellW_off
+=
(
width_
-
(
n
%
zoom
)
*
cell_width
)
/
2
;
}
cellH_off
=
(
index
/
zoom
)
*
cell_height
;
if
(
n
==
1
)
{
// Centerize (cellwidth = width_ - 16)
cellW_off
+=
8
;
cellH_off
+=
8
;
}
}
// Compute frame size/position
...
...
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