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
5ffed8a0
Commit
5ffed8a0
authored
Nov 24, 2017
by
Sebastien Alaiwan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove dead member: obmc_probs
Change-Id: Ia90ad41050efeec31a92541e9dfc6c46ef75362c
parent
1a5ac979
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
20 deletions
+0
-20
av1/common/entropymode.c
av1/common/entropymode.c
+0
-16
av1/common/entropymode.h
av1/common/entropymode.h
+0
-1
tools/aom_entropy_optimizer.c
tools/aom_entropy_optimizer.c
+0
-3
No files found.
av1/common/entropymode.c
View file @
5ffed8a0
...
...
@@ -853,18 +853,6 @@ static const aom_cdf_prob
#endif
};
// Probability for the case that only 1 additional motion mode is allowed
static
const
aom_prob
default_obmc_prob
[
BLOCK_SIZES_ALL
]
=
{
128
,
128
,
128
,
128
,
128
,
128
,
45
,
79
,
75
,
130
,
141
,
144
,
208
,
201
,
186
,
231
,
#if CONFIG_EXT_PARTITION
252
,
252
,
252
,
#endif // CONFIG_EXT_PARTITION
208
,
208
,
208
,
208
,
208
,
208
,
#if CONFIG_EXT_PARTITION
252
,
252
#endif // CONFIG_EXT_PARTITION
};
static
const
aom_cdf_prob
default_obmc_cdf
[
BLOCK_SIZES_ALL
][
CDF_SIZE
(
2
)]
=
{
{
AOM_CDF2
(
128
*
128
)
},
{
AOM_CDF2
(
128
*
128
)
},
{
AOM_CDF2
(
128
*
128
)
},
{
AOM_CDF2
(
128
*
128
)
},
{
AOM_CDF2
(
128
*
128
)
},
{
AOM_CDF2
(
128
*
128
)
},
...
...
@@ -2999,7 +2987,6 @@ static void init_mode_probs(FRAME_CONTEXT *fc) {
av1_copy
(
fc
->
drl_cdf
,
default_drl_cdf
);
av1_copy
(
fc
->
motion_mode_prob
,
default_motion_mode_prob
);
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_cdf
,
default_inter_compound_mode_cdf
);
av1_copy
(
fc
->
compound_type_cdf
,
default_compound_type_cdf
);
...
...
@@ -3097,9 +3084,6 @@ void av1_adapt_inter_frame_probs(AV1_COMMON *cm) {
for
(
i
=
BLOCK_8X8
;
i
<
BLOCK_SIZES_ALL
;
++
i
)
aom_tree_merge_probs
(
av1_motion_mode_tree
,
pre_fc
->
motion_mode_prob
[
i
],
counts
->
motion_mode
[
i
],
fc
->
motion_mode_prob
[
i
]);
for
(
i
=
BLOCK_8X8
;
i
<
BLOCK_SIZES_ALL
;
++
i
)
fc
->
obmc_prob
[
i
]
=
av1_mode_mv_merge_probs
(
pre_fc
->
obmc_prob
[
i
],
counts
->
obmc
[
i
]);
if
(
cm
->
allow_interintra_compound
)
{
for
(
i
=
0
;
i
<
BLOCK_SIZE_GROUPS
;
++
i
)
{
...
...
av1/common/entropymode.h
View file @
5ffed8a0
...
...
@@ -201,7 +201,6 @@ typedef struct frame_contexts {
[
CDF_SIZE
(
INTERINTRA_MODES
)];
aom_prob
motion_mode_prob
[
BLOCK_SIZES_ALL
][
MOTION_MODES
-
1
];
aom_cdf_prob
motion_mode_cdf
[
BLOCK_SIZES_ALL
][
CDF_SIZE
(
MOTION_MODES
)];
aom_prob
obmc_prob
[
BLOCK_SIZES_ALL
];
aom_cdf_prob
obmc_cdf
[
BLOCK_SIZES_ALL
][
CDF_SIZE
(
2
)];
aom_prob
comp_inter_prob
[
COMP_INTER_CONTEXTS
];
aom_cdf_prob
palette_y_size_cdf
[
PALETTE_BLOCK_SIZES
][
CDF_SIZE
(
PALETTE_SIZES
)];
...
...
tools/aom_entropy_optimizer.c
View file @
5ffed8a0
...
...
@@ -484,9 +484,6 @@ int main(int argc, const char **argv) {
"default_motion_mode_cdf[BLOCK_SIZES_ALL][CDF_SIZE(MOTION_MODES)]"
);
cts_each_dim
[
0
]
=
BLOCK_SIZES_ALL
;
cts_each_dim
[
1
]
=
2
;
optimize_entropy_table
(
&
fc
.
obmc
[
0
][
0
],
probsfile
,
2
,
cts_each_dim
,
NULL
,
1
,
"static const aom_prob default_obmc_prob[BLOCK_SIZES_ALL]"
);
optimize_cdf_table
(
&
fc
.
obmc
[
0
][
0
],
probsfile
,
2
,
cts_each_dim
,
"static const aom_cdf_prob "
"default_obmc_cdf[BLOCK_SIZES_ALL][CDF_SIZE(2)]"
);
...
...
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