Skip to content
GitLab
Projects
Groups
Snippets
/
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
6b06472a
Commit
6b06472a
authored
May 01, 2017
by
Jingning Han
Browse files
Fix enc/dec mismatch when sub8x8_comp_ref is forced off
BUG=aomedia:480 Change-Id: Ica26275274614d283db0cefcffac1f86993c4d6b
parent
865a6f27
Changes
1
Hide whitespace changes
Inline
Side-by-side
av1/decoder/decodemv.c
View file @
6b06472a
...
...
@@ -1206,13 +1206,11 @@ static INLINE void read_mv(aom_reader *r, MV *mv, const MV *ref,
static
REFERENCE_MODE
read_block_reference_mode
(
AV1_COMMON
*
cm
,
const
MACROBLOCKD
*
xd
,
aom_reader
*
r
)
{
if
(
cm
->
reference_mode
==
REFERENCE_MODE_SELECT
)
{
const
int
ctx
=
av1_get_reference_mode_context
(
cm
,
xd
);
#if !SUB8X8_COMP_REF
if
(
xd
->
mi
[
0
]
->
mbmi
.
sb_type
<
BLOCK_8X8
)
return
SINGLE_REFERENCE
;
if
(
xd
->
mi
[
0
]
->
mbmi
.
sb_type
<
BLOCK_8X8
)
return
SINGLE_REFERENCE
;
#endif
if
(
cm
->
reference_mode
==
REFERENCE_MODE_SELECT
)
{
const
int
ctx
=
av1_get_reference_mode_context
(
cm
,
xd
);
const
REFERENCE_MODE
mode
=
(
REFERENCE_MODE
)
aom_read
(
r
,
cm
->
fc
->
comp_inter_prob
[
ctx
],
ACCT_STR
);
FRAME_COUNTS
*
counts
=
xd
->
counts
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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