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
2725693d
Commit
2725693d
authored
Oct 11, 2017
by
Rupert Swarbrick
Committed by
Yaowu Xu
Oct 12, 2017
Browse files
Support 4:1 partitions in count_segs_sb
BUG=aomedia:898 Change-Id: I5c3eb62407c8025650d4023dd408674381312d26
parent
f93feec7
Changes
1
Hide whitespace changes
Inline
Side-by-side
av1/encoder/segmentation.c
View file @
2725693d
...
...
@@ -167,9 +167,7 @@ static void count_segs_sb(const AV1_COMMON *cm, MACROBLOCKD *xd,
const
int
bs
=
mi_size_wide
[
bsize
],
hbs
=
bs
/
2
;
#if CONFIG_EXT_PARTITION_TYPES
PARTITION_TYPE
partition
;
#if CONFIG_EXT_PARTITION_TYPES_AB
const
int
qbs
=
bs
/
4
;
#endif // CONFIG_EXT_PARTITION_TYPES_AB
#else
int
bw
,
bh
;
#endif // CONFIG_EXT_PARTITION_TYPES
...
...
@@ -239,6 +237,20 @@ static void count_segs_sb(const AV1_COMMON *cm, MACROBLOCKD *xd,
CSEGS
(
hbs
,
hbs
,
hbs
,
hbs
);
break
;
#endif
case
PARTITION_HORZ_4
:
CSEGS
(
bs
,
qbs
,
0
,
0
);
CSEGS
(
bs
,
qbs
,
qbs
,
0
);
CSEGS
(
bs
,
qbs
,
2
*
qbs
,
0
);
if
(
mi_row
+
3
*
qbs
<
cm
->
mi_rows
)
CSEGS
(
bs
,
qbs
,
3
*
qbs
,
0
);
break
;
case
PARTITION_VERT_4
:
CSEGS
(
qbs
,
bs
,
0
,
0
);
CSEGS
(
qbs
,
bs
,
0
,
qbs
);
CSEGS
(
qbs
,
bs
,
0
,
2
*
qbs
);
if
(
mi_col
+
3
*
qbs
<
cm
->
mi_cols
)
CSEGS
(
qbs
,
bs
,
0
,
3
*
qbs
);
break
;
case
PARTITION_SPLIT
:
{
const
BLOCK_SIZE
subsize
=
subsize_lookup
[
PARTITION_SPLIT
][
bsize
];
int
n
;
...
...
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