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
092f32cf
Commit
092f32cf
authored
Feb 23, 2014
by
Dmitry Kovalev
Committed by
Gerrit Code Review
Feb 23, 2014
Browse files
Merge "Combining if-else branches from different conditions."
parents
2aacc66b
ea53d6c1
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_encodeframe.c
View file @
092f32cf
...
...
@@ -2724,6 +2724,7 @@ static void encode_superblock(VP9_COMP *cpi, TOKENEXTRA **t, int output_enabled,
vp9_encode_intra_block_plane
(
x
,
MAX
(
bsize
,
BLOCK_8X8
),
plane
);
if
(
output_enabled
)
sum_intra_stats
(
&
cm
->
counts
,
mi
);
vp9_tokenize_sb
(
cpi
,
t
,
!
output_enabled
,
MAX
(
bsize
,
BLOCK_8X8
));
}
else
{
int
ref
;
const
int
is_compound
=
has_second_ref
(
mbmi
);
...
...
@@ -2733,19 +2734,17 @@ static void encode_superblock(VP9_COMP *cpi, TOKENEXTRA **t, int output_enabled,
setup_pre_planes
(
xd
,
ref
,
cfg
,
mi_row
,
mi_col
,
&
xd
->
block_refs
[
ref
]
->
sf
);
}
vp9_build_inter_predictors_sb
(
xd
,
mi_row
,
mi_col
,
MAX
(
bsize
,
BLOCK_8X8
));
}
if
(
!
is_inter_block
(
mbmi
))
{
vp9_tokenize_sb
(
cpi
,
t
,
!
output_enabled
,
MAX
(
bsize
,
BLOCK_8X8
));
}
else
if
(
!
x
->
skip
)
{
mbmi
->
skip
=
1
;
vp9_encode_sb
(
x
,
MAX
(
bsize
,
BLOCK_8X8
));
vp9_tokenize_sb
(
cpi
,
t
,
!
output_enabled
,
MAX
(
bsize
,
BLOCK_8X8
));
}
else
{
mbmi
->
skip
=
1
;
if
(
output_enabled
)
cm
->
counts
.
skip
[
vp9_get_skip_context
(
xd
)][
1
]
++
;
reset_skip_context
(
xd
,
MAX
(
bsize
,
BLOCK_8X8
));
if
(
!
x
->
skip
)
{
mbmi
->
skip
=
1
;
vp9_encode_sb
(
x
,
MAX
(
bsize
,
BLOCK_8X8
));
vp9_tokenize_sb
(
cpi
,
t
,
!
output_enabled
,
MAX
(
bsize
,
BLOCK_8X8
));
}
else
{
mbmi
->
skip
=
1
;
if
(
output_enabled
)
cm
->
counts
.
skip
[
vp9_get_skip_context
(
xd
)][
1
]
++
;
reset_skip_context
(
xd
,
MAX
(
bsize
,
BLOCK_8X8
));
}
}
if
(
output_enabled
)
{
...
...
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