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

Removing local set_speed_features() function.

Browse Source 
The function was called in two places. In the first case it is replaced
with vp9_set_speed_features() call. In the second case the body of set_speed_features() is inlined.

Change-Id: If3fdf1b4168eee97677c224f69c245fe46c7f606
This commit is contained in:
Dmitry Kovalev 2014-08-22 15:59:13 -07:00
parent 310f5a769c
commit 4b60d4a3e8
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
vp9/encoder/vp9_encoder.c
View File

@ -420,21 +420,6 @@ static void update_reference_segmentation_map(VP9_COMP *cpi) {
}
}
static void set_speed_features(VP9_COMP *cpi) {
#if CONFIG_INTERNAL_STATS
int i;
for (i = 0; i < MAX_MODES; ++i)
cpi->mode_chosen_counts[i] = 0;
#endif
vp9_set_speed_features(cpi);
// Set rd thresholds based on mode and speed setting
vp9_set_rd_speed_thresholds(cpi);
vp9_set_rd_speed_thresholds_sub8x8(cpi);
}
static void alloc_raw_frame_buffers(VP9_COMP *cpi) {
VP9_COMMON *cm = &cpi->common;
const VP9EncoderConfig *oxcf = &cpi->oxcf;
@ -958,7 +943,7 @@ VP9_COMP *vp9_create_compressor(VP9EncoderConfig *oxcf) {
}
}
set_speed_features(cpi);
vp9_set_speed_features(cpi);
// Allocate memory to store variances for a frame.
CHECK_MEM_ERROR(cm, cpi->source_diff_var,
@ -2177,7 +2162,16 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi,
}
#endif
set_speed_features(cpi);
#if CONFIG_INTERNAL_STATS
int i;
for (i = 0; i < MAX_MODES; ++i)
cpi->mode_chosen_counts[i] = 0;
#endif
vp9_set_speed_features(cpi);
vp9_set_rd_speed_thresholds(cpi);
vp9_set_rd_speed_thresholds_sub8x8(cpi);
// Decide q and q bounds.
q = vp9_rc_pick_q_and_bounds(cpi, &bottom_index, &top_index);