Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
a28c1734
Commit
a28c1734
authored
Nov 29, 2017
by
Sebastien Alaiwan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove dead member: pred_probs
Change-Id: If64e376ceca387659f66185bab0928eaad156ffe
parent
ca52fb5f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
15 deletions
+0
-15
av1/common/entropymode.c
av1/common/entropymode.c
+0
-9
av1/common/pred_common.h
av1/common/pred_common.h
+0
-5
av1/common/seg_common.h
av1/common/seg_common.h
+0
-1
No files found.
av1/common/entropymode.c
View file @
a28c1734
...
...
@@ -1196,9 +1196,6 @@ static const aom_prob default_segment_tree_probs[SEG_TREE_PROBS] = {
128
,
128
,
128
,
128
,
128
,
128
,
128
};
// clang-format off
static
const
aom_prob
default_segment_pred_probs
[
PREDICTION_PROBS
]
=
{
128
,
128
,
128
};
static
const
aom_cdf_prob
default_segment_pred_cdf
[
PREDICTION_PROBS
][
CDF_SIZE
(
2
)]
=
{
{
AOM_CDF2
(
128
*
128
)
},
...
...
@@ -2624,7 +2621,6 @@ static void init_mode_probs(FRAME_CONTEXT *fc) {
av1_copy
(
fc
->
wedge_interintra_cdf
,
default_wedge_interintra_cdf
);
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
);
av1_copy
(
fc
->
seg
.
pred_cdf
,
default_segment_pred_cdf
);
#if CONFIG_FILTER_INTRA
av1_copy
(
fc
->
filter_intra_cdfs
,
default_filter_intra_cdfs
);
...
...
@@ -2720,16 +2716,11 @@ void av1_adapt_inter_frame_probs(AV1_COMMON *cm) {
}
void
av1_adapt_intra_frame_probs
(
AV1_COMMON
*
cm
)
{
int
i
;
FRAME_CONTEXT
*
fc
=
cm
->
fc
;
const
FRAME_CONTEXT
*
pre_fc
=
cm
->
pre_fc
;
const
FRAME_COUNTS
*
counts
=
&
cm
->
counts
;
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
],
counts
->
seg
.
pred
[
i
]);
aom_tree_merge_probs
(
av1_segment_tree
,
pre_fc
->
seg
.
tree_probs
,
counts
->
seg
.
tree_mispred
,
fc
->
seg
.
tree_probs
);
}
else
{
...
...
av1/common/pred_common.h
View file @
a28c1734
...
...
@@ -81,11 +81,6 @@ static INLINE int av1_get_pred_context_seg_id(const MACROBLOCKD *xd) {
return
above_sip
+
left_sip
;
}
static
INLINE
aom_prob
av1_get_pred_prob_seg_id
(
const
struct
segmentation_probs
*
segp
,
const
MACROBLOCKD
*
xd
)
{
return
segp
->
pred_probs
[
av1_get_pred_context_seg_id
(
xd
)];
}
#if CONFIG_JNT_COMP
static
INLINE
int
get_comp_index_context
(
const
AV1_COMMON
*
cm
,
const
MACROBLOCKD
*
xd
)
{
...
...
av1/common/seg_common.h
View file @
a28c1734
...
...
@@ -75,7 +75,6 @@ struct segmentation {
struct
segmentation_probs
{
aom_prob
tree_probs
[
SEG_TREE_PROBS
];
aom_cdf_prob
tree_cdf
[
CDF_SIZE
(
MAX_SEGMENTS
)];
aom_prob
pred_probs
[
PREDICTION_PROBS
];
aom_cdf_prob
pred_cdf
[
PREDICTION_PROBS
][
CDF_SIZE
(
2
)];
#if CONFIG_Q_SEGMENTATION
aom_cdf_prob
q_seg_cdf
[
Q_SEGMENT_CDF_COUNT
][
CDF_SIZE
(
MAX_SEGMENTS
)];
...
...
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