Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
aom-rav1e
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xiph.Org
aom-rav1e
Commits
6fcabdd2
Commit
6fcabdd2
authored
Jan 13, 2014
by
Yaowu Xu
Committed by
Gerrit Code Review
Jan 13, 2014
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Enable reference frame masking for rt mode"
parents
7c52a3a2
5e5d4c0e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
174 additions
and
176 deletions
+174
-176
vp9/encoder/vp9_onyx_if.c
vp9/encoder/vp9_onyx_if.c
+174
-176
No files found.
vp9/encoder/vp9_onyx_if.c
View file @
6fcabdd2
...
...
@@ -581,6 +581,177 @@ static void set_rd_speed_thresholds_sub8x8(VP9_COMP *cpi, int mode) {
sf
->
thresh_mult_sub8x8
[
THR_COMP_GA
]
=
INT_MAX
;
}
static
void
set_good_speed_feature
(
VP9_COMMON
*
cm
,
SPEED_FEATURES
*
sf
,
int
speed
)
{
int
i
;
sf
->
adaptive_rd_thresh
=
1
;
sf
->
recode_loop
=
(
speed
<
1
);
if
(
speed
==
1
)
{
sf
->
use_square_partition_only
=
!
frame_is_intra_only
(
cm
);
sf
->
less_rectangular_check
=
1
;
sf
->
tx_size_search_method
=
frame_is_intra_only
(
cm
)
?
USE_FULL_RD
:
USE_LARGESTALL
;
if
(
MIN
(
cm
->
width
,
cm
->
height
)
>=
720
)
sf
->
disable_split_mask
=
cm
->
show_frame
?
DISABLE_ALL_SPLIT
:
DISABLE_ALL_INTER_SPLIT
;
else
sf
->
disable_split_mask
=
DISABLE_COMPOUND_SPLIT
;
sf
->
use_rd_breakout
=
1
;
sf
->
adaptive_motion_search
=
1
;
sf
->
adaptive_pred_filter_type
=
1
;
sf
->
auto_mv_step_size
=
1
;
sf
->
adaptive_rd_thresh
=
2
;
sf
->
recode_loop
=
2
;
sf
->
intra_y_mode_mask
[
TX_32X32
]
=
INTRA_DC_H_V
;
sf
->
intra_uv_mode_mask
[
TX_32X32
]
=
INTRA_DC_H_V
;
sf
->
intra_uv_mode_mask
[
TX_16X16
]
=
INTRA_DC_H_V
;
}
if
(
speed
==
2
)
{
sf
->
use_square_partition_only
=
!
frame_is_intra_only
(
cm
);
sf
->
less_rectangular_check
=
1
;
sf
->
tx_size_search_method
=
frame_is_intra_only
(
cm
)
?
USE_FULL_RD
:
USE_LARGESTALL
;
if
(
MIN
(
cm
->
width
,
cm
->
height
)
>=
720
)
sf
->
disable_split_mask
=
cm
->
show_frame
?
DISABLE_ALL_SPLIT
:
DISABLE_ALL_INTER_SPLIT
;
else
sf
->
disable_split_mask
=
LAST_AND_INTRA_SPLIT_ONLY
;
sf
->
mode_search_skip_flags
=
FLAG_SKIP_INTRA_DIRMISMATCH
|
FLAG_SKIP_INTRA_BESTINTER
|
FLAG_SKIP_COMP_BESTINTRA
|
FLAG_SKIP_INTRA_LOWVAR
;
sf
->
use_rd_breakout
=
1
;
sf
->
adaptive_motion_search
=
1
;
sf
->
adaptive_pred_filter_type
=
2
;
sf
->
reference_masking
=
1
;
sf
->
auto_mv_step_size
=
1
;
sf
->
disable_filter_search_var_thresh
=
50
;
sf
->
comp_inter_joint_search_thresh
=
BLOCK_SIZES
;
sf
->
auto_min_max_partition_size
=
1
;
sf
->
use_lastframe_partitioning
=
LAST_FRAME_PARTITION_LOW_MOTION
;
sf
->
adjust_partitioning_from_last_frame
=
1
;
sf
->
last_partitioning_redo_frequency
=
3
;
sf
->
adaptive_rd_thresh
=
2
;
sf
->
recode_loop
=
2
;
sf
->
use_lp32x32fdct
=
1
;
sf
->
mode_skip_start
=
11
;
sf
->
intra_y_mode_mask
[
TX_32X32
]
=
INTRA_DC_H_V
;
sf
->
intra_y_mode_mask
[
TX_16X16
]
=
INTRA_DC_H_V
;
sf
->
intra_uv_mode_mask
[
TX_32X32
]
=
INTRA_DC_H_V
;
sf
->
intra_uv_mode_mask
[
TX_16X16
]
=
INTRA_DC_H_V
;
}
if
(
speed
==
3
)
{
sf
->
use_square_partition_only
=
1
;
sf
->
tx_size_search_method
=
USE_LARGESTALL
;
if
(
MIN
(
cm
->
width
,
cm
->
height
)
>=
720
)
sf
->
disable_split_mask
=
DISABLE_ALL_SPLIT
;
else
sf
->
disable_split_mask
=
DISABLE_ALL_INTER_SPLIT
;
sf
->
mode_search_skip_flags
=
FLAG_SKIP_INTRA_DIRMISMATCH
|
FLAG_SKIP_INTRA_BESTINTER
|
FLAG_SKIP_COMP_BESTINTRA
|
FLAG_SKIP_INTRA_LOWVAR
;
sf
->
use_rd_breakout
=
1
;
sf
->
adaptive_motion_search
=
1
;
sf
->
adaptive_pred_filter_type
=
2
;
sf
->
reference_masking
=
1
;
sf
->
auto_mv_step_size
=
1
;
sf
->
disable_filter_search_var_thresh
=
100
;
sf
->
comp_inter_joint_search_thresh
=
BLOCK_SIZES
;
sf
->
auto_min_max_partition_size
=
1
;
sf
->
use_lastframe_partitioning
=
LAST_FRAME_PARTITION_ALL
;
sf
->
adjust_partitioning_from_last_frame
=
1
;
sf
->
last_partitioning_redo_frequency
=
3
;
sf
->
use_uv_intra_rd_estimate
=
1
;
sf
->
skip_encode_sb
=
1
;
sf
->
use_lp32x32fdct
=
1
;
sf
->
subpel_iters_per_step
=
1
;
sf
->
use_fast_coef_updates
=
2
;
sf
->
adaptive_rd_thresh
=
4
;
sf
->
mode_skip_start
=
6
;
}
if
(
speed
==
4
)
{
sf
->
use_square_partition_only
=
1
;
sf
->
tx_size_search_method
=
USE_LARGESTALL
;
sf
->
disable_split_mask
=
DISABLE_ALL_SPLIT
;
sf
->
mode_search_skip_flags
=
FLAG_SKIP_INTRA_DIRMISMATCH
|
FLAG_SKIP_INTRA_BESTINTER
|
FLAG_SKIP_COMP_BESTINTRA
|
FLAG_SKIP_COMP_REFMISMATCH
|
FLAG_SKIP_INTRA_LOWVAR
|
FLAG_EARLY_TERMINATE
;
sf
->
use_rd_breakout
=
1
;
sf
->
adaptive_motion_search
=
1
;
sf
->
adaptive_pred_filter_type
=
2
;
sf
->
reference_masking
=
1
;
sf
->
auto_mv_step_size
=
1
;
sf
->
disable_filter_search_var_thresh
=
200
;
sf
->
comp_inter_joint_search_thresh
=
BLOCK_SIZES
;
sf
->
auto_min_max_partition_size
=
1
;
sf
->
use_lastframe_partitioning
=
LAST_FRAME_PARTITION_ALL
;
sf
->
adjust_partitioning_from_last_frame
=
1
;
sf
->
last_partitioning_redo_frequency
=
3
;
sf
->
use_uv_intra_rd_estimate
=
1
;
sf
->
skip_encode_sb
=
1
;
sf
->
use_lp32x32fdct
=
1
;
sf
->
subpel_iters_per_step
=
1
;
sf
->
use_fast_coef_updates
=
2
;
sf
->
adaptive_rd_thresh
=
4
;
sf
->
mode_skip_start
=
6
;
}
if
(
speed
==
5
)
{
sf
->
comp_inter_joint_search_thresh
=
BLOCK_SIZES
;
sf
->
use_one_partition_size_always
=
1
;
sf
->
always_this_block_size
=
BLOCK_16X16
;
sf
->
tx_size_search_method
=
frame_is_intra_only
(
cm
)
?
USE_FULL_RD
:
USE_LARGESTALL
;
sf
->
mode_search_skip_flags
=
FLAG_SKIP_INTRA_DIRMISMATCH
|
FLAG_SKIP_INTRA_BESTINTER
|
FLAG_SKIP_COMP_BESTINTRA
|
FLAG_SKIP_COMP_REFMISMATCH
|
FLAG_SKIP_INTRA_LOWVAR
|
FLAG_EARLY_TERMINATE
;
sf
->
use_rd_breakout
=
1
;
sf
->
use_lp32x32fdct
=
1
;
sf
->
optimize_coefficients
=
0
;
sf
->
auto_mv_step_size
=
1
;
sf
->
reference_masking
=
1
;
sf
->
disable_split_mask
=
DISABLE_ALL_SPLIT
;
sf
->
search_method
=
HEX
;
sf
->
subpel_iters_per_step
=
1
;
sf
->
disable_split_var_thresh
=
64
;
sf
->
disable_filter_search_var_thresh
=
500
;
for
(
i
=
0
;
i
<
TX_SIZES
;
i
++
)
{
sf
->
intra_y_mode_mask
[
i
]
=
INTRA_DC_ONLY
;
sf
->
intra_uv_mode_mask
[
i
]
=
INTRA_DC_ONLY
;
}
sf
->
use_fast_coef_updates
=
2
;
sf
->
adaptive_rd_thresh
=
4
;
sf
->
mode_skip_start
=
6
;
}
}
static
void
set_rt_speed_feature
(
VP9_COMMON
*
cm
,
SPEED_FEATURES
*
sf
,
int
speed
)
{
...
...
@@ -629,6 +800,7 @@ static void set_rt_speed_feature(VP9_COMMON *cm,
sf
->
adaptive_motion_search
=
1
;
sf
->
adaptive_pred_filter_type
=
2
;
sf
->
auto_mv_step_size
=
1
;
sf
->
reference_masking
=
1
;
sf
->
disable_filter_search_var_thresh
=
50
;
sf
->
comp_inter_joint_search_thresh
=
BLOCK_SIZES
;
...
...
@@ -743,182 +915,8 @@ void vp9_set_speed_features(VP9_COMP *cpi) {
cpi
->
diamond_search_sad
=
vp9_full_range_search
;
break
;
case
1
:
sf
->
adaptive_rd_thresh
=
1
;
sf
->
recode_loop
=
(
speed
<
1
);
if
(
speed
==
1
)
{
sf
->
use_square_partition_only
=
!
frame_is_intra_only
(
cm
);
sf
->
less_rectangular_check
=
1
;
sf
->
tx_size_search_method
=
frame_is_intra_only
(
cm
)
?
USE_FULL_RD
:
USE_LARGESTALL
;
if
(
MIN
(
cm
->
width
,
cm
->
height
)
>=
720
)
sf
->
disable_split_mask
=
cm
->
show_frame
?
DISABLE_ALL_SPLIT
:
DISABLE_ALL_INTER_SPLIT
;
else
sf
->
disable_split_mask
=
DISABLE_COMPOUND_SPLIT
;
sf
->
use_rd_breakout
=
1
;
sf
->
adaptive_motion_search
=
1
;
sf
->
adaptive_pred_filter_type
=
1
;
sf
->
auto_mv_step_size
=
1
;
sf
->
adaptive_rd_thresh
=
2
;
sf
->
recode_loop
=
2
;
sf
->
intra_y_mode_mask
[
TX_32X32
]
=
INTRA_DC_H_V
;
sf
->
intra_uv_mode_mask
[
TX_32X32
]
=
INTRA_DC_H_V
;
sf
->
intra_uv_mode_mask
[
TX_16X16
]
=
INTRA_DC_H_V
;
}
if
(
speed
==
2
)
{
sf
->
use_square_partition_only
=
!
frame_is_intra_only
(
cm
);
sf
->
less_rectangular_check
=
1
;
sf
->
tx_size_search_method
=
frame_is_intra_only
(
cm
)
?
USE_FULL_RD
:
USE_LARGESTALL
;
if
(
MIN
(
cm
->
width
,
cm
->
height
)
>=
720
)
sf
->
disable_split_mask
=
cm
->
show_frame
?
DISABLE_ALL_SPLIT
:
DISABLE_ALL_INTER_SPLIT
;
else
sf
->
disable_split_mask
=
LAST_AND_INTRA_SPLIT_ONLY
;
sf
->
mode_search_skip_flags
=
FLAG_SKIP_INTRA_DIRMISMATCH
|
FLAG_SKIP_INTRA_BESTINTER
|
FLAG_SKIP_COMP_BESTINTRA
|
FLAG_SKIP_INTRA_LOWVAR
;
sf
->
use_rd_breakout
=
1
;
sf
->
adaptive_motion_search
=
1
;
sf
->
adaptive_pred_filter_type
=
2
;
sf
->
reference_masking
=
1
;
sf
->
auto_mv_step_size
=
1
;
sf
->
disable_filter_search_var_thresh
=
50
;
sf
->
comp_inter_joint_search_thresh
=
BLOCK_SIZES
;
sf
->
auto_min_max_partition_size
=
1
;
sf
->
use_lastframe_partitioning
=
LAST_FRAME_PARTITION_LOW_MOTION
;
sf
->
adjust_partitioning_from_last_frame
=
1
;
sf
->
last_partitioning_redo_frequency
=
3
;
sf
->
adaptive_rd_thresh
=
2
;
sf
->
recode_loop
=
2
;
sf
->
use_lp32x32fdct
=
1
;
sf
->
mode_skip_start
=
11
;
sf
->
intra_y_mode_mask
[
TX_32X32
]
=
INTRA_DC_H_V
;
sf
->
intra_y_mode_mask
[
TX_16X16
]
=
INTRA_DC_H_V
;
sf
->
intra_uv_mode_mask
[
TX_32X32
]
=
INTRA_DC_H_V
;
sf
->
intra_uv_mode_mask
[
TX_16X16
]
=
INTRA_DC_H_V
;
}
if
(
speed
==
3
)
{
sf
->
use_square_partition_only
=
1
;
sf
->
tx_size_search_method
=
USE_LARGESTALL
;
if
(
MIN
(
cm
->
width
,
cm
->
height
)
>=
720
)
sf
->
disable_split_mask
=
DISABLE_ALL_SPLIT
;
else
sf
->
disable_split_mask
=
DISABLE_ALL_INTER_SPLIT
;
sf
->
mode_search_skip_flags
=
FLAG_SKIP_INTRA_DIRMISMATCH
|
FLAG_SKIP_INTRA_BESTINTER
|
FLAG_SKIP_COMP_BESTINTRA
|
FLAG_SKIP_INTRA_LOWVAR
;
sf
->
use_rd_breakout
=
1
;
sf
->
adaptive_motion_search
=
1
;
sf
->
adaptive_pred_filter_type
=
2
;
sf
->
reference_masking
=
1
;
sf
->
auto_mv_step_size
=
1
;
sf
->
disable_filter_search_var_thresh
=
100
;
sf
->
comp_inter_joint_search_thresh
=
BLOCK_SIZES
;
sf
->
auto_min_max_partition_size
=
1
;
sf
->
use_lastframe_partitioning
=
LAST_FRAME_PARTITION_ALL
;
sf
->
adjust_partitioning_from_last_frame
=
1
;
sf
->
last_partitioning_redo_frequency
=
3
;
sf
->
use_uv_intra_rd_estimate
=
1
;
sf
->
skip_encode_sb
=
1
;
sf
->
use_lp32x32fdct
=
1
;
sf
->
subpel_iters_per_step
=
1
;
sf
->
use_fast_coef_updates
=
2
;
sf
->
adaptive_rd_thresh
=
4
;
sf
->
mode_skip_start
=
6
;
}
if
(
speed
==
4
)
{
sf
->
use_square_partition_only
=
1
;
sf
->
tx_size_search_method
=
USE_LARGESTALL
;
sf
->
disable_split_mask
=
DISABLE_ALL_SPLIT
;
sf
->
mode_search_skip_flags
=
FLAG_SKIP_INTRA_DIRMISMATCH
|
FLAG_SKIP_INTRA_BESTINTER
|
FLAG_SKIP_COMP_BESTINTRA
|
FLAG_SKIP_COMP_REFMISMATCH
|
FLAG_SKIP_INTRA_LOWVAR
|
FLAG_EARLY_TERMINATE
;
sf
->
use_rd_breakout
=
1
;
sf
->
adaptive_motion_search
=
1
;
sf
->
adaptive_pred_filter_type
=
2
;
sf
->
reference_masking
=
1
;
sf
->
auto_mv_step_size
=
1
;
sf
->
disable_filter_search_var_thresh
=
200
;
sf
->
comp_inter_joint_search_thresh
=
BLOCK_SIZES
;
sf
->
auto_min_max_partition_size
=
1
;
sf
->
use_lastframe_partitioning
=
LAST_FRAME_PARTITION_ALL
;
sf
->
adjust_partitioning_from_last_frame
=
1
;
sf
->
last_partitioning_redo_frequency
=
3
;
sf
->
use_uv_intra_rd_estimate
=
1
;
sf
->
skip_encode_sb
=
1
;
sf
->
use_lp32x32fdct
=
1
;
sf
->
subpel_iters_per_step
=
1
;
sf
->
use_fast_coef_updates
=
2
;
sf
->
adaptive_rd_thresh
=
4
;
sf
->
mode_skip_start
=
6
;
/* sf->intra_y_mode_mask = INTRA_DC_ONLY;
sf->intra_uv_mode_mask = INTRA_DC_ONLY;
sf->search_method = BIGDIA;
sf->disable_split_var_thresh = 64;
sf->disable_filter_search_var_thresh = 64; */
}
if
(
speed
==
5
)
{
sf
->
comp_inter_joint_search_thresh
=
BLOCK_SIZES
;
sf
->
use_one_partition_size_always
=
1
;
sf
->
always_this_block_size
=
BLOCK_16X16
;
sf
->
tx_size_search_method
=
frame_is_intra_only
(
cm
)
?
USE_FULL_RD
:
USE_LARGESTALL
;
sf
->
mode_search_skip_flags
=
FLAG_SKIP_INTRA_DIRMISMATCH
|
FLAG_SKIP_INTRA_BESTINTER
|
FLAG_SKIP_COMP_BESTINTRA
|
FLAG_SKIP_COMP_REFMISMATCH
|
FLAG_SKIP_INTRA_LOWVAR
|
FLAG_EARLY_TERMINATE
;
sf
->
use_rd_breakout
=
1
;
sf
->
use_lp32x32fdct
=
1
;
sf
->
optimize_coefficients
=
0
;
sf
->
auto_mv_step_size
=
1
;
// sf->reduce_first_step_size = 1;
// sf->reference_masking = 1;
sf
->
disable_split_mask
=
DISABLE_ALL_SPLIT
;
sf
->
search_method
=
HEX
;
sf
->
subpel_iters_per_step
=
1
;
sf
->
disable_split_var_thresh
=
64
;
sf
->
disable_filter_search_var_thresh
=
500
;
for
(
i
=
0
;
i
<
TX_SIZES
;
i
++
)
{
sf
->
intra_y_mode_mask
[
i
]
=
INTRA_DC_ONLY
;
sf
->
intra_uv_mode_mask
[
i
]
=
INTRA_DC_ONLY
;
}
sf
->
use_fast_coef_updates
=
2
;
sf
->
adaptive_rd_thresh
=
4
;
sf
->
mode_skip_start
=
6
;
}
set_good_speed_feature
(
cm
,
sf
,
speed
);
break
;
break
;
case
2
:
set_rt_speed_feature
(
cm
,
sf
,
speed
);
...
...
Write
Preview
Markdown
is supported
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