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
8870756a
Commit
8870756a
authored
Jun 16, 2016
by
Marco Paniconi
Committed by
Gerrit Code Review
Jun 16, 2016
Browse files
Merge "vp9: Adjustments to nonrd-pickmode for vbr"
parents
bbe5ddfd
8e070558
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_pickmode.c
View file @
8870756a
...
...
@@ -1665,8 +1665,9 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
if
((
this_mode
==
NEWMV
||
filter_ref
==
SWITCHABLE
)
&&
pred_filter_search
&&
(
ref_frame
==
LAST_FRAME
||
(
ref_frame
==
GOLDEN_FRAME
&&
cpi
->
use_svc
))
&&
(((
mi
->
mv
[
0
].
as_mv
.
row
|
mi
->
mv
[
0
].
as_mv
.
col
)
&
0x07
)
!=
0
))
{
(
ref_frame
==
GOLDEN_FRAME
&&
(
cpi
->
use_svc
||
cpi
->
oxcf
.
rc_mode
==
VPX_VBR
)))
&&
(((
mi
->
mv
[
0
].
as_mv
.
row
|
mi
->
mv
[
0
].
as_mv
.
col
)
&
0x07
)
!=
0
))
{
int
pf_rate
[
3
];
int64_t
pf_dist
[
3
];
unsigned
int
pf_var
[
3
];
...
...
@@ -1721,7 +1722,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
vp9_build_inter_predictors_sby
(
xd
,
mi_row
,
mi_col
,
bsize
);
// For large partition blocks, extra testing is done.
if
(
bsize
>
BLOCK_32X32
&&
if
(
cpi
->
oxcf
.
rc_mode
==
VPX_CBR
&&
bsize
>
BLOCK_32X32
&&
!
cyclic_refresh_segment_id_boosted
(
xd
->
mi
[
0
]
->
segment_id
)
&&
cm
->
base_qindex
)
{
model_rd_for_sb_y_large
(
cpi
,
bsize
,
x
,
xd
,
&
this_rdc
.
rate
,
...
...
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