Skip to content
GitLab
Menu
Projects
Groups
Snippets
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
9f01e843
Commit
9f01e843
authored
Nov 22, 2017
by
Sebastien Alaiwan
Browse files
Remove dead member: txfm_partition_prob
Change-Id: I4ad02b76df285526ba6c3b884e6a1335369ba2e9
parent
4d01de3d
Changes
3
Hide whitespace changes
Inline
Side-by-side
av1/common/entropymode.c
View file @
9f01e843
...
...
@@ -1462,14 +1462,6 @@ int av1_get_palette_color_index_context(const uint8_t *color_map, int stride,
#undef NUM_PALETTE_NEIGHBORS
#undef MAX_COLOR_CONTEXT_HASH
static
const
aom_prob
default_txfm_partition_probs
[
TXFM_PARTITION_CONTEXTS
]
=
{
#if CONFIG_TX64X64
249
,
240
,
223
,
249
,
229
,
177
,
250
,
243
,
208
,
226
,
187
,
145
,
236
,
204
,
150
,
183
,
149
,
125
,
181
,
146
,
113
,
128
#else
250
,
231
,
212
,
241
,
166
,
66
,
241
,
230
,
135
,
243
,
154
,
64
,
248
,
161
,
63
,
128
#endif // CONFIG_TX64X64
};
static
const
aom_cdf_prob
default_txfm_partition_cdf
[
TXFM_PARTITION_CONTEXTS
][
CDF_SIZE
(
2
)]
=
{
#if CONFIG_TX64X64
...
...
@@ -3023,7 +3015,6 @@ static void init_mode_probs(FRAME_CONTEXT *fc) {
av1_copy
(
fc
->
comp_bwdref_cdf
,
default_comp_bwdref_cdf
);
av1_copy
(
fc
->
single_ref_prob
,
default_single_ref_p
);
av1_copy
(
fc
->
single_ref_cdf
,
default_single_ref_cdf
);
av1_copy
(
fc
->
txfm_partition_prob
,
default_txfm_partition_probs
);
av1_copy
(
fc
->
txfm_partition_cdf
,
default_txfm_partition_cdf
);
#if CONFIG_JNT_COMP
av1_copy
(
fc
->
compound_index_cdf
,
default_compound_idx_cdfs
);
...
...
@@ -3182,12 +3173,6 @@ void av1_adapt_intra_frame_probs(AV1_COMMON *cm) {
const
FRAME_CONTEXT
*
pre_fc
=
cm
->
pre_fc
;
const
FRAME_COUNTS
*
counts
=
&
cm
->
counts
;
if
(
cm
->
tx_mode
==
TX_MODE_SELECT
)
{
for
(
i
=
0
;
i
<
TXFM_PARTITION_CONTEXTS
;
++
i
)
fc
->
txfm_partition_prob
[
i
]
=
av1_mode_mv_merge_probs
(
pre_fc
->
txfm_partition_prob
[
i
],
counts
->
txfm_partition
[
i
]);
}
if
(
cm
->
seg
.
temporal_update
)
{
for
(
i
=
0
;
i
<
PREDICTION_PROBS
;
i
++
)
fc
->
seg
.
pred_probs
[
i
]
=
av1_mode_mv_merge_probs
(
pre_fc
->
seg
.
pred_probs
[
i
],
...
...
av1/common/entropymode.h
View file @
9f01e843
...
...
@@ -239,7 +239,6 @@ typedef struct frame_contexts {
aom_prob
comp_bwdref_prob
[
REF_CONTEXTS
][
BWD_REFS
-
1
];
aom_cdf_prob
comp_ref_cdf
[
REF_CONTEXTS
][
FWD_REFS
-
1
][
CDF_SIZE
(
2
)];
aom_cdf_prob
comp_bwdref_cdf
[
REF_CONTEXTS
][
BWD_REFS
-
1
][
CDF_SIZE
(
2
)];
aom_prob
txfm_partition_prob
[
TXFM_PARTITION_CONTEXTS
];
aom_cdf_prob
txfm_partition_cdf
[
TXFM_PARTITION_CONTEXTS
][
CDF_SIZE
(
2
)];
#if CONFIG_JNT_COMP
aom_cdf_prob
compound_index_cdf
[
COMP_INDEX_CONTEXTS
][
CDF_SIZE
(
2
)];
...
...
tools/aom_entropy_optimizer.c
View file @
9f01e843
...
...
@@ -600,10 +600,6 @@ int main(int argc, const char **argv) {
#endif
cts_each_dim
[
0
]
=
TXFM_PARTITION_CONTEXTS
;
cts_each_dim
[
1
]
=
2
;
optimize_entropy_table
(
&
fc
.
txfm_partition
[
0
][
0
],
probsfile
,
2
,
cts_each_dim
,
NULL
,
1
,
"static const aom_prob "
"default_txfm_partition_probs[TXFM_PARTITION_CONTEXTS]"
);
optimize_cdf_table
(
&
fc
.
txfm_partition
[
0
][
0
],
probsfile
,
2
,
cts_each_dim
,
"static const aom_cdf_prob
\n
"
...
...
Write
Preview
Supports
Markdown
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