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
fe530085
Commit
fe530085
authored
Nov 23, 2017
by
Sebastien Alaiwan
Browse files
Remove dead member: intra_inter_prob
Change-Id: Id39e4231b5ba8e86b92f478185b61d1a5b9eeeeb
parent
a73bdb04
Changes
2
Hide whitespace changes
Inline
Side-by-side
av1/common/entropymode.c
View file @
fe530085
...
...
@@ -956,10 +956,6 @@ const aom_tree_index av1_compound_type_tree[TREE_SIZE(COMPOUND_TYPES)] = {
};
/* clang-format on */
static
const
aom_prob
default_intra_inter_p
[
INTRA_INTER_CONTEXTS
]
=
{
6
,
97
,
151
,
205
,
};
static
const
aom_cdf_prob
default_intra_inter_cdf
[
INTRA_INTER_CONTEXTS
]
[
CDF_SIZE
(
2
)]
=
{
{
AOM_CDF2
(
768
)
},
...
...
@@ -2978,7 +2974,6 @@ static const aom_cdf_prob default_angle_delta_cdf[DIRECTIONAL_MODES][CDF_SIZE(
#endif // CONFIG_EXT_INTRA_MOD
static
void
init_mode_probs
(
FRAME_CONTEXT
*
fc
)
{
av1_copy
(
fc
->
intra_inter_prob
,
default_intra_inter_p
);
av1_copy
(
fc
->
comp_inter_prob
,
default_comp_inter_p
);
av1_copy
(
fc
->
palette_y_size_cdf
,
default_palette_y_size_cdf
);
av1_copy
(
fc
->
palette_uv_size_cdf
,
default_palette_uv_size_cdf
);
...
...
@@ -3111,10 +3106,6 @@ void av1_adapt_inter_frame_probs(AV1_COMMON *cm) {
const
FRAME_CONTEXT
*
pre_fc
=
cm
->
pre_fc
;
const
FRAME_COUNTS
*
counts
=
&
cm
->
counts
;
for
(
i
=
0
;
i
<
INTRA_INTER_CONTEXTS
;
i
++
)
fc
->
intra_inter_prob
[
i
]
=
av1_mode_mv_merge_probs
(
pre_fc
->
intra_inter_prob
[
i
],
counts
->
intra_inter
[
i
]);
for
(
i
=
0
;
i
<
COMP_INTER_CONTEXTS
;
i
++
)
fc
->
comp_inter_prob
[
i
]
=
av1_mode_mv_merge_probs
(
pre_fc
->
comp_inter_prob
[
i
],
counts
->
comp_inter
[
i
]);
...
...
av1/common/entropymode.h
View file @
fe530085
...
...
@@ -201,7 +201,6 @@ typedef struct frame_contexts {
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
intra_inter_prob
[
INTRA_INTER_CONTEXTS
];
aom_prob
comp_inter_prob
[
COMP_INTER_CONTEXTS
];
aom_cdf_prob
palette_y_size_cdf
[
PALETTE_BLOCK_SIZES
][
CDF_SIZE
(
PALETTE_SIZES
)];
aom_cdf_prob
palette_uv_size_cdf
[
PALETTE_BLOCK_SIZES
]
...
...
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