Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
1ec433df
Commit
1ec433df
authored
Sep 23, 2017
by
Jingning Han
Browse files
Fix compiler errors in ext-inter / wedge
Change-Id: I88e425c55b61629430078e11b5b94bac164d027e
parent
6f3c898f
Changes
2
Hide whitespace changes
Inline
Side-by-side
av1/encoder/encodeframe.c
View file @
1ec433df
...
...
@@ -1887,6 +1887,7 @@ static void update_stats(const AV1_COMMON *const cm, ThreadData *td, int mi_row,
&& mbmi->motion_mode == SIMPLE_TRANSLATION
#endif // CONFIG_MOTION_VAR || CONFIG_WARPED_MOTION
) {
#if CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT
#if CONFIG_WEDGE && CONFIG_COMPOUND_SEGMENT
if (is_interinter_compound_used(COMPOUND_WEDGE, bsize)) {
#endif
...
...
@@ -1897,6 +1898,7 @@ static void update_stats(const AV1_COMMON *const cm, ThreadData *td, int mi_row,
#if CONFIG_WEDGE && CONFIG_COMPOUND_SEGMENT
}
#endif
#endif // CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT
}
#endif // CONFIG_EXT_INTER
}
...
...
av1/encoder/rd.c
View file @
1ec433df
...
...
@@ -296,9 +296,11 @@ void av1_fill_mode_rates(AV1_COMMON *const cm, MACROBLOCK *x,
for
(
i
=
0
;
i
<
INTER_MODE_CONTEXTS
;
++
i
)
av1_cost_tokens_from_cdf
(
x
->
inter_compound_mode_cost
[
i
],
fc
->
inter_compound_mode_cdf
[
i
],
NULL
);
#if CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT
for
(
i
=
0
;
i
<
BLOCK_SIZES_ALL
;
++
i
)
av1_cost_tokens_from_cdf
(
x
->
compound_type_cost
[
i
],
fc
->
compound_type_cdf
[
i
],
NULL
);
#endif // CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT
#if CONFIG_COMPOUND_SINGLEREF
for
(
i
=
0
;
i
<
INTER_MODE_CONTEXTS
;
++
i
)
av1_cost_tokens_from_cdf
(
x
->
inter_singleref_comp_mode_cost
[
i
],
...
...
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