Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
aom-rav1e
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xiph.Org
aom-rav1e
Commits
e8007169
Commit
e8007169
authored
Jul 19, 2017
by
Angie Chiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pass conv_param to av1_make_masked_inter_predictor
Change-Id: Ifdf75f61f0c0cc2f95545f79439bae2accbe7b01
parent
043c227b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
13 deletions
+15
-13
av1/common/reconinter.c
av1/common/reconinter.c
+14
-12
av1/common/reconinter.h
av1/common/reconinter.h
+1
-1
No files found.
av1/common/reconinter.c
View file @
e8007169
...
...
@@ -702,7 +702,7 @@ void av1_make_masked_inter_predictor(const uint8_t *pre, int pre_stride,
uint8_t
*
dst
,
int
dst_stride
,
const
int
subpel_x
,
const
int
subpel_y
,
const
struct
scale_factors
*
sf
,
int
w
,
int
h
,
int
h
,
ConvolveParams
*
conv_params
,
#if CONFIG_DUAL_FILTER
const
InterpFilter
*
interp_filter
,
#else
...
...
@@ -731,10 +731,6 @@ void av1_make_masked_inter_predictor(const uint8_t *pre, int pre_stride,
#endif // CONFIG_COMPOUND_SEGMENT
mi
->
mbmi
.
interinter_compound_type
};
#if !CONFIG_GLOBAL_MOTION && !CONFIG_WARPED_MOTION
int
ref
=
0
;
#endif // !CONFIG_GLOBAL_MOTION && !CONFIG_WARPED_MOTION
ConvolveParams
conv_params
=
get_conv_params
(
ref
,
0
,
plane
);
#if CONFIG_HIGHBITDEPTH
DECLARE_ALIGNED
(
16
,
uint8_t
,
tmp_dst_
[
2
*
MAX_SB_SQUARE
]);
...
...
@@ -742,7 +738,7 @@ void av1_make_masked_inter_predictor(const uint8_t *pre, int pre_stride,
?
CONVERT_TO_BYTEPTR
(
tmp_dst_
)
:
tmp_dst_
;
av1_make_inter_predictor
(
pre
,
pre_stride
,
tmp_dst
,
MAX_SB_SIZE
,
subpel_x
,
subpel_y
,
sf
,
w
,
h
,
&
conv_params
,
interp_filter
,
subpel_y
,
sf
,
w
,
h
,
conv_params
,
interp_filter
,
#if CONFIG_GLOBAL_MOTION || CONFIG_WARPED_MOTION
warp_types
,
p_col
,
p_row
,
plane
,
ref
,
#endif // CONFIG_GLOBAL_MOTION || CONFIG_WARPED_MOTION
...
...
@@ -785,7 +781,7 @@ void av1_make_masked_inter_predictor(const uint8_t *pre, int pre_stride,
#else // CONFIG_HIGHBITDEPTH
DECLARE_ALIGNED
(
16
,
uint8_t
,
tmp_dst
[
MAX_SB_SQUARE
]);
av1_make_inter_predictor
(
pre
,
pre_stride
,
tmp_dst
,
MAX_SB_SIZE
,
subpel_x
,
subpel_y
,
sf
,
w
,
h
,
&
conv_params
,
interp_filter
,
subpel_y
,
sf
,
w
,
h
,
conv_params
,
interp_filter
,
#if CONFIG_GLOBAL_MOTION || CONFIG_WARPED_MOTION
warp_types
,
p_col
,
p_row
,
plane
,
ref
,
#endif // CONFIG_GLOBAL_MOTION || CONFIG_WARPED_MOTION
...
...
@@ -1025,7 +1021,6 @@ void build_inter_predictors(const AV1_COMMON *cm, MACROBLOCKD *xd, int plane,
uint8_t
*
pre
;
int
xs
,
ys
,
subpel_x
,
subpel_y
;
const
int
is_scaled
=
av1_is_scaled
(
sf
);
ConvolveParams
conv_params
=
get_conv_params
(
ref
,
ref
,
plane
);
#if CONFIG_GLOBAL_MOTION || CONFIG_WARPED_MOTION
WarpTypesAllowed
warp_types
;
#if CONFIG_GLOBAL_MOTION
...
...
@@ -1081,11 +1076,16 @@ void build_inter_predictors(const AV1_COMMON *cm, MACROBLOCKD *xd, int plane,
(
x
+
(
mv_q4
.
col
>>
SUBPEL_BITS
));
}
ConvolveParams
conv_params
=
get_conv_params
(
ref
,
ref
,
plane
);
#if CONFIG_EXT_INTER
if
(
is_masked_compound_type
(
mi
->
mbmi
.
interinter_compound_type
))
{
// masked compound type has its own average mechanism
conv_params
=
get_conv_params
(
ref
,
0
,
plane
);
}
if
(
ref
&&
is_masked_compound_type
(
mi
->
mbmi
.
interinter_compound_type
))
av1_make_masked_inter_predictor
(
pre
,
pre_buf
->
stride
,
dst
,
dst_buf
->
stride
,
subpel_x
,
subpel_y
,
sf
,
w
,
h
,
mi
->
mbmi
.
interp_filter
,
xs
,
ys
,
sf
,
w
,
h
,
&
conv_params
,
mi
->
mbmi
.
interp_filter
,
xs
,
ys
,
#if CONFIG_SUPERTX
wedge_offset_x
,
wedge_offset_y
,
#endif // CONFIG_SUPERTX
...
...
@@ -1242,14 +1242,16 @@ void build_inter_predictors(const AV1_COMMON *cm, MACROBLOCKD *xd, int plane,
conv_params
.
ref
=
ref
;
conv_params
.
do_average
=
ref
;
#if CONFIG_EXT_INTER
if
(
is_masked_compound_type
(
mi
->
mbmi
.
interinter_compound_type
))
conv_params
=
get_conv_params
(
ref
,
ref
,
plane
);
if
(
is_masked_compound_type
(
mi
->
mbmi
.
interinter_compound_type
))
{
// masked compound type has its own average mechanism
conv_params
=
get_conv_params
(
ref
,
0
,
plane
);
}
if
(
ref
&&
is_masked_compound_type
(
mi
->
mbmi
.
interinter_compound_type
))
av1_make_masked_inter_predictor
(
pre
[
ref
],
pre_buf
->
stride
,
dst
,
dst_buf
->
stride
,
subpel_params
[
ref
].
subpel_x
,
subpel_params
[
ref
].
subpel_y
,
sf
,
w
,
h
,
mi
->
mbmi
.
interp_filter
,
subpel_params
[
ref
].
xs
,
&
conv_params
,
mi
->
mbmi
.
interp_filter
,
subpel_params
[
ref
].
xs
,
subpel_params
[
ref
].
ys
,
#if CONFIG_SUPERTX
wedge_offset_x
,
wedge_offset_y
,
...
...
av1/common/reconinter.h
View file @
e8007169
...
...
@@ -490,7 +490,7 @@ void av1_make_masked_inter_predictor(const uint8_t *pre, int pre_stride,
uint8_t
*
dst
,
int
dst_stride
,
const
int
subpel_x
,
const
int
subpel_y
,
const
struct
scale_factors
*
sf
,
int
w
,
int
h
,
int
h
,
ConvolveParams
*
conv_params
,
#if CONFIG_DUAL_FILTER
const
InterpFilter
*
interp_filter
,
#else
...
...
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