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
b2efc99d
Commit
b2efc99d
authored
5 years ago
by
Yang Wang
Committed by
Andreas Traczyk
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
avmodel: expose useAVframe, currentAVFrame on non-DBus platforms
Change-Id: Ia2714fb137b41566c653dbb1ec18e7b65e325084
parent
9033db9d
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
src/api/newvideo.h
+1
-1
1 addition, 1 deletion
src/api/newvideo.h
src/newvideo.cpp
+1
-1
1 addition, 1 deletion
src/newvideo.cpp
src/video/renderer.h
+1
-1
1 addition, 1 deletion
src/video/renderer.h
with
3 additions
and
3 deletions
src/api/newvideo.h
+
1
−
1
View file @
b2efc99d
...
...
@@ -136,7 +136,7 @@ public:
*/
Frame
currentFrame
()
const
;
#if defined(ENABLE_LIBWRAP)
|| (defined __APPLE__)
#if defined(ENABLE_LIBWRAP)
/**
* @return current avframe
*/
...
...
This diff is collapsed.
Click to expand it.
src/newvideo.cpp
+
1
−
1
View file @
b2efc99d
...
...
@@ -163,7 +163,7 @@ Renderer::currentFrame() const
return
result
;
}
#if defined(ENABLE_LIBWRAP)
|| (defined __APPLE__)
#if defined(ENABLE_LIBWRAP)
std
::
unique_ptr
<
AVFrame
,
void
(
*
)(
AVFrame
*
)
>
Renderer
::
currentAVFrame
()
const
{
...
...
This diff is collapsed.
Click to expand it.
src/video/renderer.h
+
1
−
1
View file @
b2efc99d
...
...
@@ -98,7 +98,7 @@ public:
virtual
QSize
size
()
const
;
virtual
QMutex
*
mutex
()
const
;
virtual
ColorSpace
colorSpace
()
const
=
0
;
#if defined(ENABLE_LIBWRAP)
|| (defined __APPLE__)
#if defined(ENABLE_LIBWRAP)
virtual
std
::
unique_ptr
<
AVFrame
,
void
(
*
)(
AVFrame
*
)
>
currentAVFrame
()
const
=
0
;
#endif
void
setSize
(
const
QSize
&
size
)
const
;
...
...
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