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
d85d94da
Commit
d85d94da
authored
May 24, 2017
by
Alex Converse
Browse files
Remove unused sadcost redirection pointers
Change-Id: Ib94d57b24d3276dd74abe151f740258d78ff430b
parent
723923ca
Changes
5
Hide whitespace changes
Inline
Side-by-side
av1/encoder/block.h
View file @
d85d94da
...
...
@@ -142,12 +142,10 @@ struct macroblock {
int
*
nmvcost
[
NMV_CONTEXTS
][
2
];
int
*
nmvcost_hp
[
NMV_CONTEXTS
][
2
];
int
**
mv_cost_stack
[
NMV_CONTEXTS
];
int
*
nmvjointsadcost
;
int
**
mvcost
;
int
*
nmvsadcost
[
2
];
int
*
nmvsadcost_hp
[
2
];
int
**
mvsadcost
;
#if CONFIG_MOTION_VAR
int32_t
*
wsrc_buf
;
int32_t
*
mask_buf
;
...
...
av1/encoder/encoder.c
View file @
d85d94da
...
...
@@ -250,13 +250,11 @@ void av1_set_high_precision_mv(AV1_COMP *cpi, int allow_high_precision_mv) {
int
i
;
for
(
i
=
0
;
i
<
NMV_CONTEXTS
;
++
i
)
{
mb
->
mv_cost_stack
[
i
]
=
mb
->
nmvcost_hp
[
i
];
mb
->
mvsadcost
=
mb
->
nmvsadcost_hp
;
}
}
else
{
int
i
;
for
(
i
=
0
;
i
<
NMV_CONTEXTS
;
++
i
)
{
mb
->
mv_cost_stack
[
i
]
=
mb
->
nmvcost
[
i
];
mb
->
mvsadcost
=
mb
->
nmvsadcost
;
}
}
}
...
...
av1/encoder/mcomp.c
View file @
d85d94da
...
...
@@ -110,7 +110,7 @@ static int mvsad_err_cost(const MACROBLOCK *x, const MV *mv, const MV *ref,
int
sad_per_bit
)
{
const
MV
diff
=
{
(
mv
->
row
-
ref
->
row
)
*
8
,
(
mv
->
col
-
ref
->
col
)
*
8
};
return
ROUND_POWER_OF_TWO
(
(
unsigned
)
mv_cost
(
&
diff
,
x
->
nmvjoint
sad
cost
,
x
->
mv
sad
cost
)
*
sad_per_bit
,
(
unsigned
)
mv_cost
(
&
diff
,
x
->
nmvjointcost
,
x
->
mvcost
)
*
sad_per_bit
,
AV1_PROB_COST_SHIFT
);
}
...
...
av1/encoder/rd.c
View file @
d85d94da
...
...
@@ -339,8 +339,6 @@ void av1_set_mvcost(MACROBLOCK *x, MV_REFERENCE_FRAME ref_frame, int ref,
(
void
)
ref_frame
;
x
->
mvcost
=
x
->
mv_cost_stack
[
nmv_ctx
];
x
->
nmvjointcost
=
x
->
nmv_vec_cost
[
nmv_ctx
];
x
->
mvsadcost
=
x
->
mvcost
;
x
->
nmvjointsadcost
=
x
->
nmvjointcost
;
}
void
av1_initialize_rd_consts
(
AV1_COMP
*
cpi
)
{
...
...
@@ -368,8 +366,6 @@ void av1_initialize_rd_consts(AV1_COMP *cpi) {
}
x
->
mvcost
=
x
->
mv_cost_stack
[
0
];
x
->
nmvjointcost
=
x
->
nmv_vec_cost
[
0
];
x
->
mvsadcost
=
x
->
mvcost
;
x
->
nmvjointsadcost
=
x
->
nmvjointcost
;
if
(
cpi
->
oxcf
.
pass
!=
1
)
{
av1_fill_token_costs
(
x
->
token_costs
,
cm
->
fc
->
coef_probs
);
...
...
av1/encoder/temporal_filter.c
View file @
d85d94da
...
...
@@ -283,10 +283,8 @@ static int temporal_filter_find_matching_mb_c(AV1_COMP *cpi,
x
->
mvcost
=
x
->
mv_cost_stack
[
0
];
x
->
nmvjointcost
=
x
->
nmv_vec_cost
[
0
];
x
->
mvsadcost
=
x
->
mvcost
;
x
->
nmvjointsadcost
=
x
->
nmvjointcost
;
//
Ignor
e mv costing
by sending NULL pointer instead of cost arrays
//
Us
e mv costing
from x->mvcost directly
av1_hex_search
(
x
,
&
best_ref_mv1_full
,
step_param
,
sadpb
,
1
,
cond_cost_list
(
cpi
,
cost_list
),
&
cpi
->
fn_ptr
[
BLOCK_16X16
],
0
,
&
best_ref_mv1
);
...
...
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