vp9_picklpf.c: remove unused functions and params
Change-Id: Ib4d850227cef35694c663feb157765a2cbf84699
This commit is contained in:
Родитель
9b57e1edd5
Коммит
023d2a21aa
|
@ -2665,7 +2665,6 @@ static void loopfilter_frame(VP9_COMP *cpi, VP9_COMMON *cm) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (lf->filter_level > 0) {
|
if (lf->filter_level > 0) {
|
||||||
vp9_set_alt_lf_level(cpi, lf->filter_level);
|
|
||||||
vp9_loop_filter_frame(cm, xd, lf->filter_level, 0, 0);
|
vp9_loop_filter_frame(cm, xd, lf->filter_level, 0, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -21,27 +21,18 @@
|
||||||
#include "vp9/common/vp9_loopfilter.h"
|
#include "vp9/common/vp9_loopfilter.h"
|
||||||
#include "./vpx_scale_rtcd.h"
|
#include "./vpx_scale_rtcd.h"
|
||||||
|
|
||||||
static int get_min_filter_level(VP9_COMP *cpi, int base_qindex) {
|
static int get_max_filter_level(VP9_COMP *cpi) {
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int get_max_filter_level(VP9_COMP *cpi, int base_qindex) {
|
|
||||||
return cpi->twopass.section_intra_rating > 8 ? MAX_LOOP_FILTER * 3 / 4
|
return cpi->twopass.section_intra_rating > 8 ? MAX_LOOP_FILTER * 3 / 4
|
||||||
: MAX_LOOP_FILTER;
|
: MAX_LOOP_FILTER;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Stub function for now Alt LF not used
|
|
||||||
void vp9_set_alt_lf_level(VP9_COMP *cpi, int filt_val) {
|
|
||||||
}
|
|
||||||
|
|
||||||
static int try_filter_frame(const YV12_BUFFER_CONFIG *sd, VP9_COMP *const cpi,
|
static int try_filter_frame(const YV12_BUFFER_CONFIG *sd, VP9_COMP *const cpi,
|
||||||
MACROBLOCKD *const xd, VP9_COMMON *const cm,
|
MACROBLOCKD *const xd, VP9_COMMON *const cm,
|
||||||
int filt_level, int partial_frame) {
|
int filt_level, int partial_frame) {
|
||||||
int filt_err;
|
int filt_err;
|
||||||
|
|
||||||
vp9_set_alt_lf_level(cpi, filt_level);
|
|
||||||
vp9_loop_filter_frame(cm, xd, filt_level, 1, partial_frame);
|
vp9_loop_filter_frame(cm, xd, filt_level, 1, partial_frame);
|
||||||
|
|
||||||
filt_err = vp9_calc_ss_err(sd, cm->frame_to_show);
|
filt_err = vp9_calc_ss_err(sd, cm->frame_to_show);
|
||||||
|
|
||||||
// Re-instate the unfiltered frame
|
// Re-instate the unfiltered frame
|
||||||
|
@ -55,8 +46,8 @@ static void search_filter_level(const YV12_BUFFER_CONFIG *sd, VP9_COMP *cpi,
|
||||||
MACROBLOCKD *const xd = &cpi->mb.e_mbd;
|
MACROBLOCKD *const xd = &cpi->mb.e_mbd;
|
||||||
VP9_COMMON *const cm = &cpi->common;
|
VP9_COMMON *const cm = &cpi->common;
|
||||||
struct loopfilter *const lf = &cm->lf;
|
struct loopfilter *const lf = &cm->lf;
|
||||||
const int min_filter_level = get_min_filter_level(cpi, cm->base_qindex);
|
const int min_filter_level = 0;
|
||||||
const int max_filter_level = get_max_filter_level(cpi, cm->base_qindex);
|
const int max_filter_level = get_max_filter_level(cpi);
|
||||||
int best_err;
|
int best_err;
|
||||||
int filt_best;
|
int filt_best;
|
||||||
int filt_direction = 0;
|
int filt_direction = 0;
|
||||||
|
@ -148,8 +139,8 @@ void vp9_pick_filter_level(const YV12_BUFFER_CONFIG *sd, VP9_COMP *cpi,
|
||||||
: cpi->oxcf.sharpness;
|
: cpi->oxcf.sharpness;
|
||||||
|
|
||||||
if (method == 2) {
|
if (method == 2) {
|
||||||
const int min_filter_level = get_min_filter_level(cpi, cm->base_qindex);
|
const int min_filter_level = 0;
|
||||||
const int max_filter_level = get_max_filter_level(cpi, cm->base_qindex);
|
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);
|
||||||
// These values were determined by linear fitting the result of the
|
// These values were determined by linear fitting the result of the
|
||||||
// searched level
|
// searched level
|
||||||
|
|
|
@ -19,8 +19,6 @@ extern "C" {
|
||||||
struct yv12_buffer_config;
|
struct yv12_buffer_config;
|
||||||
struct VP9_COMP;
|
struct VP9_COMP;
|
||||||
|
|
||||||
void vp9_set_alt_lf_level(struct VP9_COMP *cpi, int filt_val);
|
|
||||||
|
|
||||||
void vp9_pick_filter_level(const struct yv12_buffer_config *sd,
|
void vp9_pick_filter_level(const struct yv12_buffer_config *sd,
|
||||||
struct VP9_COMP *cpi, int method);
|
struct VP9_COMP *cpi, int method);
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
|
Загрузка…
Ссылка в новой задаче