shithub: libvpx

Download patch

ref: bdb1e7e05fad271303146244b333e3135e17f8ed
parent: e337322e632cdbc5a5444e60740ee7b1e560e49c
parent: 023d2a21aa0ca95e1879a97011c62c8c57c214a4
author: Yaowu Xu <yaowu@google.com>
date: Wed Mar 5 10:39:44 EST 2014 

Merge "vp9_picklpf.c: remove unused functions and params"


--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -2665,7 +2665,6 @@
   }
 
   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);
   }
 
--- a/vp9/encoder/vp9_picklpf.c
+++ b/vp9/encoder/vp9_picklpf.c
@@ -21,18 +21,11 @@
 #include "vp9/common/vp9_loopfilter.h"
 #include "./vpx_scale_rtcd.h"
 
-static int get_min_filter_level(VP9_COMP *cpi, int base_qindex) {
-  return 0;
-}
-
-static int get_max_filter_level(VP9_COMP *cpi, int base_qindex) {
+static int get_max_filter_level(VP9_COMP *cpi) {
   return cpi->twopass.section_intra_rating > 8 ? MAX_LOOP_FILTER * 3 / 4
                                                : 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,
                             MACROBLOCKD *const xd, VP9_COMMON *const cm,
@@ -39,9 +32,7 @@
                             int filt_level, int partial_frame) {
   int filt_err;
 
-  vp9_set_alt_lf_level(cpi, filt_level);
   vp9_loop_filter_frame(cm, xd, filt_level, 1, partial_frame);
-
   filt_err = vp9_calc_ss_err(sd, cm->frame_to_show);
 
   // Re-instate the unfiltered frame
@@ -55,8 +46,8 @@
   MACROBLOCKD *const xd = &cpi->mb.e_mbd;
   VP9_COMMON *const cm = &cpi->common;
   struct loopfilter *const lf = &cm->lf;
-  const int min_filter_level = get_min_filter_level(cpi, cm->base_qindex);
-  const int max_filter_level = get_max_filter_level(cpi, cm->base_qindex);
+  const int min_filter_level = 0;
+  const int max_filter_level = get_max_filter_level(cpi);
   int best_err;
   int filt_best;
   int filt_direction = 0;
@@ -148,8 +139,8 @@
                                                     : cpi->oxcf.sharpness;
 
   if (method == 2) {
-    const int min_filter_level = get_min_filter_level(cpi, cm->base_qindex);
-    const int max_filter_level = get_max_filter_level(cpi, cm->base_qindex);
+    const int min_filter_level = 0;
+    const int max_filter_level = get_max_filter_level(cpi);
     const int q = vp9_ac_quant(cm->base_qindex, 0);
     // These values were determined by linear fitting the result of the
     // searched level
--- a/vp9/encoder/vp9_picklpf.h
+++ b/vp9/encoder/vp9_picklpf.h
@@ -19,8 +19,6 @@
 struct yv12_buffer_config;
 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,
                            struct VP9_COMP *cpi, int method);
 #ifdef __cplusplus
-- 
⑨