Skip to content
GitLab
Menu
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
6fa05dcf
Commit
6fa05dcf
authored
Dec 05, 2017
by
Zoe Liu
Browse files
Simply the code path when jnt-comp is off
Change-Id: I17a82393f1b7230119f499e2f9ed8d0b8fe5ba25
parent
4d6ea54e
Changes
1
Hide whitespace changes
Inline
Side-by-side
av1/decoder/decodemv.c
View file @
6fa05dcf
...
...
@@ -2272,12 +2272,7 @@ static void read_inter_block_mode_info(AV1Decoder *const pbi,
#endif // CONFIG_EXT_SKIP
)
{
if
(
is_any_masked_compound_used
(
bsize
))
{
#if CONFIG_JNT_COMP
if
(
cm
->
allow_masked_compound
&&
mbmi
->
compound_idx
)
#else
if
(
cm
->
allow_masked_compound
)
#endif // CONFIG_JNT_COMP
{
if
(
cm
->
allow_masked_compound
)
{
if
(
!
is_interinter_compound_used
(
COMPOUND_WEDGE
,
bsize
))
mbmi
->
interinter_compound_type
=
aom_read_bit
(
r
,
ACCT_STR
)
?
COMPOUND_AVERAGE
:
COMPOUND_SEG
;
...
...
Write
Preview
Supports
Markdown
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