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
Guillaume Martres
aom-rav1e
Commits
130d9ade
Commit
130d9ade
authored
Jun 12, 2014
by
Alex Converse
Committed by
Gerrit Code Review
Jun 12, 2014
Browse files
Merge "Fix SEG_LVL_SKIP in RD inter mode selection."
parents
f9d1e66f
b0a8057f
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_rdopt.c
View file @
130d9ade
...
...
@@ -2802,7 +2802,8 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
*
rate2
+=
vp9_get_switchable_rate
(
cpi
);
if
(
!
is_comp_pred
)
{
if
(
!
x
->
in_active_map
)
{
if
(
!
x
->
in_active_map
||
vp9_segfeature_active
(
&
cm
->
seg
,
mbmi
->
segment_id
,
SEG_LVL_SKIP
))
{
if
(
psse
)
*
psse
=
0
;
*
distortion
=
0
;
...
...
@@ -3119,9 +3120,7 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
// If the segment skip feature is enabled....
// then do nothing if the current mode is not allowed..
if
(
vp9_segfeature_active
(
seg
,
segment_id
,
SEG_LVL_SKIP
))
{
const
int
inter_non_zero_mode_mask
=
0x1F7F7
;
mode_skip_mask
|=
inter_non_zero_mode_mask
;
mode_skip_mask
&=
~
(
1
<<
THR_ZEROMV
);
mode_skip_mask
=
~
(
1
<<
THR_ZEROMV
);
inter_mode_mask
=
(
1
<<
ZEROMV
);
}
...
...
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