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
4d01de3d
Commit
4d01de3d
authored
Nov 22, 2017
by
Sebastien Alaiwan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove dead member: delta_lf_prob
Change-Id: Ia07c54a0a57d810fea2598eaf4ff2034daa441af
parent
8004734b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
34 deletions
+0
-34
av1/common/entropymode.c
av1/common/entropymode.c
+0
-20
av1/common/entropymode.h
av1/common/entropymode.h
+0
-6
tools/aom_entropy_optimizer.c
tools/aom_entropy_optimizer.c
+0
-8
No files found.
av1/common/entropymode.c
View file @
4d01de3d
...
...
@@ -914,18 +914,12 @@ static const aom_cdf_prob default_delta_q_cdf[CDF_SIZE(DELTA_Q_PROBS + 1)] = {
};
#if CONFIG_EXT_DELTA_Q
#if CONFIG_LOOPFILTER_LEVEL
static
const
aom_prob
default_delta_lf_multi_probs
[
FRAME_LF_COUNT
][
DELTA_LF_PROBS
]
=
{
{
220
,
220
,
220
},
{
220
,
220
,
220
},
{
220
,
220
,
220
},
{
220
,
220
,
220
}
};
static
const
aom_cdf_prob
default_delta_lf_multi_cdf
[
FRAME_LF_COUNT
][
CDF_SIZE
(
DELTA_LF_PROBS
+
1
)]
=
{
{
AOM_CDF4
(
28160
,
32120
,
32677
)
},
{
AOM_CDF4
(
28160
,
32120
,
32677
)
},
{
AOM_CDF4
(
28160
,
32120
,
32677
)
},
{
AOM_CDF4
(
28160
,
32120
,
32677
)
}
};
#endif // CONFIG_LOOPFILTER_LEVEL
static
const
aom_prob
default_delta_lf_probs
[
DELTA_LF_PROBS
]
=
{
220
,
220
,
220
};
static
const
aom_cdf_prob
default_delta_lf_cdf
[
CDF_SIZE
(
DELTA_LF_PROBS
+
1
)]
=
{
AOM_CDF4
(
28160
,
32120
,
32677
)
};
...
...
@@ -3084,10 +3078,8 @@ static void init_mode_probs(FRAME_CONTEXT *fc) {
av1_copy
(
fc
->
tx_size_cdf
,
default_tx_size_cdf
);
av1_copy
(
fc
->
delta_q_cdf
,
default_delta_q_cdf
);
#if CONFIG_EXT_DELTA_Q
av1_copy
(
fc
->
delta_lf_prob
,
default_delta_lf_probs
);
av1_copy
(
fc
->
delta_lf_cdf
,
default_delta_lf_cdf
);
#if CONFIG_LOOPFILTER_LEVEL
av1_copy
(
fc
->
delta_lf_multi_prob
,
default_delta_lf_multi_probs
);
av1_copy
(
fc
->
delta_lf_multi_cdf
,
default_delta_lf_multi_cdf
);
#endif // CONFIG_LOOPFILTER_LEVEL
#endif
...
...
@@ -3207,18 +3199,6 @@ void av1_adapt_intra_frame_probs(AV1_COMMON *cm) {
aom_tree_merge_probs
(
av1_segment_tree
,
pre_fc
->
seg
.
tree_probs
,
counts
->
seg
.
tree_total
,
fc
->
seg
.
tree_probs
);
}
#if CONFIG_EXT_DELTA_Q
#if CONFIG_LOOPFILTER_LEVEL
for
(
i
=
0
;
i
<
FRAME_LF_COUNT
;
++
i
)
for
(
int
k
=
0
;
k
<
DELTA_LF_PROBS
;
++
k
)
fc
->
delta_lf_multi_prob
[
i
][
k
]
=
mode_mv_merge_probs
(
pre_fc
->
delta_lf_multi_prob
[
i
][
k
],
counts
->
delta_lf_multi
[
i
][
k
]);
#endif // CONFIG_LOOPFILTER_LEVEL
for
(
i
=
0
;
i
<
DELTA_LF_PROBS
;
++
i
)
fc
->
delta_lf_prob
[
i
]
=
mode_mv_merge_probs
(
pre_fc
->
delta_lf_prob
[
i
],
counts
->
delta_lf
[
i
]);
#endif // CONFIG_EXT_DELTA_Q
}
static
void
set_default_lf_deltas
(
struct
loopfilter
*
lf
)
{
...
...
av1/common/entropymode.h
View file @
4d01de3d
...
...
@@ -304,12 +304,6 @@ typedef struct frame_contexts {
[
CDF_SIZE
(
TX_TYPES
)];
aom_cdf_prob
inter_ext_tx_cdf
[
EXT_TX_SETS_INTER
][
EXT_TX_SIZES
]
[
CDF_SIZE
(
TX_TYPES
)];
#if CONFIG_EXT_DELTA_Q
#if CONFIG_LOOPFILTER_LEVEL
aom_prob
delta_lf_multi_prob
[
FRAME_LF_COUNT
][
DELTA_LF_PROBS
];
#endif // CONFIG_LOOPFILTER_LEVEL
aom_prob
delta_lf_prob
[
DELTA_LF_PROBS
];
#endif
#if CONFIG_CFL
aom_cdf_prob
cfl_sign_cdf
[
CDF_SIZE
(
CFL_JOINT_SIGNS
)];
aom_cdf_prob
cfl_alpha_cdf
[
CFL_ALPHA_CONTEXTS
][
CDF_SIZE
(
CFL_ALPHABET_SIZE
)];
...
...
tools/aom_entropy_optimizer.c
View file @
4d01de3d
...
...
@@ -629,14 +629,6 @@ int main(int argc, const char **argv) {
"static const aom_cdf_prob default_intrabc_cdf[CDF_SIZE(2)]"
);
#endif
#if CONFIG_EXT_DELTA_Q
cts_each_dim
[
0
]
=
DELTA_LF_PROBS
;
cts_each_dim
[
1
]
=
2
;
optimize_entropy_table
(
&
fc
.
delta_lf
[
0
][
0
],
probsfile
,
2
,
cts_each_dim
,
NULL
,
1
,
"static const aom_prob default_delta_lf_probs[DELTA_LF_PROBS]"
);
#endif
/* Transform type */
// TODO(yuec): different trees are used depending on selected ext tx set
...
...
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