Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
adb28aaf
Commit
adb28aaf
authored
Apr 03, 2017
by
Sarah Parker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compiler errors with motion-var + ncobmc
Change-Id: Idae4934424b3e0c2de659e3f55ea6a47b5b4ceab
parent
9c1d2440
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
av1/common/reconinter.c
av1/common/reconinter.c
+2
-2
av1/encoder/encodeframe.c
av1/encoder/encodeframe.c
+1
-1
av1/encoder/rdopt.c
av1/encoder/rdopt.c
+1
-1
No files found.
av1/common/reconinter.c
View file @
adb28aaf
...
...
@@ -994,9 +994,9 @@ void build_inter_predictors(MACROBLOCKD *xd, int plane,
plane
,
#if CONFIG_GLOBAL_MOTION
is_global
[
ref
],
(
mi_x
>>
pd
->
subsampling_x
)
+
x
,
(
mi_y
>>
pd
->
subsampling_y
)
+
y
,
ref
(
mi_y
>>
pd
->
subsampling_y
)
+
y
,
ref
,
#endif // CONFIG_GLOBAL_MOTION
xd
);
xd
);
else
#endif // CONFIG_EXT_INTER
av1_make_inter_predictor
(
...
...
av1/encoder/encodeframe.c
View file @
adb28aaf
...
...
@@ -2432,7 +2432,7 @@ static void encode_b(const AV1_COMP *const cpi, const TileInfo *const tile,
#if CONFIG_GLOBAL_MOTION && SEPARATE_GLOBAL_MOTION
0
,
xd
->
global_motion
,
#endif // CONFIG_GLOBAL_MOTION && SEPARATE_GLOBAL_MOTION
mi
);
xd
->
mi
[
0
]
);
check_ncobmc
=
is_inter_block
(
mbmi
)
&&
motion_allowed
>=
OBMC_CAUSAL
;
if
(
!
dry_run
&&
check_ncobmc
)
{
av1_check_ncobmc_rd
(
cpi
,
x
,
mi_row
,
mi_col
);
...
...
av1/encoder/rdopt.c
View file @
adb28aaf
...
...
@@ -12803,7 +12803,7 @@ void av1_check_ncobmc_rd(const struct AV1_COMP *cpi, struct macroblock *x,
#if CONFIG_GLOBAL_MOTION && SEPARATE_GLOBAL_MOTION
0, cm->global_motion,
#endif // CONFIG_GLOBAL_MOTION && SEPARATE_GLOBAL_MOTION
mi
);
xd->mi[0]
);
av1_build_ncobmc_inter_predictors_sb(cm, xd, mi_row, mi_col);
av1_subtract_plane(x, bsize, 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