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
8004734b
Commit
8004734b
authored
Nov 22, 2017
by
Sebastien Alaiwan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove dead member: delta_q_prob
Change-Id: Iaed205ac520e6f4dbec8b406f15598f4f2fbd3f9
parent
eb123933
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
12 deletions
+0
-12
av1/common/entropymode.c
av1/common/entropymode.c
+0
-5
av1/common/entropymode.h
av1/common/entropymode.h
+0
-1
tools/aom_entropy_optimizer.c
tools/aom_entropy_optimizer.c
+0
-6
No files found.
av1/common/entropymode.c
View file @
8004734b
...
...
@@ -909,7 +909,6 @@ static const aom_cdf_prob default_obmc_cdf[BLOCK_SIZES_ALL][CDF_SIZE(2)] = {
#endif // CONFIG_EXT_PARTITION
};
static
const
aom_prob
default_delta_q_probs
[
DELTA_Q_PROBS
]
=
{
220
,
220
,
220
};
static
const
aom_cdf_prob
default_delta_q_cdf
[
CDF_SIZE
(
DELTA_Q_PROBS
+
1
)]
=
{
AOM_CDF4
(
28160
,
32120
,
32677
)
};
...
...
@@ -3083,7 +3082,6 @@ static void init_mode_probs(FRAME_CONTEXT *fc) {
av1_copy
(
fc
->
seg
.
q_seg_cdf
[
i
],
default_q_seg_tree_cdf
[
i
]);
#endif
av1_copy
(
fc
->
tx_size_cdf
,
default_tx_size_cdf
);
av1_copy
(
fc
->
delta_q_prob
,
default_delta_q_probs
);
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
);
...
...
@@ -3210,9 +3208,6 @@ void av1_adapt_intra_frame_probs(AV1_COMMON *cm) {
counts
->
seg
.
tree_total
,
fc
->
seg
.
tree_probs
);
}
for
(
i
=
0
;
i
<
DELTA_Q_PROBS
;
++
i
)
fc
->
delta_q_prob
[
i
]
=
mode_mv_merge_probs
(
pre_fc
->
delta_q_prob
[
i
],
counts
->
delta_q
[
i
]);
#if CONFIG_EXT_DELTA_Q
#if CONFIG_LOOPFILTER_LEVEL
for
(
i
=
0
;
i
<
FRAME_LF_COUNT
;
++
i
)
...
...
av1/common/entropymode.h
View file @
8004734b
...
...
@@ -304,7 +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
)];
aom_prob
delta_q_prob
[
DELTA_Q_PROBS
];
#if CONFIG_EXT_DELTA_Q
#if CONFIG_LOOPFILTER_LEVEL
aom_prob
delta_lf_multi_prob
[
FRAME_LF_COUNT
][
DELTA_LF_PROBS
];
...
...
tools/aom_entropy_optimizer.c
View file @
8004734b
...
...
@@ -629,12 +629,6 @@ int main(int argc, const char **argv) {
"static const aom_cdf_prob default_intrabc_cdf[CDF_SIZE(2)]"
);
#endif
/* delta_q */
cts_each_dim
[
0
]
=
DELTA_Q_PROBS
;
cts_each_dim
[
1
]
=
2
;
optimize_entropy_table
(
&
fc
.
delta_q
[
0
][
0
],
probsfile
,
2
,
cts_each_dim
,
NULL
,
1
,
"static const aom_prob default_delta_q_probs[DELTA_Q_PROBS]"
);
#if CONFIG_EXT_DELTA_Q
cts_each_dim
[
0
]
=
DELTA_LF_PROBS
;
cts_each_dim
[
1
]
=
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