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
85059674
Commit
85059674
authored
Jun 23, 2016
by
Alex Converse
Committed by
Gerrit Code Review
Jun 23, 2016
Browse files
Merge "Reject sub8x8 partitions with SEG_LVL_SKIP." into nextgenv2
parents
c9e7675c
5a019e14
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp10/encoder/encodeframe.c
View file @
85059674
...
...
@@ -1810,14 +1810,20 @@ static void rd_pick_sb_modes(VP10_COMP *cpi,
#endif // CONFIG_SUPERTX
}
}
else
{
vp10_rd_pick_inter_mode_sub8x8
(
cpi
,
tile_data
,
x
,
mi_row
,
mi_col
,
rd_cost
,
if
(
segfeature_active
(
&
cm
->
seg
,
mbmi
->
segment_id
,
SEG_LVL_SKIP
))
{
// The decoder rejects sub8x8 partitions when SEG_LVL_SKIP is set.
rd_cost
->
rate
=
INT_MAX
;
}
else
{
vp10_rd_pick_inter_mode_sub8x8
(
cpi
,
tile_data
,
x
,
mi_row
,
mi_col
,
rd_cost
,
#if CONFIG_SUPERTX
totalrate_nocoef
,
totalrate_nocoef
,
#endif // CONFIG_SUPERTX
bsize
,
ctx
,
best_rd
);
bsize
,
ctx
,
best_rd
);
#if CONFIG_SUPERTX
assert
(
*
totalrate_nocoef
>=
0
);
#endif // CONFIG_SUPERTX
}
}
}
...
...
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