Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
5c844690
Commit
5c844690
authored
Jun 21, 2017
by
Frederic Barbier
Committed by
Frédéric BARBIER
Jun 21, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simplify code based on explicit assertion
Change-Id: I7ba542592b3856f23984c6d6cd0dd8627843cf23
parent
2a19c9e3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
16 deletions
+5
-16
av1/common/warped_motion.c
av1/common/warped_motion.c
+5
-16
No files found.
av1/common/warped_motion.c
View file @
5c844690
...
...
@@ -1762,23 +1762,12 @@ static int find_affine_int(int np, int *pts1, int *pts2, BLOCK_SIZE bsize,
int
find_projection
(
int
np
,
int
*
pts1
,
int
*
pts2
,
BLOCK_SIZE
bsize
,
int
mvy
,
int
mvx
,
WarpedMotionParams
*
wm_params
,
int
mi_row
,
int
mi_col
)
{
int
result
=
1
;
switch
(
wm_params
->
wmtype
)
{
case
AFFINE
:
result
=
find_affine_int
(
np
,
pts1
,
pts2
,
bsize
,
mvy
,
mvx
,
wm_params
,
mi_row
,
mi_col
);
break
;
default:
assert
(
0
&&
"Invalid warped motion type!"
);
return
1
;
}
assert
(
wm_params
->
wmtype
==
AFFINE
);
const
int
result
=
find_affine_int
(
np
,
pts1
,
pts2
,
bsize
,
mvy
,
mvx
,
wm_params
,
mi_row
,
mi_col
);
if
(
result
==
0
)
{
if
(
wm_params
->
wmtype
==
ROTZOOM
)
{
wm_params
->
wmmat
[
5
]
=
wm_params
->
wmmat
[
2
];
wm_params
->
wmmat
[
4
]
=
-
wm_params
->
wmmat
[
3
];
}
if
(
wm_params
->
wmtype
==
AFFINE
||
wm_params
->
wmtype
==
ROTZOOM
)
{
// check compatibility with the fast warp filter
if
(
!
get_shear_params
(
wm_params
))
return
1
;
}
// check compatibility with the fast warp filter
if
(
!
get_shear_params
(
wm_params
))
return
1
;
}
return
result
;
...
...
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