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
1a5ac979
Commit
1a5ac979
authored
Nov 24, 2017
by
Sebastien Alaiwan
Browse files
Remove dead members and their computation
Change-Id: Ibe313aa31ea593d121a1b6078ef8f7849cb58092
parent
9f01e843
Changes
3
Hide whitespace changes
Inline
Side-by-side
av1/common/entropymode.c
View file @
1a5ac979
...
...
@@ -724,17 +724,6 @@ static const aom_cdf_prob default_drl_cdf[DRL_MODE_CONTEXTS][CDF_SIZE(2)] = {
{
AOM_CDF2
(
128
*
128
)
}
};
static
const
aom_prob
default_inter_compound_mode_probs
[
INTER_MODE_CONTEXTS
][
INTER_COMPOUND_MODES
-
1
]
=
{
{
154
,
167
,
233
,
165
,
143
,
170
,
167
},
// 0 = both zero mv
{
75
,
168
,
237
,
155
,
135
,
176
,
172
},
// 1 = 1 zero + 1 predicted
{
7
,
173
,
227
,
128
,
153
,
188
,
189
},
// 2 = two predicted mvs
{
8
,
120
,
214
,
113
,
154
,
178
,
174
},
// 3 = 1 pred/zero, 1 new
{
4
,
85
,
194
,
94
,
155
,
173
,
167
},
// 4 = two new mvs
{
23
,
89
,
180
,
73
,
157
,
151
,
155
},
// 5 = one intra neighbour
{
27
,
49
,
152
,
91
,
134
,
153
,
142
},
// 6 = two intra neighbours
};
static
const
aom_cdf_prob
default_inter_compound_mode_cdf
[
INTER_MODE_CONTEXTS
][
CDF_SIZE
(
INTER_COMPOUND_MODES
)]
=
{
...
...
@@ -747,22 +736,6 @@ static const aom_cdf_prob
{
AOM_CDF8
(
3456
,
9067
,
14069
,
16907
,
18817
,
21214
,
23139
)
}
};
static
const
aom_prob
default_compound_type_probs
[
BLOCK_SIZES_ALL
][
COMPOUND_TYPES
-
1
]
=
{
{
128
,
128
},
{
128
,
128
},
{
128
,
128
},
{
128
,
128
},
{
255
,
128
},
{
255
,
128
},
{
66
,
51
},
{
72
,
35
},
{
79
,
29
},
{
71
,
18
},
{
81
,
29
},
{
81
,
26
},
{
69
,
19
},
{
104
,
1
},
{
99
,
1
},
{
75
,
1
},
#if CONFIG_EXT_PARTITION
{
255
,
1
},
{
255
,
1
},
{
255
,
1
},
#endif // CONFIG_EXT_PARTITION
{
208
,
128
},
{
208
,
128
},
{
208
,
128
},
{
208
,
128
},
{
208
,
1
},
{
208
,
1
},
#if CONFIG_EXT_PARTITION
{
208
,
1
},
{
208
,
1
}
#endif // CONFIG_EXT_PARTITION
};
static
const
aom_cdf_prob
default_compound_type_cdf
[
BLOCK_SIZES_ALL
][
CDF_SIZE
(
COMPOUND_TYPES
)]
=
{
{
AOM_CDF3
(
16384
,
24576
)
},
{
AOM_CDF3
(
16384
,
24576
)
},
...
...
@@ -3028,9 +3001,7 @@ static void init_mode_probs(FRAME_CONTEXT *fc) {
av1_copy
(
fc
->
motion_mode_cdf
,
default_motion_mode_cdf
);
av1_copy
(
fc
->
obmc_prob
,
default_obmc_prob
);
av1_copy
(
fc
->
obmc_cdf
,
default_obmc_cdf
);
av1_copy
(
fc
->
inter_compound_mode_probs
,
default_inter_compound_mode_probs
);
av1_copy
(
fc
->
inter_compound_mode_cdf
,
default_inter_compound_mode_cdf
);
av1_copy
(
fc
->
compound_type_prob
,
default_compound_type_probs
);
av1_copy
(
fc
->
compound_type_cdf
,
default_compound_type_cdf
);
av1_copy
(
fc
->
interintra_prob
,
default_interintra_prob
);
av1_copy
(
fc
->
wedge_interintra_prob
,
default_wedge_interintra_prob
);
...
...
@@ -3130,10 +3101,6 @@ void av1_adapt_inter_frame_probs(AV1_COMMON *cm) {
fc
->
obmc_prob
[
i
]
=
av1_mode_mv_merge_probs
(
pre_fc
->
obmc_prob
[
i
],
counts
->
obmc
[
i
]);
for
(
i
=
0
;
i
<
INTER_MODE_CONTEXTS
;
i
++
)
aom_tree_merge_probs
(
av1_inter_compound_mode_tree
,
pre_fc
->
inter_compound_mode_probs
[
i
],
counts
->
inter_compound_mode
[
i
],
fc
->
inter_compound_mode_probs
[
i
]);
if
(
cm
->
allow_interintra_compound
)
{
for
(
i
=
0
;
i
<
BLOCK_SIZE_GROUPS
;
++
i
)
{
if
(
is_interintra_allowed_bsize_group
(
i
))
...
...
@@ -3152,14 +3119,6 @@ void av1_adapt_inter_frame_probs(AV1_COMMON *cm) {
}
}
if
(
cm
->
allow_masked_compound
)
{
for
(
i
=
0
;
i
<
BLOCK_SIZES_ALL
;
++
i
)
{
aom_tree_merge_probs
(
av1_compound_type_tree
,
pre_fc
->
compound_type_prob
[
i
],
counts
->
compound_interinter
[
i
],
fc
->
compound_type_prob
[
i
]);
}
}
#if CONFIG_JNT_COMP
for
(
i
=
0
;
i
<
COMP_INDEX_CONTEXTS
;
++
i
)
fc
->
compound_index_probs
[
i
]
=
av1_mode_mv_merge_probs
(
...
...
av1/common/entropymode.h
View file @
1a5ac979
...
...
@@ -189,11 +189,8 @@ typedef struct frame_contexts {
aom_cdf_prob
refmv_cdf
[
REFMV_MODE_CONTEXTS
][
CDF_SIZE
(
2
)];
aom_cdf_prob
drl_cdf
[
DRL_MODE_CONTEXTS
][
CDF_SIZE
(
2
)];
aom_prob
inter_compound_mode_probs
[
INTER_MODE_CONTEXTS
]
[
INTER_COMPOUND_MODES
-
1
];
aom_cdf_prob
inter_compound_mode_cdf
[
INTER_MODE_CONTEXTS
]
[
CDF_SIZE
(
INTER_COMPOUND_MODES
)];
aom_prob
compound_type_prob
[
BLOCK_SIZES_ALL
][
COMPOUND_TYPES
-
1
];
aom_cdf_prob
compound_type_cdf
[
BLOCK_SIZES_ALL
][
CDF_SIZE
(
COMPOUND_TYPES
)];
aom_prob
interintra_prob
[
BLOCK_SIZE_GROUPS
];
aom_prob
wedge_interintra_prob
[
BLOCK_SIZES_ALL
];
...
...
tools/aom_entropy_optimizer.c
View file @
1a5ac979
...
...
@@ -425,11 +425,6 @@ int main(int argc, const char **argv) {
/* New compound mode */
cts_each_dim
[
0
]
=
INTER_MODE_CONTEXTS
;
cts_each_dim
[
1
]
=
INTER_COMPOUND_MODES
;
optimize_entropy_table
(
&
fc
.
inter_compound_mode
[
0
][
0
],
probsfile
,
2
,
cts_each_dim
,
av1_inter_compound_mode_tree
,
0
,
"static const aom_prob default_inter_compound_mode_probs
\n
"
"[INTER_MODE_CONTEXTS][INTER_COMPOUND_MODES - 1]"
);
optimize_cdf_table
(
&
fc
.
inter_compound_mode
[
0
][
0
],
probsfile
,
2
,
cts_each_dim
,
"static const aom_cdf_prob
\n
"
"default_inter_compound_mode_cdf[INTER_MODE_CONTEXTS][CDF_"
...
...
@@ -470,10 +465,6 @@ int main(int argc, const char **argv) {
/* Compound type */
cts_each_dim
[
0
]
=
BLOCK_SIZES_ALL
;
cts_each_dim
[
1
]
=
COMPOUND_TYPES
;
optimize_entropy_table
(
&
fc
.
compound_interinter
[
0
][
0
],
probsfile
,
2
,
cts_each_dim
,
av1_compound_type_tree
,
0
,
"static const aom_prob default_compound_type_probs"
"[BLOCK_SIZES_ALL][COMPOUND_TYPES - 1]"
);
optimize_cdf_table
(
&
fc
.
compound_interinter
[
0
][
0
],
probsfile
,
2
,
cts_each_dim
,
"static const aom_cdf_prob
\n
"
...
...
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