Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
149587ec
Commit
149587ec
authored
15 years ago
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replaced vout_display_t::get by ::pool.
parent
7c18ac73
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
12 deletions
+18
-12
include/vlc_vout_display.h
include/vlc_vout_display.h
+8
-5
include/vlc_vout_wrapper.h
include/vlc_vout_wrapper.h
+3
-3
src/video_output/display.c
src/video_output/display.c
+5
-2
src/video_output/display.h
src/video_output/display.h
+2
-2
No files found.
include/vlc_vout_display.h
View file @
149587ec
...
...
@@ -31,6 +31,7 @@
#include <vlc_es.h>
#include <vlc_picture.h>
#include <vlc_picture_pool.h>
#include <vlc_subpicture.h>
#include <vlc_keys.h>
#include <vlc_mouse.h>
...
...
@@ -265,14 +266,16 @@ struct vout_display_t {
*/
vout_display_info_t
info
;
/* Return a
new picture_t
(mandatory).
/* Return a
pointer over the current picture_pool_t*
(mandatory).
*
* For performance reasons, it is best to provide at least count
* pictures but it is not mandatory.
* You can return NULL when you cannot/do not want to allocate
*
more
pictures.
*
If you want to create a pool of reusable pictures, you
can
*
use a picture_pool_t
.
* pictures.
*
The vout display module keeps the ownership of the pool and
can
*
destroy it only when closing or on invalid pictures control
.
*/
picture_
t
*
(
*
get
)(
vout_display_t
*
);
picture_
pool_t
*
(
*
pool
)(
vout_display_t
*
,
unsigned
count
);
/* Prepare a picture for display (optional).
*
...
...
This diff is collapsed.
Click to expand it.
include/vlc_vout_wrapper.h
View file @
149587ec
...
...
@@ -30,11 +30,11 @@
/* XXX DO NOT use it outside the vout module wrapper XXX */
/**
* It retreive
a picture
from the display
* It retreive
s a picture pool
from the display
*/
static
inline
picture_
t
*
vout_display_Get
(
vout_display_t
*
vd
)
static
inline
picture_
pool_t
*
vout_display_Pool
(
vout_display_t
*
vd
,
unsigned
count
)
{
return
vd
->
get
(
vd
);
return
vd
->
pool
(
vd
,
count
);
}
/**
...
...
This diff is collapsed.
Click to expand it.
src/video_output/display.c
View file @
149587ec
...
...
@@ -58,7 +58,10 @@ static picture_t *VideoBufferNew(filter_t *filter)
vd
->
fmt
.
i_width
==
fmt
->
i_width
&&
vd
->
fmt
.
i_height
==
fmt
->
i_height
);
return
vout_display_Get
(
vd
);
picture_pool_t
*
pool
=
vout_display_Pool
(
vd
,
1
);
if
(
!
pool
)
return
NULL
;
return
picture_pool_Get
(
pool
);
}
static
void
VideoBufferDelete
(
filter_t
*
filter
,
picture_t
*
picture
)
{
...
...
@@ -112,7 +115,7 @@ static vout_display_t *vout_display_New(vlc_object_t *obj,
vd
->
info
.
has_pictures_invalid
=
false
;
vd
->
cfg
=
cfg
;
vd
->
get
=
NULL
;
vd
->
pool
=
NULL
;
vd
->
prepare
=
NULL
;
vd
->
display
=
NULL
;
vd
->
control
=
NULL
;
...
...
This diff is collapsed.
Click to expand it.
src/video_output/display.h
View file @
149587ec
...
...
@@ -34,9 +34,9 @@
/**
* It retreive a picture from the display
*/
static inline picture_
t *vout_display_Get(vout_display_t *vd
)
static inline picture_
pool_t *vout_display_Pool(vout_display_t *vd, unsigned count
)
{
return vd->
get(vd
);
return vd->
pool(vd, count
);
}
/**
...
...
This diff is collapsed.
Click to expand it.
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