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
ffabff35
Commit
ffabff35
authored
Mar 27, 2017
by
Alex Converse
Browse files
ext_partition_types: Uncopy-paste update_ext_partition_context
Change-Id: I8cd35f4697bc5ee90cfcb1fd37042770d6b5a544
parent
9b8393fd
Changes
1
Hide whitespace changes
Inline
Side-by-side
av1/decoder/decodeframe.c
View file @
ffabff35
...
...
@@ -2351,34 +2351,7 @@ static void decode_partition(AV1Decoder *const pbi, MACROBLOCKD *const xd,
#endif // CONFIG_SUPERTX
#if CONFIG_EXT_PARTITION_TYPES
if
(
bsize
>=
BLOCK_8X8
)
{
switch
(
partition
)
{
case
PARTITION_SPLIT
:
if
(
bsize
>
BLOCK_8X8
)
break
;
case
PARTITION_NONE
:
case
PARTITION_HORZ
:
case
PARTITION_VERT
:
update_partition_context
(
xd
,
mi_row
,
mi_col
,
subsize
,
bsize
);
break
;
case
PARTITION_HORZ_A
:
update_partition_context
(
xd
,
mi_row
,
mi_col
,
bsize2
,
subsize
);
update_partition_context
(
xd
,
mi_row
+
hbs
,
mi_col
,
subsize
,
subsize
);
break
;
case
PARTITION_HORZ_B
:
update_partition_context
(
xd
,
mi_row
,
mi_col
,
subsize
,
subsize
);
update_partition_context
(
xd
,
mi_row
+
hbs
,
mi_col
,
bsize2
,
subsize
);
break
;
case
PARTITION_VERT_A
:
update_partition_context
(
xd
,
mi_row
,
mi_col
,
bsize2
,
subsize
);
update_partition_context
(
xd
,
mi_row
,
mi_col
+
hbs
,
subsize
,
subsize
);
break
;
case
PARTITION_VERT_B
:
update_partition_context
(
xd
,
mi_row
,
mi_col
,
subsize
,
subsize
);
update_partition_context
(
xd
,
mi_row
,
mi_col
+
hbs
,
bsize2
,
subsize
);
break
;
default:
assert
(
0
&&
"Invalid partition type"
);
}
}
update_ext_partition_context
(
xd
,
mi_row
,
mi_col
,
subsize
,
bsize
,
partition
);
#else
// update partition context
if
(
bsize
>=
BLOCK_8X8
&&
...
...
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