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
6d5ebbd7
Commit
6d5ebbd7
authored
Oct 21, 2016
by
Yaowu Xu
Committed by
Gerrit Code Review
Oct 21, 2016
Browse files
Merge "Encoder/Decoder mismatch fix: need a separate copy of eob_counts." into nextgenv2
parents
e7d9d1eb
43e6281f
Changes
1
Hide whitespace changes
Inline
Side-by-side
av1/encoder/bitstream.c
View file @
6d5ebbd7
...
...
@@ -2478,8 +2478,6 @@ static void update_coef_probs(AV1_COMP *cpi, aom_writer *w) {
#if CONFIG_ENTROPY
AV1_COMMON
*
cm
=
&
cpi
->
common
;
SUBFRAME_STATS
*
subframe_stats
=
&
cpi
->
subframe_stats
;
unsigned
int
eob_counts_copy
[
TX_SIZES
][
PLANE_TYPES
][
REF_TYPES
][
COEF_BANDS
]
[
COEFF_CONTEXTS
];
int
i
;
av1_coeff_probs_model
dummy_frame_coef_probs
[
PLANE_TYPES
];
...
...
@@ -2504,8 +2502,10 @@ static void update_coef_probs(AV1_COMP *cpi, aom_writer *w) {
#if CONFIG_ENTROPY
if
(
cm
->
do_subframe_update
&&
cm
->
refresh_frame_context
==
REFRESH_FRAME_CONTEXT_BACKWARD
)
{
unsigned
int
this_eob_counts_copy
[
PLANE_TYPES
][
REF_TYPES
][
COEF_BANDS
]
[
COEFF_CONTEXTS
];
av1_coeff_count
coef_counts_copy
[
PLANE_TYPES
];
av1_copy
(
eob_counts_copy
,
cpi
->
common
.
counts
.
eob_branch
[
tx_size
]);
av1_copy
(
this_
eob_counts_copy
,
cpi
->
common
.
counts
.
eob_branch
[
tx_size
]);
av1_copy
(
coef_counts_copy
,
cpi
->
td
.
rd_counts
.
coef_counts
[
tx_size
]);
build_tree_distribution
(
cpi
,
tx_size
,
frame_branch_ct
,
frame_coef_probs
);
...
...
@@ -2517,7 +2517,7 @@ static void update_coef_probs(AV1_COMP *cpi, aom_writer *w) {
build_tree_distribution
(
cpi
,
tx_size
,
cpi
->
branch_ct_buf
[
i
][
tx_size
],
dummy_frame_coef_probs
);
}
av1_copy
(
cpi
->
common
.
counts
.
eob_branch
[
tx_size
],
eob_counts_copy
);
av1_copy
(
cpi
->
common
.
counts
.
eob_branch
[
tx_size
],
this_
eob_counts_copy
);
av1_copy
(
cpi
->
td
.
rd_counts
.
coef_counts
[
tx_size
],
coef_counts_copy
);
update_coef_probs_subframe
(
w
,
cpi
,
tx_size
,
cpi
->
branch_ct_buf
,
...
...
@@ -2545,6 +2545,8 @@ static void update_coef_probs(AV1_COMP *cpi, aom_writer *w) {
av1_copy
(
subframe_stats
->
coef_probs_buf
[
0
],
cm
->
fc
->
coef_probs
);
if
(
cm
->
do_subframe_update
&&
cm
->
refresh_frame_context
==
REFRESH_FRAME_CONTEXT_BACKWARD
)
{
unsigned
int
eob_counts_copy
[
TX_SIZES
][
PLANE_TYPES
][
REF_TYPES
][
COEF_BANDS
]
[
COEFF_CONTEXTS
];
av1_copy
(
eob_counts_copy
,
cm
->
counts
.
eob_branch
);
for
(
i
=
1
;
i
<=
cpi
->
common
.
coef_probs_update_idx
;
++
i
)
{
for
(
tx_size
=
TX_4X4
;
tx_size
<=
max_tx_size
;
++
tx_size
)
...
...
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