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
da47b341
Commit
da47b341
authored
Feb 25, 2014
by
Yunqing Wang
Committed by
Gerrit Code Review
Feb 25, 2014
Browse files
Merge "Disable adaptive pred filter for non-split mode"
parents
b67bd637
fee045d1
Changes
2
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_encodeframe.c
View file @
da47b341
...
...
@@ -1931,14 +1931,17 @@ static void encode_sb_row(VP9_COMP *cpi, const TileInfo *const tile,
BLOCK_SIZE
i
;
MACROBLOCK
*
x
=
&
cpi
->
mb
;
for
(
i
=
BLOCK_4X4
;
i
<
BLOCK_8X8
;
++
i
)
{
const
int
num_4x4_w
=
num_4x4_blocks_wide_lookup
[
i
];
const
int
num_4x4_h
=
num_4x4_blocks_high_lookup
[
i
];
const
int
num_4x4_blk
=
MAX
(
4
,
num_4x4_w
*
num_4x4_h
);
for
(
x
->
sb_index
=
0
;
x
->
sb_index
<
4
;
++
x
->
sb_index
)
for
(
x
->
mb_index
=
0
;
x
->
mb_index
<
4
;
++
x
->
mb_index
)
for
(
x
->
b_index
=
0
;
x
->
b_index
<
16
/
num_4x4_blk
;
++
x
->
b_index
)
get_block_context
(
x
,
i
)
->
pred_interp_filter
=
SWITCHABLE
;
if
(
cpi
->
sf
.
adaptive_pred_interp_filter
)
{
for
(
i
=
BLOCK_4X4
;
i
<
BLOCK_8X8
;
++
i
)
{
const
int
num_4x4_w
=
num_4x4_blocks_wide_lookup
[
i
];
const
int
num_4x4_h
=
num_4x4_blocks_high_lookup
[
i
];
const
int
num_4x4_blk
=
MAX
(
4
,
num_4x4_w
*
num_4x4_h
);
for
(
x
->
sb_index
=
0
;
x
->
sb_index
<
4
;
++
x
->
sb_index
)
for
(
x
->
mb_index
=
0
;
x
->
mb_index
<
4
;
++
x
->
mb_index
)
for
(
x
->
b_index
=
0
;
x
->
b_index
<
16
/
num_4x4_blk
;
++
x
->
b_index
)
get_block_context
(
x
,
i
)
->
pred_interp_filter
=
SWITCHABLE
;
}
}
vp9_zero
(
cpi
->
mb
.
pred_mv
);
...
...
vp9/encoder/vp9_onyx_if.c
View file @
da47b341
...
...
@@ -977,6 +977,9 @@ void vp9_set_speed_features(VP9_COMP *cpi) {
if
(
cpi
->
encode_breakout
&&
cpi
->
oxcf
.
mode
==
MODE_REALTIME
&&
sf
->
encode_breakout_thresh
>
cpi
->
encode_breakout
)
cpi
->
encode_breakout
=
sf
->
encode_breakout_thresh
;
if
(
sf
->
disable_split_mask
==
DISABLE_ALL_SPLIT
)
sf
->
adaptive_pred_interp_filter
=
0
;
}
static
void
alloc_raw_frame_buffers
(
VP9_COMP
*
cpi
)
{
...
...
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