Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jami-libclient
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
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-libclient
Commits
2cc4c967
Commit
2cc4c967
authored
5 years ago
by
Sébastien Blin
Committed by
Kateryna Kostiuk
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
video: only define currentAVFrame if needed
Change-Id: I85652e59a39097303fbfc414b7391a34dec019a6
parent
8e954827
Branches
Branches containing commit
No related tags found
Loading
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/api/newvideo.h
+4
-0
4 additions, 0 deletions
src/api/newvideo.h
src/newvideo.cpp
+2
-0
2 additions, 0 deletions
src/newvideo.cpp
src/shmrenderer.h
+0
-1
0 additions, 1 deletion
src/shmrenderer.h
src/video/renderer.h
+2
-0
2 additions, 0 deletions
src/video/renderer.h
with
8 additions
and
1 deletion
src/api/newvideo.h
+
4
−
0
View file @
2cc4c967
...
...
@@ -134,10 +134,14 @@ public:
* @return current rendered frame
*/
Frame
currentFrame
()
const
;
#if defined(ENABLE_LIBWRAP) || (defined __APPLE__)
/**
* @return current avframe
*/
std
::
unique_ptr
<
AVFrame
,
void
(
*
)(
AVFrame
*
)
>
currentAVFrame
()
const
;
#endif
/**
* @return current size
*/
...
...
This diff is collapsed.
Click to expand it.
src/newvideo.cpp
+
2
−
0
View file @
2cc4c967
...
...
@@ -156,11 +156,13 @@ Renderer::currentFrame() const
return
result
;
}
#if defined(ENABLE_LIBWRAP) || (defined __APPLE__)
std
::
unique_ptr
<
AVFrame
,
void
(
*
)(
AVFrame
*
)
>
Renderer
::
currentAVFrame
()
const
{
return
pimpl_
->
renderer
->
currentAVFrame
();
}
#endif
QSize
Renderer
::
size
()
const
...
...
This diff is collapsed.
Click to expand it.
src/shmrenderer.h
+
0
−
1
View file @
2cc4c967
...
...
@@ -59,7 +59,6 @@ public:
int
fps
()
const
;
virtual
Frame
currentFrame
()
const
override
;
virtual
ColorSpace
colorSpace
()
const
override
;
virtual
std
::
unique_ptr
<
AVFrame
,
void
(
*
)(
AVFrame
*
)
>
currentAVFrame
()
const
override
;
//Setters
void
setShmPath
(
const
QString
&
path
);
...
...
This diff is collapsed.
Click to expand it.
src/video/renderer.h
+
2
−
0
View file @
2cc4c967
...
...
@@ -99,7 +99,9 @@ public:
virtual
QSize
size
()
const
;
virtual
QMutex
*
mutex
()
const
;
virtual
ColorSpace
colorSpace
()
const
=
0
;
#if defined(ENABLE_LIBWRAP) || (defined __APPLE__)
virtual
std
::
unique_ptr
<
AVFrame
,
void
(
*
)(
AVFrame
*
)
>
currentAVFrame
()
const
=
0
;
#endif
void
setSize
(
const
QSize
&
size
)
const
;
Q_SIGNALS
:
...
...
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