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
e2e591c7
Commit
e2e591c7
authored
Mar 03, 2017
by
Sarah Parker
Committed by
Thomas Davies
Mar 08, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compile warnings for ext-tx + ec-adapt
Change-Id: If45e46d6459cddecca3d11b64fc73ff26c291a13
parent
1511ea10
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
av1/encoder/bitstream.c
av1/encoder/bitstream.c
+4
-4
No files found.
av1/encoder/bitstream.c
View file @
e2e591c7
...
...
@@ -354,7 +354,7 @@ static void prob_diff_update(const aom_tree_index *tree,
}
#endif
#if CONFIG_EXT_INTER ||
CONFIG_EXT_TX ||
!CONFIG_EC_ADAPT
#if CONFIG_EXT_INTER || !CONFIG_EC_ADAPT
static
int
prob_diff_update_savings
(
const
aom_tree_index
*
tree
,
aom_prob
probs
[
/*n - 1*/
],
const
unsigned
int
counts
[
/*n - 1*/
],
int
n
,
...
...
@@ -372,7 +372,7 @@ static int prob_diff_update_savings(const aom_tree_index *tree,
}
return
savings
;
}
#endif // CONFIG_EXT_INTER ||
CONFIG_EXT_TX ||
!CONFIG_EC_ADAPT
#endif // CONFIG_EXT_INTER || !CONFIG_EC_ADAPT
#if CONFIG_VAR_TX
static
void
write_tx_size_vartx
(
const
AV1_COMMON
*
cm
,
const
MACROBLOCKD
*
xd
,
...
...
@@ -641,6 +641,7 @@ static void update_switchable_interp_probs(AV1_COMMON *cm, aom_writer *w,
}
#endif
#if !CONFIG_EC_ADAPT
#if CONFIG_EXT_TX
static
void
update_ext_tx_probs
(
AV1_COMMON
*
cm
,
aom_writer
*
w
)
{
const
int
savings_thresh
=
av1_cost_one
(
GROUP_DIFF_UPDATE_PROB
)
-
...
...
@@ -702,7 +703,6 @@ static void update_ext_tx_probs(AV1_COMMON *cm, aom_writer *w) {
}
#else
#if !CONFIG_EC_ADAPT
static
void
update_ext_tx_probs
(
AV1_COMMON
*
cm
,
aom_writer
*
w
)
{
const
int
savings_thresh
=
av1_cost_one
(
GROUP_DIFF_UPDATE_PROB
)
-
av1_cost_zero
(
GROUP_DIFF_UPDATE_PROB
);
...
...
@@ -748,7 +748,7 @@ static void update_ext_tx_probs(AV1_COMMON *cm, aom_writer *w) {
}
}
#endif // CONFIG_EXT_TX
#endif
#endif
// !CONFIG_EC_ADAPT
#if CONFIG_PALETTE
static
void
pack_palette_tokens
(
aom_writer
*
w
,
const
TOKENEXTRA
**
tp
,
int
n
,
int
num
)
{
...
...
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