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
f0ab155e
Commit
f0ab155e
authored
May 16, 2013
by
Jingning Han
Committed by
Gerrit Code Review
May 16, 2013
Browse files
Merge "Use b_width_log2_ in partition type parse" into experimental
parents
f07602e4
3819f11b
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_bitstream.c
View file @
f0ab155e
...
...
@@ -873,8 +873,8 @@ static void write_modes_sb(VP9_COMP *cpi, MODE_INFO *m, vp9_writer *bc,
MACROBLOCKD
*
xd
=
&
cpi
->
mb
.
e_mbd
;
const
int
mis
=
cm
->
mode_info_stride
;
int
bwl
,
bhl
;
int
b
w
,
bh
;
int
bs
l
=
mi_width_log2
(
bsize
),
bs
=
(
1
<<
bsl
)
/
2
;
int
b
sl
=
b_width_log2
(
bsize
)
;
int
bs
=
(
1
<<
bsl
)
/
4
;
// mode_info step for subsize
int
n
;
PARTITION_TYPE
partition
;
BLOCK_SIZE_TYPE
subsize
;
...
...
@@ -882,10 +882,8 @@ static void write_modes_sb(VP9_COMP *cpi, MODE_INFO *m, vp9_writer *bc,
if
(
mi_row
>=
cm
->
mi_rows
||
mi_col
>=
cm
->
mi_cols
)
return
;
bwl
=
mi_width_log2
(
m
->
mbmi
.
sb_type
);
bhl
=
mi_height_log2
(
m
->
mbmi
.
sb_type
);
bw
=
1
<<
bwl
;
bh
=
1
<<
bhl
;
bwl
=
b_width_log2
(
m
->
mbmi
.
sb_type
);
bhl
=
b_height_log2
(
m
->
mbmi
.
sb_type
);
// parse the partition type
if
((
bwl
==
bsl
)
&&
(
bhl
==
bsl
))
...
...
@@ -900,8 +898,6 @@ static void write_modes_sb(VP9_COMP *cpi, MODE_INFO *m, vp9_writer *bc,
assert
(
0
);
#if CONFIG_AB4X4
if
(
bsize
==
BLOCK_SIZE_SB8X8
&&
m
->
mbmi
.
sb_type
<
BLOCK_SIZE_SB8X8
)
partition
=
PARTITION_SPLIT
;
if
(
bsize
<
BLOCK_SIZE_SB8X8
)
if
(
xd
->
ab_index
!=
0
)
return
;
...
...
@@ -929,13 +925,13 @@ static void write_modes_sb(VP9_COMP *cpi, MODE_INFO *m, vp9_writer *bc,
break
;
case
PARTITION_HORZ
:
write_modes_b
(
cpi
,
m
,
bc
,
tok
,
tok_end
,
mi_row
,
mi_col
);
if
((
mi_row
+
b
h
)
<
cm
->
mi_rows
)
write_modes_b
(
cpi
,
m
+
b
h
*
mis
,
bc
,
tok
,
tok_end
,
mi_row
+
b
h
,
mi_col
);
if
((
mi_row
+
b
s
)
<
cm
->
mi_rows
)
write_modes_b
(
cpi
,
m
+
b
s
*
mis
,
bc
,
tok
,
tok_end
,
mi_row
+
b
s
,
mi_col
);
break
;
case
PARTITION_VERT
:
write_modes_b
(
cpi
,
m
,
bc
,
tok
,
tok_end
,
mi_row
,
mi_col
);
if
((
mi_col
+
b
w
)
<
cm
->
mi_cols
)
write_modes_b
(
cpi
,
m
+
b
w
,
bc
,
tok
,
tok_end
,
mi_row
,
mi_col
+
b
w
);
if
((
mi_col
+
b
s
)
<
cm
->
mi_cols
)
write_modes_b
(
cpi
,
m
+
b
s
,
bc
,
tok
,
tok_end
,
mi_row
,
mi_col
+
b
s
);
break
;
case
PARTITION_SPLIT
:
for
(
n
=
0
;
n
<
4
;
n
++
)
{
...
...
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