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
a9bbabd9
Commit
a9bbabd9
authored
Jul 23, 2013
by
Dmitry Kovalev
Committed by
Gerrit Code Review
Jul 23, 2013
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Removing vp9_is_interpolating_filter array."
parents
719cd35f
db7f5d28
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
6 deletions
+1
-6
vp9/common/vp9_entropymode.c
vp9/common/vp9_entropymode.c
+0
-3
vp9/common/vp9_entropymode.h
vp9/common/vp9_entropymode.h
+0
-1
vp9/encoder/vp9_rdopt.c
vp9/encoder/vp9_rdopt.c
+1
-2
No files found.
vp9/common/vp9_entropymode.c
View file @
a9bbabd9
...
...
@@ -347,9 +347,6 @@ const INTERPOLATIONFILTERTYPE vp9_switchable_interp[VP9_SWITCHABLE_FILTERS] = {
EIGHTTAP
,
EIGHTTAP_SMOOTH
,
EIGHTTAP_SHARP
};
const
int
vp9_switchable_interp_map
[
SWITCHABLE
+
1
]
=
{
1
,
0
,
2
,
-
1
,
-
1
};
// Indicates if the filter is interpolating or non-interpolating
const
int
vp9_is_interpolating_filter
[
SWITCHABLE
+
1
]
=
{
1
,
1
,
1
,
1
,
-
1
};
void
vp9_entropy_mode_init
()
{
vp9_tokens_from_tree
(
vp9_intra_mode_encodings
,
vp9_intra_mode_tree
);
vp9_tokens_from_tree
(
vp9_switchable_interp_encodings
,
...
...
vp9/common/vp9_entropymode.h
View file @
a9bbabd9
...
...
@@ -53,7 +53,6 @@ extern const INTERPOLATIONFILTERTYPE vp9_switchable_interp
[
VP9_SWITCHABLE_FILTERS
];
extern
const
int
vp9_switchable_interp_map
[
SWITCHABLE
+
1
];
extern
const
int
vp9_is_interpolating_filter
[
SWITCHABLE
+
1
];
extern
const
vp9_tree_index
vp9_switchable_interp_tree
[
2
*
(
VP9_SWITCHABLE_FILTERS
-
1
)];
...
...
vp9/encoder/vp9_rdopt.c
View file @
a9bbabd9
...
...
@@ -2900,8 +2900,7 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
int
j
;
int64_t
rs_rd
;
const
INTERPOLATIONFILTERTYPE
filter
=
vp9_switchable_interp
[
i
];
const
int
is_intpel_interp
=
intpel_mv
&&
vp9_is_interpolating_filter
[
filter
];
const
int
is_intpel_interp
=
intpel_mv
;
mbmi
->
interp_filter
=
filter
;
vp9_setup_interp_filters
(
xd
,
mbmi
->
interp_filter
,
cm
);
rs
=
get_switchable_rate
(
cm
,
x
);
...
...
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