Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
4aebf1d3
Commit
4aebf1d3
authored
Apr 20, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(src/components/camera/Camera): coding style
parent
906ec740
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
Camera.cpp
linphone-desktop/src/components/camera/Camera.cpp
+7
-7
No files found.
linphone-desktop/src/components/camera/Camera.cpp
View file @
4aebf1d3
...
...
@@ -51,16 +51,16 @@ CameraRenderer::CameraRenderer () {
CameraRenderer
::~
CameraRenderer
()
{
qInfo
()
<<
QStringLiteral
(
"Delete context info:"
)
<<
mContextInfo
;
CoreManager
*
core
=
CoreManager
::
getInstance
();
CoreManager
*
core
Manager
=
CoreManager
::
getInstance
();
core
->
lockVideoRender
();
core
Manager
->
lockVideoRender
();
if
(
mIsPreview
)
CoreManager
::
getInstance
()
->
getCore
()
->
setNativePreviewWindowId
(
nullptr
);
coreManager
->
getCore
()
->
setNativePreviewWindowId
(
nullptr
);
else
if
(
mLinphoneCall
)
mLinphoneCall
->
setNativeVideoWindowId
(
nullptr
);
core
->
unlockVideoRender
();
core
Manager
->
unlockVideoRender
();
delete
mContextInfo
;
}
...
...
@@ -71,10 +71,10 @@ QOpenGLFramebufferObject *CameraRenderer::createFramebufferObject (const QSize &
format
.
setInternalTextureFormat
(
GL_RGBA8
);
format
.
setSamples
(
4
);
CoreManager
*
core
=
CoreManager
::
getInstance
();
CoreManager
*
core
Manager
=
CoreManager
::
getInstance
();
// It's not the same thread as render.
core
->
lockVideoRender
();
core
Manager
->
lockVideoRender
();
mContextInfo
->
width
=
size
.
width
();
mContextInfo
->
height
=
size
.
height
();
...
...
@@ -83,7 +83,7 @@ QOpenGLFramebufferObject *CameraRenderer::createFramebufferObject (const QSize &
updateWindowId
();
core
->
unlockVideoRender
();
core
Manager
->
unlockVideoRender
();
return
new
QOpenGLFramebufferObject
(
size
,
format
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment