Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
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
2e300633
Commit
2e300633
authored
May 10, 2017
by
Thomas Daede
Browse files
Remove SOURCE_VAR_BASED_PARTITION.
BUG=aomedia:526 Change-Id: I8271a3c18ac9fa53b6304eb5e2a07ba787b05724
parent
11a07949
Changes
4
Hide whitespace changes
Inline
Side-by-side
av1/encoder/encodeframe.h
View file @
2e300633
...
...
@@ -25,13 +25,6 @@ struct yv12_buffer_config;
struct
AV1_COMP
;
struct
ThreadData
;
// Constants used in SOURCE_VAR_BASED_PARTITION
#define VAR_HIST_MAX_BG_VAR 1000
#define VAR_HIST_FACTOR 10
#define VAR_HIST_BINS (VAR_HIST_MAX_BG_VAR / VAR_HIST_FACTOR + 1)
#define VAR_HIST_LARGE_CUT_OFF 75
#define VAR_HIST_SMALL_CUT_OFF 45
void
av1_setup_src_planes
(
struct
macroblock
*
x
,
const
struct
yv12_buffer_config
*
src
,
int
mi_row
,
int
mi_col
);
...
...
av1/encoder/encoder.c
View file @
2e300633
...
...
@@ -490,10 +490,6 @@ static void dealloc_compressor_data(AV1_COMP *cpi) {
aom_free
(
cpi
->
td
.
mb
.
palette_buffer
);
#endif // CONFIG_PALETTE
if
(
cpi
->
source_diff_var
!=
NULL
)
{
aom_free
(
cpi
->
source_diff_var
);
cpi
->
source_diff_var
=
NULL
;
}
#if CONFIG_ANS
aom_buf_ans_free
(
&
cpi
->
buf_ans
);
#endif // CONFIG_ANS
...
...
@@ -2521,12 +2517,6 @@ AV1_COMP *av1_create_compressor(AV1EncoderConfig *oxcf,
av1_set_speed_features_framesize_independent
(
cpi
);
av1_set_speed_features_framesize_dependent
(
cpi
);
// Allocate memory to store variances for a frame.
CHECK_MEM_ERROR
(
cm
,
cpi
->
source_diff_var
,
aom_calloc
(
cm
->
MBs
,
sizeof
(
*
cpi
->
source_diff_var
)));
cpi
->
source_var_thresh
=
0
;
cpi
->
frames_till_next_var_check
=
0
;
#define BFP(BT, SDF, SDAF, VF, SVF, SVAF, SDX3F, SDX8F, SDX4DF) \
cpi->fn_ptr[BT].sdf = SDF; \
cpi->fn_ptr[BT].sdaf = SDAF; \
...
...
av1/encoder/encoder.h
View file @
2e300633
...
...
@@ -538,12 +538,6 @@ typedef struct AV1_COMP {
// number of MBs in the current frame when the frame is
// scaled.
// Store frame variance info in SOURCE_VAR_BASED_PARTITION search type.
DIFF
*
source_diff_var
;
// The threshold used in SOURCE_VAR_BASED_PARTITION search type.
unsigned
int
source_var_thresh
;
int
frames_till_next_var_check
;
int
frame_flags
;
search_site_config
ss_cfg
;
...
...
av1/encoder/speed_features.h
View file @
2e300633
...
...
@@ -199,10 +199,7 @@ typedef enum {
// Use an arbitrary partitioning scheme based on source variance within
// a 64X64 SB
VAR_BASED_PARTITION
,
// Use non-fixed partitions based on source variance
SOURCE_VAR_BASED_PARTITION
VAR_BASED_PARTITION
}
PARTITION_SEARCH_TYPE
;
typedef
enum
{
...
...
@@ -439,7 +436,7 @@ typedef struct SPEED_FEATURES {
// TODO(aconverse): Fold this into one of the other many mode skips
BLOCK_SIZE
max_intra_bsize
;
// The frequency that we check if
SOURCE_VAR_BASED_PARTITION or
// The frequency that we check if
// FIXED_PARTITION search type should be used.
int
search_type_check_frequency
;
...
...
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