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
0b7cbe66
Commit
0b7cbe66
authored
Mar 08, 2017
by
Jingning Han
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix enc/dec mismatch in cb4x4 and ec-multisymbol
Change-Id: I75945cd00c71757d06822dd4c11ea800f9218452
parent
531d6afd
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
25 additions
and
10 deletions
+25
-10
av1/encoder/bitstream.c
av1/encoder/bitstream.c
+25
-10
No files found.
av1/encoder/bitstream.c
View file @
0b7cbe66
...
...
@@ -1623,17 +1623,24 @@ static void pack_inter_mode_mvs(AV1_COMP *cpi, const MODE_INFO *mi,
}
}
}
#if CONFIG_CB4X4
if
(
bsize
>=
BLOCK_8X8
||
is_chroma_reference
(
mi_row
,
mi_col
))
{
#if CONFIG_EC_MULTISYMBOL
aom_write_symbol
(
w
,
av1_intra_mode_ind
[
mbmi
->
uv_mode
],
ec_ctx
->
uv_mode_cdf
[
mode
],
INTRA_MODES
);
aom_write_symbol
(
w
,
av1_intra_mode_ind
[
mbmi
->
uv_mode
],
ec_ctx
->
uv_mode_cdf
[
mode
],
INTRA_MODES
);
#else
#if CONFIG_CB4X4
if
(
bsize
>=
BLOCK_8X8
||
is_chroma_reference
(
mi_row
,
mi_col
))
write_intra_mode
(
w
,
mbmi
->
uv_mode
,
cm
->
fc
->
uv_mode_prob
[
mode
]);
#endif // CONFIG_EC_MULTISYMBOL
}
#else // !CONFIG_CB4X4
#if CONFIG_EC_MULTISYMBOL
aom_write_symbol
(
w
,
av1_intra_mode_ind
[
mbmi
->
uv_mode
],
ec_ctx
->
uv_mode_cdf
[
mode
],
INTRA_MODES
);
#else
write_intra_mode
(
w
,
mbmi
->
uv_mode
,
cm
->
fc
->
uv_mode_prob
[
mode
]);
#endif // CONFIG_EC_MULTISYMBOL
#endif // CONFIG_CB4X4
#endif
#if CONFIG_EXT_INTRA
write_intra_angle_info
(
cm
,
xd
,
w
);
#endif // CONFIG_EXT_INTRA
...
...
@@ -1980,17 +1987,25 @@ static void write_mb_modes_kf(AV1_COMMON *cm, const MACROBLOCKD *xd,
}
}
}
#if CONFIG_CB4X4
if
(
bsize
>=
BLOCK_8X8
||
is_chroma_reference
(
mi_row
,
mi_col
))
{
#if CONFIG_EC_MULTISYMBOL
aom_write_symbol
(
w
,
av1_intra_mode_ind
[
mbmi
->
uv_mode
],
ec_ctx
->
uv_mode_cdf
[
mbmi
->
mode
],
INTRA_MODES
);
#else
write_intra_mode
(
w
,
mbmi
->
uv_mode
,
cm
->
fc
->
uv_mode_prob
[
mbmi
->
mode
]);
#endif // CONFIG_EC_MULTISYMBOL
}
#else // !CONFIG_CB4X4
#if CONFIG_EC_MULTISYMBOL
aom_write_symbol
(
w
,
av1_intra_mode_ind
[
mbmi
->
uv_mode
],
ec_ctx
->
uv_mode_cdf
[
mbmi
->
mode
],
INTRA_MODES
);
#else
#if CONFIG_CB4X4
if
(
bsize
>=
BLOCK_8X8
||
is_chroma_reference
(
mi_row
,
mi_col
))
write_intra_mode
(
w
,
mbmi
->
uv_mode
,
cm
->
fc
->
uv_mode_prob
[
mbmi
->
mode
]);
#else
write_intra_mode
(
w
,
mbmi
->
uv_mode
,
cm
->
fc
->
uv_mode_prob
[
mbmi
->
mode
]);
#endif // CONFIG_EC_MULTISYMBOL
#endif // CONFIG_CB4X4
#endif
#if CONFIG_EXT_INTRA
write_intra_angle_info
(
cm
,
xd
,
w
);
#endif // CONFIG_EXT_INTRA
...
...
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