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
ef838c34
Commit
ef838c34
authored
Dec 16, 2013
by
Jingning Han
Committed by
Gerrit Code Review
Dec 16, 2013
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Remove redefinition in handle_inter_mode"
parents
9a005c99
84acc988
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
vp9/encoder/vp9_rdopt.c
vp9/encoder/vp9_rdopt.c
+2
-1
No files found.
vp9/encoder/vp9_rdopt.c
View file @
ef838c34
...
...
@@ -2748,6 +2748,7 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
intpel_mv
&=
(
mbmi
->
mv
[
1
].
as_mv
.
row
&
15
)
==
0
&&
(
mbmi
->
mv
[
1
].
as_mv
.
col
&
15
)
==
0
;
// Search for best switchable filter by checking the variance of
// pred error irrespective of whether the filter will be used
if
(
cm
->
mcomp_filter_type
!=
BILINEAR
)
{
...
...
@@ -2757,7 +2758,7 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
*
best_filter
=
EIGHTTAP
;
vp9_zero
(
cpi
->
rd_filter_cache
);
}
else
{
int
i
,
newbest
;
int
newbest
;
int
tmp_rate_sum
=
0
;
int64_t
tmp_dist_sum
=
0
;
...
...
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