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

Merge "make default_interp_filter choice a speed feature"

Browse Source
This commit is contained in:
Yaowu Xu 2014-07-16 19:12:22 -07:00 committed by Gerrit Code Review
commit 42a68e6701
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vp9/encoder/vp9_encoder.c
View File

@ -51,8 +51,6 @@
void vp9_coef_tree_initialize(); void vp9_coef_tree_initialize();
#define DEFAULT_INTERP_FILTER SWITCHABLE
#define SHARP_FILTER_QTHRESH 0 /* Q threshold for 8-tap sharp filter */ #define SHARP_FILTER_QTHRESH 0 /* Q threshold for 8-tap sharp filter */
#define ALTREF_HIGH_PRECISION_MV 1 // Whether to use high precision mv #define ALTREF_HIGH_PRECISION_MV 1 // Whether to use high precision mv
@ -636,7 +634,7 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) {
rc->worst_quality = cpi->oxcf.worst_allowed_q; rc->worst_quality = cpi->oxcf.worst_allowed_q;
rc->best_quality = cpi->oxcf.best_allowed_q; rc->best_quality = cpi->oxcf.best_allowed_q;
cm->interp_filter = DEFAULT_INTERP_FILTER; cm->interp_filter = cpi->sf.default_interp_filter;
cm->display_width = cpi->oxcf.width; cm->display_width = cpi->oxcf.width;
cm->display_height = cpi->oxcf.height; cm->display_height = cpi->oxcf.height;
@ -2247,7 +2245,7 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi,
q = vp9_rc_pick_q_and_bounds(cpi, &bottom_index, &top_index); q = vp9_rc_pick_q_and_bounds(cpi, &bottom_index, &top_index);
if (!frame_is_intra_only(cm)) { if (!frame_is_intra_only(cm)) {
cm->interp_filter = DEFAULT_INTERP_FILTER; cm->interp_filter = cpi->sf.default_interp_filter;
/* TODO: Decide this more intelligently */ /* TODO: Decide this more intelligently */
vp9_set_high_precision_mv(cpi, q < HIGH_PRECISION_MV_QTHRESH); vp9_set_high_precision_mv(cpi, q < HIGH_PRECISION_MV_QTHRESH);
} }

1
vp9/encoder/vp9_speed_features.c
View File

@ -372,6 +372,7 @@ void vp9_set_speed_features(VP9_COMP *cpi) {
sf->elevate_newmv_thresh = 0; sf->elevate_newmv_thresh = 0;
// Recode loop tolerence %. // Recode loop tolerence %.
sf->recode_tolerance = 25; sf->recode_tolerance = 25;
sf->default_interp_filter = SWITCHABLE;
switch (oxcf->mode) { switch (oxcf->mode) {
case ONE_PASS_BEST: case ONE_PASS_BEST:

3
vp9/encoder/vp9_speed_features.h
View File

@ -366,6 +366,9 @@ typedef struct SPEED_FEATURES {
// In real time encoding, increase the threshold for NEWMV. // In real time encoding, increase the threshold for NEWMV.
int elevate_newmv_thresh; int elevate_newmv_thresh;
// default interp filter choice
INTERP_FILTER default_interp_filter;
} SPEED_FEATURES; } SPEED_FEATURES;
struct VP9_COMP; struct VP9_COMP;