generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Remove a unused speed feature"

Browse Source
This commit is contained in:
Yunqing Wang 2014-08-15 15:22:33 -07:00 committed by Gerrit Code Review
commit c2ac7da981
3 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vp9/encoder/vp9_encodeframe.c
View File

@ -2060,17 +2060,6 @@ static void rd_pick_partition(VP9_COMP *cpi, const TileInfo *const tile,
save_context(cpi, mi_row, mi_col, a, l, sa, sl, bsize); save_context(cpi, mi_row, mi_col, a, l, sa, sl, bsize);
if (cpi->sf.disable_split_var_thresh && partition_none_allowed) {
unsigned int source_variancey;
vp9_setup_src_planes(x, cpi->Source, mi_row, mi_col);
source_variancey = get_sby_perpixel_variance(cpi, &x->plane[0].src, bsize);
if (source_variancey < cpi->sf.disable_split_var_thresh) {
do_split = 0;
if (source_variancey < cpi->sf.disable_split_var_thresh / 2)
do_rect = 0;
}
}
#if CONFIG_FP_MB_STATS #if CONFIG_FP_MB_STATS
if (cpi->use_fp_mb_stats) { if (cpi->use_fp_mb_stats) {
set_offsets(cpi, tile, mi_row, mi_col, bsize); set_offsets(cpi, tile, mi_row, mi_col, bsize);

1
vp9/encoder/vp9_speed_features.c
View File

@ -362,7 +362,6 @@ void vp9_set_speed_features(VP9_COMP *cpi) {
sf->mode_search_skip_flags = 0; sf->mode_search_skip_flags = 0;
sf->force_frame_boost = 0; sf->force_frame_boost = 0;
sf->max_delta_qindex = 0; sf->max_delta_qindex = 0;
sf->disable_split_var_thresh = 0;
sf->disable_filter_search_var_thresh = 0; sf->disable_filter_search_var_thresh = 0;
for (i = 0; i < TX_SIZES; i++) { for (i = 0; i < TX_SIZES; i++) {
sf->intra_y_mode_mask[i] = INTRA_ALL; sf->intra_y_mode_mask[i] = INTRA_ALL;

3
vp9/encoder/vp9_speed_features.h
View File

@ -309,9 +309,6 @@ typedef struct SPEED_FEATURES {
// defined in the MODE_SEARCH_SKIP_HEURISTICS enum // defined in the MODE_SEARCH_SKIP_HEURISTICS enum
unsigned int mode_search_skip_flags; unsigned int mode_search_skip_flags;
// A source variance threshold below which the split mode is disabled
unsigned int disable_split_var_thresh;
// A source variance threshold below which filter search is disabled // A source variance threshold below which filter search is disabled
// Choose a very large value (UINT_MAX) to use 8-tap always // Choose a very large value (UINT_MAX) to use 8-tap always
unsigned int disable_filter_search_var_thresh; unsigned int disable_filter_search_var_thresh;