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
7958946b
Commit
7958946b
authored
Jun 25, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
picture_pool: remove no longer used ticks
parent
a102fb45
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
8 deletions
+0
-8
src/misc/picture_pool.c
src/misc/picture_pool.c
+0
-8
No files found.
src/misc/picture_pool.c
View file @
7958946b
...
@@ -42,11 +42,9 @@ struct picture_gc_sys_t {
...
@@ -42,11 +42,9 @@ struct picture_gc_sys_t {
picture_pool_t
*
pool
;
picture_pool_t
*
pool
;
picture_t
*
picture
;
picture_t
*
picture
;
bool
in_use
;
bool
in_use
;
uint64_t
tick
;
};
};
struct
picture_pool_t
{
struct
picture_pool_t
{
uint64_t
tick
;
int
(
*
pic_lock
)(
picture_t
*
);
int
(
*
pic_lock
)(
picture_t
*
);
void
(
*
pic_unlock
)(
picture_t
*
);
void
(
*
pic_unlock
)(
picture_t
*
);
vlc_mutex_t
lock
;
vlc_mutex_t
lock
;
...
@@ -108,7 +106,6 @@ static picture_t *picture_pool_ClonePicture(picture_pool_t *pool,
...
@@ -108,7 +106,6 @@ static picture_t *picture_pool_ClonePicture(picture_pool_t *pool,
sys
->
pool
=
pool
;
sys
->
pool
=
pool
;
sys
->
picture
=
picture
;
sys
->
picture
=
picture
;
sys
->
in_use
=
false
;
sys
->
in_use
=
false
;
sys
->
tick
=
0
;
picture_resource_t
res
=
{
picture_resource_t
res
=
{
.
p_sys
=
picture
->
p_sys
,
.
p_sys
=
picture
->
p_sys
,
...
@@ -137,7 +134,6 @@ picture_pool_t *picture_pool_NewExtended(const picture_pool_configuration_t *cfg
...
@@ -137,7 +134,6 @@ picture_pool_t *picture_pool_NewExtended(const picture_pool_configuration_t *cfg
if
(
unlikely
(
pool
==
NULL
))
if
(
unlikely
(
pool
==
NULL
))
return
NULL
;
return
NULL
;
pool
->
tick
=
1
;
pool
->
pic_lock
=
cfg
->
lock
;
pool
->
pic_lock
=
cfg
->
lock
;
pool
->
pic_unlock
=
cfg
->
unlock
;
pool
->
pic_unlock
=
cfg
->
unlock
;
vlc_mutex_init
(
&
pool
->
lock
);
vlc_mutex_init
(
&
pool
->
lock
);
...
@@ -223,13 +219,11 @@ picture_t *picture_pool_Get(picture_pool_t *pool)
...
@@ -223,13 +219,11 @@ picture_t *picture_pool_Get(picture_pool_t *pool)
picture_t
*
picture
=
pool
->
picture
[
i
];
picture_t
*
picture
=
pool
->
picture
[
i
];
picture_priv_t
*
priv
=
(
picture_priv_t
*
)
picture
;
picture_priv_t
*
priv
=
(
picture_priv_t
*
)
picture
;
picture_gc_sys_t
*
sys
=
priv
->
gc
.
opaque
;
picture_gc_sys_t
*
sys
=
priv
->
gc
.
opaque
;
uint64_t
tick
;
if
(
sys
->
in_use
)
if
(
sys
->
in_use
)
continue
;
continue
;
pool
->
refs
++
;
pool
->
refs
++
;
tick
=
++
pool
->
tick
;
sys
->
in_use
=
true
;
sys
->
in_use
=
true
;
vlc_mutex_unlock
(
&
pool
->
lock
);
vlc_mutex_unlock
(
&
pool
->
lock
);
...
@@ -240,8 +234,6 @@ picture_t *picture_pool_Get(picture_pool_t *pool)
...
@@ -240,8 +234,6 @@ picture_t *picture_pool_Get(picture_pool_t *pool)
continue
;
continue
;
}
}
sys
->
tick
=
tick
;
assert
(
atomic_load
(
&
((
picture_priv_t
*
)
picture
)
->
gc
.
refs
)
==
0
);
assert
(
atomic_load
(
&
((
picture_priv_t
*
)
picture
)
->
gc
.
refs
)
==
0
);
atomic_init
(
&
((
picture_priv_t
*
)
picture
)
->
gc
.
refs
,
1
);
atomic_init
(
&
((
picture_priv_t
*
)
picture
)
->
gc
.
refs
,
1
);
picture
->
p_next
=
NULL
;
picture
->
p_next
=
NULL
;
...
...
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