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
801b77d4
Commit
801b77d4
authored
Oct 15, 2014
by
Jingning Han
Committed by
Gerrit Code Review
Oct 15, 2014
Browse files
Merge "Replace copy_partitioning use case with choose_partitioning"
parents
c113457a
89b8c7a5
Changes
2
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_encodeframe.c
View file @
801b77d4
...
...
@@ -3158,7 +3158,6 @@ static void encode_nonrd_sb_row(VP9_COMP *cpi, const TileInfo *const tile,
int64_t
dummy_dist
=
0
;
const
int
idx_str
=
cm
->
mi_stride
*
mi_row
+
mi_col
;
MODE_INFO
*
mi
=
cm
->
mi
+
idx_str
;
MODE_INFO
*
prev_mi
=
(
cm
->
prev_mip
+
cm
->
mi_stride
+
1
+
idx_str
)
->
src_mi
;
BLOCK_SIZE
bsize
;
x
->
in_static_area
=
0
;
x
->
source_variance
=
UINT_MAX
;
...
...
@@ -3196,7 +3195,7 @@ static void encode_nonrd_sb_row(VP9_COMP *cpi, const TileInfo *const tile,
&
dummy_rate
,
&
dummy_dist
,
1
,
INT64_MAX
,
cpi
->
pc_root
);
}
else
{
c
opy
_partitioning
(
c
m
,
mi
,
prev_mi
);
c
hoose
_partitioning
(
c
pi
,
tile
,
mi_row
,
mi_col
);
nonrd_use_partition
(
cpi
,
tile
,
mi
,
tp
,
mi_row
,
mi_col
,
BLOCK_64X64
,
1
,
&
dummy_rate
,
&
dummy_dist
,
cpi
->
pc_root
);
...
...
vp9/encoder/vp9_speed_features.c
View file @
801b77d4
...
...
@@ -271,6 +271,10 @@ static void set_rt_speed_feature(VP9_COMP *cpi, SPEED_FEATURES *sf,
sf
->
partition_search_type
=
REFERENCE_PARTITION
;
sf
->
use_nonrd_pick_mode
=
1
;
sf
->
allow_skip_recode
=
0
;
sf
->
inter_mode_mask
[
BLOCK_32X32
]
=
INTER_NEAREST_NEW_ZERO
;
sf
->
inter_mode_mask
[
BLOCK_32X64
]
=
INTER_NEAREST_NEW_ZERO
;
sf
->
inter_mode_mask
[
BLOCK_64X32
]
=
INTER_NEAREST_NEW_ZERO
;
sf
->
inter_mode_mask
[
BLOCK_64X64
]
=
INTER_NEAREST_NEW_ZERO
;
}
if
(
speed
>=
6
)
{
...
...
@@ -285,10 +289,6 @@ static void set_rt_speed_feature(VP9_COMP *cpi, SPEED_FEATURES *sf,
sf
->
partition_search_type
=
VAR_BASED_PARTITION
;
sf
->
search_type_check_frequency
=
50
;
sf
->
mv
.
search_method
=
NSTEP
;
sf
->
inter_mode_mask
[
BLOCK_32X32
]
=
INTER_NEAREST_NEW_ZERO
;
sf
->
inter_mode_mask
[
BLOCK_32X64
]
=
INTER_NEAREST_NEW_ZERO
;
sf
->
inter_mode_mask
[
BLOCK_64X32
]
=
INTER_NEAREST_NEW_ZERO
;
sf
->
inter_mode_mask
[
BLOCK_64X64
]
=
INTER_NEAREST_NEW_ZERO
;
sf
->
tx_size_search_method
=
is_keyframe
?
USE_LARGESTALL
:
USE_TX_8X8
;
...
...
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