Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
2c50a3d1
Commit
2c50a3d1
authored
May 28, 2011
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Extended vout_display_opengl_GetPool() to take the number of requested pictures.
The parameter is not yet used.
parent
9b678604
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
7 additions
and
12 deletions
+7
-12
modules/video_output/gl.c
modules/video_output/gl.c
+1
-2
modules/video_output/ios.m
modules/video_output/ios.m
+1
-2
modules/video_output/macosx.m
modules/video_output/macosx.m
+1
-2
modules/video_output/msw/glwin32.c
modules/video_output/msw/glwin32.c
+1
-2
modules/video_output/opengl.c
modules/video_output/opengl.c
+1
-1
modules/video_output/opengl.h
modules/video_output/opengl.h
+1
-1
modules/video_output/xcb/glx.c
modules/video_output/xcb/glx.c
+1
-2
No files found.
modules/video_output/gl.c
View file @
2c50a3d1
...
@@ -182,8 +182,7 @@ static picture_pool_t *Pool (vout_display_t *vd, unsigned count)
...
@@ -182,8 +182,7 @@ static picture_pool_t *Pool (vout_display_t *vd, unsigned count)
vout_display_sys_t
*
sys
=
vd
->
sys
;
vout_display_sys_t
*
sys
=
vd
->
sys
;
if
(
!
sys
->
pool
)
if
(
!
sys
->
pool
)
sys
->
pool
=
vout_display_opengl_GetPool
(
sys
->
vgl
);
sys
->
pool
=
vout_display_opengl_GetPool
(
sys
->
vgl
,
count
);
(
void
)
count
;
return
sys
->
pool
;
return
sys
->
pool
;
}
}
...
...
modules/video_output/ios.m
View file @
2c50a3d1
...
@@ -210,10 +210,9 @@ void Close(vlc_object_t *this)
...
@@ -210,10 +210,9 @@ void Close(vlc_object_t *this)
static
picture_pool_t
*
Pool
(
vout_display_t
*
vd
,
unsigned
requested_count
)
static
picture_pool_t
*
Pool
(
vout_display_t
*
vd
,
unsigned
requested_count
)
{
{
vout_display_sys_t
*
sys
=
vd
->
sys
;
vout_display_sys_t
*
sys
=
vd
->
sys
;
VLC_UNUSED
(
requested_count
);
if
(
!
sys
->
pool
)
if
(
!
sys
->
pool
)
sys
->
pool
=
vout_display_opengl_GetPool
(
sys
->
vgl
);
sys
->
pool
=
vout_display_opengl_GetPool
(
sys
->
vgl
,
requested_count
);
assert
(
sys
->
pool
);
assert
(
sys
->
pool
);
return
sys
->
pool
;
return
sys
->
pool
;
}
}
...
...
modules/video_output/macosx.m
View file @
2c50a3d1
...
@@ -255,10 +255,9 @@ void Close(vlc_object_t *this)
...
@@ -255,10 +255,9 @@ void Close(vlc_object_t *this)
static
picture_pool_t
*
Pool
(
vout_display_t
*
vd
,
unsigned
requested_count
)
static
picture_pool_t
*
Pool
(
vout_display_t
*
vd
,
unsigned
requested_count
)
{
{
vout_display_sys_t
*
sys
=
vd
->
sys
;
vout_display_sys_t
*
sys
=
vd
->
sys
;
VLC_UNUSED
(
requested_count
);
if
(
!
sys
->
pool
)
if
(
!
sys
->
pool
)
sys
->
pool
=
vout_display_opengl_GetPool
(
sys
->
vgl
);
sys
->
pool
=
vout_display_opengl_GetPool
(
sys
->
vgl
,
requested_count
);
assert
(
sys
->
pool
);
assert
(
sys
->
pool
);
return
sys
->
pool
;
return
sys
->
pool
;
}
}
...
...
modules/video_output/msw/glwin32.c
View file @
2c50a3d1
...
@@ -170,10 +170,9 @@ static void Close(vlc_object_t *object)
...
@@ -170,10 +170,9 @@ static void Close(vlc_object_t *object)
static
picture_pool_t
*
Pool
(
vout_display_t
*
vd
,
unsigned
count
)
static
picture_pool_t
*
Pool
(
vout_display_t
*
vd
,
unsigned
count
)
{
{
vout_display_sys_t
*
sys
=
vd
->
sys
;
vout_display_sys_t
*
sys
=
vd
->
sys
;
VLC_UNUSED
(
count
);
if
(
!
sys
->
pool
)
if
(
!
sys
->
pool
)
sys
->
pool
=
vout_display_opengl_GetPool
(
sys
->
vgl
);
sys
->
pool
=
vout_display_opengl_GetPool
(
sys
->
vgl
,
count
);
return
sys
->
pool
;
return
sys
->
pool
;
}
}
...
...
modules/video_output/opengl.c
View file @
2c50a3d1
...
@@ -330,7 +330,7 @@ static void PictureUnlock(picture_t *picture)
...
@@ -330,7 +330,7 @@ static void PictureUnlock(picture_t *picture)
}
}
#endif
#endif
picture_pool_t
*
vout_display_opengl_GetPool
(
vout_display_opengl_t
*
vgl
)
picture_pool_t
*
vout_display_opengl_GetPool
(
vout_display_opengl_t
*
vgl
,
unsigned
requested_count
)
{
{
if
(
vgl
->
pool
)
if
(
vgl
->
pool
)
return
vgl
->
pool
;
return
vgl
->
pool
;
...
...
modules/video_output/opengl.h
View file @
2c50a3d1
...
@@ -58,7 +58,7 @@ typedef struct vout_display_opengl_t vout_display_opengl_t;
...
@@ -58,7 +58,7 @@ typedef struct vout_display_opengl_t vout_display_opengl_t;
vout_display_opengl_t
*
vout_display_opengl_New
(
video_format_t
*
fmt
,
vlc_gl_t
*
gl
);
vout_display_opengl_t
*
vout_display_opengl_New
(
video_format_t
*
fmt
,
vlc_gl_t
*
gl
);
void
vout_display_opengl_Delete
(
vout_display_opengl_t
*
vgl
);
void
vout_display_opengl_Delete
(
vout_display_opengl_t
*
vgl
);
picture_pool_t
*
vout_display_opengl_GetPool
(
vout_display_opengl_t
*
vgl
);
picture_pool_t
*
vout_display_opengl_GetPool
(
vout_display_opengl_t
*
vgl
,
unsigned
);
int
vout_display_opengl_Prepare
(
vout_display_opengl_t
*
vgl
,
int
vout_display_opengl_Prepare
(
vout_display_opengl_t
*
vgl
,
picture_t
*
picture
);
picture_t
*
picture
);
...
...
modules/video_output/xcb/glx.c
View file @
2c50a3d1
...
@@ -458,10 +458,9 @@ static void *GetProcAddress (vlc_gl_t *gl, const char *name)
...
@@ -458,10 +458,9 @@ static void *GetProcAddress (vlc_gl_t *gl, const char *name)
static
picture_pool_t
*
Pool
(
vout_display_t
*
vd
,
unsigned
requested_count
)
static
picture_pool_t
*
Pool
(
vout_display_t
*
vd
,
unsigned
requested_count
)
{
{
vout_display_sys_t
*
sys
=
vd
->
sys
;
vout_display_sys_t
*
sys
=
vd
->
sys
;
(
void
)
requested_count
;
if
(
!
sys
->
pool
)
if
(
!
sys
->
pool
)
sys
->
pool
=
vout_display_opengl_GetPool
(
sys
->
vgl
);
sys
->
pool
=
vout_display_opengl_GetPool
(
sys
->
vgl
,
requested_count
);
return
sys
->
pool
;
return
sys
->
pool
;
}
}
...
...
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