Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
1f5ce294
Commit
1f5ce294
authored
Nov 08, 2012
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
motionblur: use atomic variable instead of spin lock
parent
52ef3465
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
17 deletions
+7
-17
modules/video_filter/motionblur.c
modules/video_filter/motionblur.c
+7
-17
No files found.
modules/video_filter/motionblur.c
View file @
1f5ce294
...
@@ -34,6 +34,7 @@
...
@@ -34,6 +34,7 @@
#include <vlc_plugin.h>
#include <vlc_plugin.h>
#include <vlc_sout.h>
#include <vlc_sout.h>
#include <vlc_filter.h>
#include <vlc_filter.h>
#include <vlc_atomic.h>
#include "filter_picture.h"
#include "filter_picture.h"
/*****************************************************************************
/*****************************************************************************
...
@@ -80,9 +81,7 @@ struct filter_sys_t
...
@@ -80,9 +81,7 @@ struct filter_sys_t
{
{
picture_t
*
p_tmp
;
picture_t
*
p_tmp
;
bool
b_first
;
bool
b_first
;
atomic_int
i_factor
;
vlc_spinlock_t
lock
;
int
i_factor
;
};
};
/*****************************************************************************
/*****************************************************************************
...
@@ -110,9 +109,8 @@ static int Create( vlc_object_t *p_this )
...
@@ -110,9 +109,8 @@ static int Create( vlc_object_t *p_this )
config_ChainParse
(
p_filter
,
FILTER_PREFIX
,
ppsz_filter_options
,
config_ChainParse
(
p_filter
,
FILTER_PREFIX
,
ppsz_filter_options
,
p_filter
->
p_cfg
);
p_filter
->
p_cfg
);
p_filter
->
p_sys
->
i_factor
=
atomic_init
(
&
p_filter
->
p_sys
->
i_factor
,
var_CreateGetIntegerCommand
(
p_filter
,
FILTER_PREFIX
"factor"
);
var_CreateGetIntegerCommand
(
p_filter
,
FILTER_PREFIX
"factor"
)
);
vlc_spin_init
(
&
p_filter
->
p_sys
->
lock
);
var_AddCallback
(
p_filter
,
FILTER_PREFIX
"factor"
,
var_AddCallback
(
p_filter
,
FILTER_PREFIX
"factor"
,
MotionBlurCallback
,
p_filter
->
p_sys
);
MotionBlurCallback
,
p_filter
->
p_sys
);
...
@@ -129,7 +127,6 @@ static void Destroy( vlc_object_t *p_this )
...
@@ -129,7 +127,6 @@ static void Destroy( vlc_object_t *p_this )
var_DelCallback
(
p_filter
,
FILTER_PREFIX
"factor"
,
var_DelCallback
(
p_filter
,
FILTER_PREFIX
"factor"
,
MotionBlurCallback
,
p_filter
->
p_sys
);
MotionBlurCallback
,
p_filter
->
p_sys
);
vlc_spin_destroy
(
&
p_filter
->
p_sys
->
lock
);
picture_Release
(
p_filter
->
p_sys
->
p_tmp
);
picture_Release
(
p_filter
->
p_sys
->
p_tmp
);
free
(
p_filter
->
p_sys
);
free
(
p_filter
->
p_sys
);
...
@@ -173,9 +170,7 @@ static void RenderBlur( filter_sys_t *p_sys, picture_t *p_newpic,
...
@@ -173,9 +170,7 @@ static void RenderBlur( filter_sys_t *p_sys, picture_t *p_newpic,
picture_t
*
p_outpic
)
picture_t
*
p_outpic
)
{
{
int
i_plane
;
int
i_plane
;
vlc_spin_lock
(
&
p_sys
->
lock
);
const
int
i_oldfactor
=
atomic_load
(
&
p_sys
->
i_factor
);
const
int
i_oldfactor
=
p_sys
->
i_factor
;
vlc_spin_unlock
(
&
p_sys
->
lock
);
int
i_newfactor
=
128
-
i_oldfactor
;
int
i_newfactor
=
128
-
i_oldfactor
;
for
(
i_plane
=
0
;
i_plane
<
p_outpic
->
i_planes
;
i_plane
++
)
for
(
i_plane
=
0
;
i_plane
<
p_outpic
->
i_planes
;
i_plane
++
)
...
@@ -209,14 +204,9 @@ static int MotionBlurCallback( vlc_object_t *p_this, char const *psz_var,
...
@@ -209,14 +204,9 @@ static int MotionBlurCallback( vlc_object_t *p_this, char const *psz_var,
vlc_value_t
oldval
,
vlc_value_t
newval
,
vlc_value_t
oldval
,
vlc_value_t
newval
,
void
*
p_data
)
void
*
p_data
)
{
{
VLC_UNUSED
(
p_this
);
VLC_UNUSED
(
oldval
);
VLC_UNUSED
(
p_this
);
VLC_UNUSED
(
psz_var
);
VLC_UNUSED
(
oldval
);
filter_sys_t
*
p_sys
=
(
filter_sys_t
*
)
p_data
;
filter_sys_t
*
p_sys
=
(
filter_sys_t
*
)
p_data
;
if
(
!
strcmp
(
psz_var
,
FILTER_PREFIX
"factor"
)
)
atomic_store
(
&
p_sys
->
i_factor
,
VLC_CLIP
(
newval
.
i_int
,
1
,
127
)
);
{
vlc_spin_lock
(
&
p_sys
->
lock
);
p_sys
->
i_factor
=
VLC_CLIP
(
newval
.
i_int
,
1
,
127
);
vlc_spin_unlock
(
&
p_sys
->
lock
);
}
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
}
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