Commit 0e79906d authored by Yaowu Xu's avatar Yaowu Xu Committed by Gerrit Code Review
Browse files

Merge "Allow encoder to set lpf level to 0"

parents 303aa7e4 d0cb273e
...@@ -144,7 +144,9 @@ void vp9_pick_filter_level(const YV12_BUFFER_CONFIG *sd, VP9_COMP *cpi, ...@@ -144,7 +144,9 @@ void vp9_pick_filter_level(const YV12_BUFFER_CONFIG *sd, VP9_COMP *cpi,
lf->sharpness_level = cm->frame_type == KEY_FRAME ? 0 lf->sharpness_level = cm->frame_type == KEY_FRAME ? 0
: cpi->oxcf.sharpness; : cpi->oxcf.sharpness;
if (method == LPF_PICK_FROM_Q) { if (method == LPF_PICK_MINIMAL_LPF && lf->filter_level) {
lf->filter_level = 0;
} else if (method >= LPF_PICK_FROM_Q) {
const int min_filter_level = 0; const int min_filter_level = 0;
const int max_filter_level = get_max_filter_level(cpi); const int max_filter_level = get_max_filter_level(cpi);
const int q = vp9_ac_quant(cm->base_qindex, 0); const int q = vp9_ac_quant(cm->base_qindex, 0);
......
...@@ -280,7 +280,7 @@ static void set_rt_speed_feature(VP9_COMP *cpi, SPEED_FEATURES *sf, ...@@ -280,7 +280,7 @@ static void set_rt_speed_feature(VP9_COMP *cpi, SPEED_FEATURES *sf,
sf->reuse_inter_pred_sby = 1; sf->reuse_inter_pred_sby = 1;
} }
if (speed >= 7) { if (speed >= 7) {
sf->disable_filter_search_var_thresh = 1000; sf->lpf_pick = LPF_PICK_MINIMAL_LPF;
} }
if (speed >= 8) { if (speed >= 8) {
int i; int i;
......
...@@ -73,6 +73,8 @@ typedef enum { ...@@ -73,6 +73,8 @@ typedef enum {
LPF_PICK_FROM_SUBIMAGE, LPF_PICK_FROM_SUBIMAGE,
// Estimate the level based on quantizer and frame type // Estimate the level based on quantizer and frame type
LPF_PICK_FROM_Q, LPF_PICK_FROM_Q,
// Pick 0 to disable LPF if LPF was enabled last frame
LPF_PICK_MINIMAL_LPF
} LPF_PICK_METHOD; } LPF_PICK_METHOD;
typedef enum { typedef enum {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment