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
6a2febe5
Commit
6a2febe5
authored
Oct 15, 2006
by
Antoine Cellerier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't use doubles when doing the rotation
parent
308d7c43
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
15 deletions
+20
-15
modules/video_filter/rotate.c
modules/video_filter/rotate.c
+20
-15
No files found.
modules/video_filter/rotate.c
View file @
6a2febe5
...
@@ -81,6 +81,9 @@ static const char *ppsz_filter_options[] = {
...
@@ -81,6 +81,9 @@ static const char *ppsz_filter_options[] = {
struct
filter_sys_t
struct
filter_sys_t
{
{
int
i_angle
;
int
i_angle
;
int
i_cos
;
int
i_sin
;
mtime_t
last_date
;
mtime_t
last_date
;
};
};
...
@@ -113,10 +116,10 @@ static int Create( vlc_object_t *p_this )
...
@@ -113,10 +116,10 @@ static int Create( vlc_object_t *p_this )
p_filter
->
p_sys
->
last_date
=
0
;
p_filter
->
p_sys
->
last_date
=
0
;
var_Create
(
p_filter
->
p_libvlc
,
"rotate_angle"
,
VLC_VAR_INTEGER
);
var_Create
(
p_filter
->
p_libvlc
,
"rotate_angle"
,
VLC_VAR_INTEGER
);
var_SetInteger
(
p_filter
->
p_libvlc
,
"rotate_angle"
,
p_filter
->
p_sys
->
i_angle
);
var_AddCallback
(
p_filter
->
p_libvlc
,
var_AddCallback
(
p_filter
->
p_libvlc
,
"rotate_angle"
,
RotateCallback
,
p_filter
->
p_sys
);
"rotate_angle"
,
RotateCallback
,
p_filter
->
p_sys
);
var_SetInteger
(
p_filter
->
p_libvlc
,
"rotate_angle"
,
p_filter
->
p_sys
->
i_angle
);
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
}
...
@@ -145,9 +148,9 @@ static void Destroy( vlc_object_t *p_this )
...
@@ -145,9 +148,9 @@ static void Destroy( vlc_object_t *p_this )
static
picture_t
*
Filter
(
filter_t
*
p_filter
,
picture_t
*
p_pic
)
static
picture_t
*
Filter
(
filter_t
*
p_filter
,
picture_t
*
p_pic
)
{
{
picture_t
*
p_outpic
;
picture_t
*
p_outpic
;
filter_sys_t
*
p_sys
=
p_filter
->
p_sys
;
int
i_index
;
int
i_index
;
double
f_angle
;
int
i_sin
=
p_sys
->
i_sin
,
i_cos
=
p_sys
->
i_cos
;
double
f_sin
,
f_cos
;
mtime_t
new_date
=
mdate
();
mtime_t
new_date
=
mdate
();
if
(
!
p_pic
)
return
NULL
;
if
(
!
p_pic
)
return
NULL
;
...
@@ -161,10 +164,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
...
@@ -161,10 +164,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
return
NULL
;
return
NULL
;
}
}
p_filter
->
p_sys
->
last_date
=
new_date
;
p_sys
->
last_date
=
new_date
;
f_angle
=
(((
double
)
p_filter
->
p_sys
->
i_angle
)
*
M_PI
)
/
180
.;
f_sin
=
sin
(
f_angle
);
f_cos
=
cos
(
f_angle
);
for
(
i_index
=
0
;
i_index
<
p_pic
->
i_planes
;
i_index
++
)
for
(
i_index
=
0
;
i_index
<
p_pic
->
i_planes
;
i_index
++
)
{
{
...
@@ -182,19 +182,18 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
...
@@ -182,19 +182,18 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
black_pixel
=
(
i_index
==
Y_PLANE
)
?
0x00
:
0x80
;
black_pixel
=
(
i_index
==
Y_PLANE
)
?
0x00
:
0x80
;
/* Ok, we do 3 times the sin() calculation for each line. So what ? */
for
(
i_line
=
0
;
i_line
<
i_num_lines
;
i_line
++
)
for
(
i_line
=
0
;
i_line
<
i_num_lines
;
i_line
++
)
{
{
for
(
i_col
=
0
;
i_col
<
i_num_cols
;
i_col
++
)
for
(
i_col
=
0
;
i_col
<
i_num_cols
;
i_col
++
)
{
{
int
i_line_orig
,
i_col_orig
;
int
i_line_orig
,
i_col_orig
;
i_line_orig
=
(
int
)(
f_cos
*
(
double
)
(
i_line
-
i_line_center
)
i_line_orig
=
(
(
i_cos
*
(
i_line
-
i_line_center
)
+
f_sin
*
(
double
)
(
i_col
-
i_col_center
)
+
i_sin
*
(
i_col
-
i_col_center
)
+
0
.
5
)
+
128
)
>>
8
)
+
i_line_center
;
+
i_line_center
;
i_col_orig
=
(
int
)(
-
f_sin
*
(
double
)
(
i_line
-
i_line_center
)
i_col_orig
=
(
(
-
i_sin
*
(
i_line
-
i_line_center
)
+
f_cos
*
(
double
)
(
i_col
-
i_col_center
)
+
i_cos
*
(
i_col
-
i_col_center
)
+
0
.
5
)
+
128
)
>>
8
)
+
i_col_center
;
+
i_col_center
;
if
(
0
<=
i_line_orig
&&
i_line_orig
<
i_num_lines
if
(
0
<=
i_line_orig
&&
i_line_orig
<
i_num_lines
...
@@ -232,7 +231,13 @@ static int RotateCallback( vlc_object_t *p_this, char const *psz_var,
...
@@ -232,7 +231,13 @@ static int RotateCallback( vlc_object_t *p_this, char const *psz_var,
if
(
!
strcmp
(
psz_var
,
"rotate_angle"
)
)
if
(
!
strcmp
(
psz_var
,
"rotate_angle"
)
)
{
{
double
f_angle
;
p_sys
->
i_angle
=
newval
.
i_int
;
p_sys
->
i_angle
=
newval
.
i_int
;
f_angle
=
(((
double
)
p_sys
->
i_angle
)
*
M_PI
)
/
180
.;
p_sys
->
i_sin
=
(
int
)(
sin
(
f_angle
)
*
256
.);
p_sys
->
i_cos
=
(
int
)(
cos
(
f_angle
)
*
256
.);
}
}
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