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
22368479
Commit
22368479
authored
Jun 10, 2014
by
Dmitry Kovalev
Committed by
Gerrit Code Review
Jun 10, 2014
Browse files
Merge "Removing chessboard_index from SPEED_FEATURES."
parents
96366011
923c30a1
Changes
5
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_encodeframe.c
View file @
22368479
...
...
@@ -1856,8 +1856,8 @@ static void auto_partition_range(VP9_COMP *cpi, const TileInfo *const tile,
BLOCK_SIZE
min_size
=
BLOCK_32X32
;
BLOCK_SIZE
max_size
=
BLOCK_8X8
;
int
bsl
=
mi_width_log2_lookup
[
BLOCK_64X64
];
int
search_range_ctrl
=
(((
mi_row
+
mi_col
)
>>
bsl
)
+
cpi
->
sf
.
chessboard_index
)
&
0x01
;
const
int
search_range_ctrl
=
(((
mi_row
+
mi_col
)
>>
bsl
)
+
get_
chessboard_index
(
cm
))
%
2
;
// Trap case where we do not have a prediction.
if
(
search_range_ctrl
&&
(
left_in_image
||
above_in_image
||
cm
->
frame_type
!=
KEY_FRAME
))
{
...
...
vp9/encoder/vp9_encoder.h
View file @
22368479
...
...
@@ -630,6 +630,10 @@ static INLINE void set_ref_ptrs(VP9_COMMON *cm, MACROBLOCKD *xd,
:
0
];
}
static
INLINE
int
get_chessboard_index
(
const
VP9_COMMON
*
cm
)
{
return
cm
->
current_video_frame
%
2
;
}
#ifdef __cplusplus
}
// extern "C"
#endif
...
...
vp9/encoder/vp9_pickmode.c
View file @
22368479
...
...
@@ -220,8 +220,8 @@ int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
int
mode_idx
[
MB_MODE_COUNT
]
=
{
0
};
INTERP_FILTER
filter_ref
=
SWITCHABLE
;
int
bsl
=
mi_width_log2_lookup
[
bsize
];
int
pred_filter_search
=
(((
mi_row
+
mi_col
)
>>
bsl
)
+
cpi
->
sf
.
chessboard_index
)
&
0x01
;
const
int
pred_filter_search
=
(((
mi_row
+
mi_col
)
>>
bsl
)
+
get_
chessboard_index
(
cm
))
%
2
;
x
->
skip_encode
=
cpi
->
sf
.
skip_encode_frame
&&
x
->
q_index
<
QIDX_SKIP_THRESH
;
...
...
vp9/encoder/vp9_speed_features.c
View file @
22368479
...
...
@@ -261,7 +261,6 @@ static void set_rt_speed_feature(VP9_COMP *cpi, SPEED_FEATURES *sf,
sf
->
use_nonrd_pick_mode
=
1
;
sf
->
search_method
=
FAST_DIAMOND
;
sf
->
allow_skip_recode
=
0
;
sf
->
chessboard_index
=
cm
->
current_video_frame
&
0x01
;
}
if
(
speed
>=
6
)
{
...
...
vp9/encoder/vp9_speed_features.h
View file @
22368479
...
...
@@ -284,9 +284,6 @@ typedef struct SPEED_FEATURES {
// encoding process for RTC.
int
partition_check
;
// Chessboard pattern index
int
chessboard_index
;
// Use finer quantizer in every other few frames that run variable block
// partition type search.
int
force_frame_boost
;
...
...
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