Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
bc958f66
Commit
bc958f66
authored
Nov 24, 2017
by
Sebastien Alaiwan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove dead member: interintra_mode_prob
Change-Id: I424ff643e6f46216934c96fa9d34a27c46b3e7f2
parent
ea691058
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
19 deletions
+0
-19
av1/common/entropymode.c
av1/common/entropymode.c
+0
-13
av1/common/entropymode.h
av1/common/entropymode.h
+0
-1
tools/aom_entropy_optimizer.c
tools/aom_entropy_optimizer.c
+0
-5
No files found.
av1/common/entropymode.c
View file @
bc958f66
...
...
@@ -768,13 +768,6 @@ static const aom_cdf_prob default_interintra_cdf[BLOCK_SIZE_GROUPS][CDF_SIZE(
{
AOM_CDF2
(
244
*
128
)
},
{
AOM_CDF2
(
254
*
128
)
}
};
static
const
aom_prob
default_interintra_mode_prob
[
BLOCK_SIZE_GROUPS
][
INTERINTRA_MODES
-
1
]
=
{
{
128
,
128
,
128
},
// block_size < 8x8
{
24
,
34
,
119
},
// block_size < 16x16
{
38
,
33
,
95
},
// block_size < 32x32
{
51
,
21
,
110
},
// block_size >= 32x32
};
static
const
aom_cdf_prob
default_interintra_mode_cdf
[
BLOCK_SIZE_GROUPS
][
CDF_SIZE
(
INTERINTRA_MODES
)]
=
{
{
AOM_CDF4
(
16384
,
24576
,
28672
)
},
...
...
@@ -2994,7 +2987,6 @@ static void init_mode_probs(FRAME_CONTEXT *fc) {
av1_copy
(
fc
->
wedge_interintra_prob
,
default_wedge_interintra_prob
);
av1_copy
(
fc
->
interintra_cdf
,
default_interintra_cdf
);
av1_copy
(
fc
->
wedge_interintra_cdf
,
default_wedge_interintra_cdf
);
av1_copy
(
fc
->
interintra_mode_prob
,
default_interintra_mode_prob
);
av1_copy
(
fc
->
interintra_mode_cdf
,
default_interintra_mode_cdf
);
av1_copy
(
fc
->
seg
.
tree_probs
,
default_segment_tree_probs
);
av1_copy
(
fc
->
seg
.
pred_probs
,
default_segment_pred_probs
);
...
...
@@ -3091,11 +3083,6 @@ void av1_adapt_inter_frame_probs(AV1_COMMON *cm) {
fc
->
interintra_prob
[
i
]
=
av1_mode_mv_merge_probs
(
pre_fc
->
interintra_prob
[
i
],
counts
->
interintra
[
i
]);
}
for
(
i
=
0
;
i
<
BLOCK_SIZE_GROUPS
;
i
++
)
{
aom_tree_merge_probs
(
av1_interintra_mode_tree
,
pre_fc
->
interintra_mode_prob
[
i
],
counts
->
interintra_mode
[
i
],
fc
->
interintra_mode_prob
[
i
]);
}
for
(
i
=
0
;
i
<
BLOCK_SIZES_ALL
;
++
i
)
{
if
(
is_interintra_allowed_bsize
(
i
)
&&
is_interintra_wedge_used
(
i
))
fc
->
wedge_interintra_prob
[
i
]
=
av1_mode_mv_merge_probs
(
...
...
av1/common/entropymode.h
View file @
bc958f66
...
...
@@ -194,7 +194,6 @@ typedef struct frame_contexts {
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
];
aom_prob
interintra_mode_prob
[
BLOCK_SIZE_GROUPS
][
INTERINTRA_MODES
-
1
];
aom_cdf_prob
interintra_cdf
[
BLOCK_SIZE_GROUPS
][
CDF_SIZE
(
2
)];
aom_cdf_prob
wedge_interintra_cdf
[
BLOCK_SIZES_ALL
][
CDF_SIZE
(
2
)];
aom_cdf_prob
interintra_mode_cdf
[
BLOCK_SIZE_GROUPS
]
...
...
tools/aom_entropy_optimizer.c
View file @
bc958f66
...
...
@@ -442,11 +442,6 @@ int main(int argc, const char **argv) {
cts_each_dim
[
0
]
=
BLOCK_SIZE_GROUPS
;
cts_each_dim
[
1
]
=
INTERINTRA_MODES
;
optimize_entropy_table
(
&
fc
.
interintra_mode
[
0
][
0
],
probsfile
,
2
,
cts_each_dim
,
av1_interintra_mode_tree
,
0
,
"static const aom_prob "
"default_interintra_mode_prob[BLOCK_SIZE_GROUPS][INTERINTRA_MODES - 1]"
);
optimize_cdf_table
(
&
fc
.
interintra_mode
[
0
][
0
],
probsfile
,
2
,
cts_each_dim
,
"static const aom_cdf_prob
\n
"
"default_interintra_mode_cdf[BLOCK_SIZE_GROUPS][CDF_SIZE("
...
...
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