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
Open sidebar
Xiph.Org
aom-rav1e
Commits
6c48b8c8
Commit
6c48b8c8
authored
Nov 17, 2016
by
Yaowu Xu
Browse files
Add a define to fix compiling without daala-ec
BUG=aomedia:88 Change-Id: I216ae046bed89f1dc919fc9ebb5c191d491ba621
parent
52a17635
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
av1/encoder/subexp.c
av1/encoder/subexp.c
+4
-2
No files found.
av1/encoder/subexp.c
View file @
6c48b8c8
...
...
@@ -200,12 +200,13 @@ int av1_prob_update_search_subframe(unsigned int ct[][2], aom_prob oldp,
aom_prob
*
bestp
,
aom_prob
upd
,
int
n
)
{
const
int
old_b
=
get_cost
(
ct
,
oldp
,
n
);
int
bestsavings
=
0
;
const
int
upd_cost
=
av1_cost_one
(
upd
)
-
av1_cost_zero
(
upd
);
aom_prob
newp
,
bestnewp
=
oldp
;
const
int
step
=
*
bestp
>
oldp
?
-
1
:
1
;
for
(
newp
=
*
bestp
;
newp
!=
oldp
;
newp
+=
step
)
{
const
int
new_b
=
get_cost
(
ct
,
newp
,
n
);
const
int
update_b
=
prob_diff_update_cost
(
newp
,
oldp
)
+
av1
_cost
_upd256
;
const
int
update_b
=
prob_diff_update_cost
(
newp
,
oldp
)
+
upd
_cost
;
const
int
savings
=
old_b
-
new_b
-
update_b
;
if
(
savings
>
bestsavings
)
{
bestsavings
=
savings
;
...
...
@@ -224,6 +225,7 @@ int av1_prob_update_search_model_subframe(unsigned int ct[ENTROPY_NODES]
int
newp
;
const
int
step_sign
=
*
bestp
>
oldp
[
PIVOT_NODE
]
?
-
1
:
1
;
const
int
step
=
stepsize
*
step_sign
;
const
int
upd_cost
=
av1_cost_one
(
upd
)
-
av1_cost_zero
(
upd
);
aom_prob
bestnewp
,
newplist
[
ENTROPY_NODES
],
oldplist
[
ENTROPY_NODES
];
av1_model_to_full_probs
(
oldp
,
oldplist
);
memcpy
(
newplist
,
oldp
,
sizeof
(
aom_prob
)
*
UNCONSTRAINED_NODES
);
...
...
@@ -243,7 +245,7 @@ int av1_prob_update_search_model_subframe(unsigned int ct[ENTROPY_NODES]
for
(
i
=
UNCONSTRAINED_NODES
,
new_b
=
0
;
i
<
ENTROPY_NODES
;
++
i
)
new_b
+=
get_cost
(
ct
[
i
],
newplist
[
i
],
n
);
new_b
+=
get_cost
(
ct
[
PIVOT_NODE
],
newplist
[
PIVOT_NODE
],
n
);
update_b
=
prob_diff_update_cost
(
newp
,
oldp
[
PIVOT_NODE
])
+
av1
_cost
_upd256
;
update_b
=
prob_diff_update_cost
(
newp
,
oldp
[
PIVOT_NODE
])
+
upd
_cost
;
savings
=
old_b
-
new_b
-
update_b
;
if
(
savings
>
bestsavings
)
{
bestsavings
=
savings
;
...
...
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