From 845bc13ba97349879179e58c62462c67e9f6343e Mon Sep 17 00:00:00 2001 From: Paul Wilkins Date: Fri, 24 May 2013 15:40:20 +0100 Subject: Remove loop dering experiment. Change-Id: I1a979bf74c286b157c31bab6bdcba0494acb4918 --- vp9/encoder/vp9_bitstream.c | 8 -------- vp9/encoder/vp9_onyx_if.c | 3 +-- vp9/encoder/vp9_picklpf.c | 32 +++----------------------------- 3 files changed, 4 insertions(+), 39 deletions(-) (limited to 'vp9/encoder') diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c index 5916bae2b..71812c357 100644 --- a/vp9/encoder/vp9_bitstream.c +++ b/vp9/encoder/vp9_bitstream.c @@ -1351,14 +1351,6 @@ static void encode_loopfilter(VP9_COMMON *pc, MACROBLOCKD *xd, vp9_writer *w) { // Encode the loop filter level and type vp9_write_literal(w, pc->filter_level, 6); vp9_write_literal(w, pc->sharpness_level, 3); -#if CONFIG_LOOP_DERING - if (pc->dering_enabled) { - vp9_write_bit(w, 1); - vp9_write_literal(w, pc->dering_enabled - 1, 4); - } else { - vp9_write_bit(w, 0); - } -#endif // Write out loop filter deltas applied at the MB level based on mode or // ref frame (if they are enabled). diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index 27eeb5c82..2bb2bbca8 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -2416,8 +2416,7 @@ static void loopfilter_frame(VP9_COMP *cpi, VP9_COMMON *cm) { if (cm->filter_level > 0) { vp9_set_alt_lf_level(cpi, cm->filter_level); - vp9_loop_filter_frame(cm, &cpi->mb.e_mbd, cm->filter_level, 0, - cm->dering_enabled); + vp9_loop_filter_frame(cm, &cpi->mb.e_mbd, cm->filter_level, 0); } vp9_extend_frame_borders(cm->frame_to_show, diff --git a/vp9/encoder/vp9_picklpf.c b/vp9/encoder/vp9_picklpf.c index d69b3a3e3..a87d05838 100644 --- a/vp9/encoder/vp9_picklpf.c +++ b/vp9/encoder/vp9_picklpf.c @@ -163,7 +163,7 @@ void vp9_pick_filter_level(YV12_BUFFER_CONFIG *sd, VP9_COMP *cpi) { // Get baseline error score vp9_set_alt_lf_level(cpi, filt_mid); - vp9_loop_filter_frame(cm, &cpi->mb.e_mbd, filt_mid, 1, 0); + vp9_loop_filter_frame(cm, &cpi->mb.e_mbd, filt_mid, 1); best_err = vp9_calc_ss_err(sd, cm->frame_to_show); filt_best = filt_mid; @@ -188,7 +188,7 @@ void vp9_pick_filter_level(YV12_BUFFER_CONFIG *sd, VP9_COMP *cpi) { if ((filt_direction <= 0) && (filt_low != filt_mid)) { // Get Low filter error score vp9_set_alt_lf_level(cpi, filt_low); - vp9_loop_filter_frame(cm, &cpi->mb.e_mbd, filt_low, 1, 0); + vp9_loop_filter_frame(cm, &cpi->mb.e_mbd, filt_low, 1); filt_err = vp9_calc_ss_err(sd, cm->frame_to_show); @@ -208,7 +208,7 @@ void vp9_pick_filter_level(YV12_BUFFER_CONFIG *sd, VP9_COMP *cpi) { // Now look at filt_high if ((filt_direction >= 0) && (filt_high != filt_mid)) { vp9_set_alt_lf_level(cpi, filt_high); - vp9_loop_filter_frame(cm, &cpi->mb.e_mbd, filt_high, 1, 0); + vp9_loop_filter_frame(cm, &cpi->mb.e_mbd, filt_high, 1); filt_err = vp9_calc_ss_err(sd, cm->frame_to_show); @@ -233,30 +233,4 @@ void vp9_pick_filter_level(YV12_BUFFER_CONFIG *sd, VP9_COMP *cpi) { } cm->filter_level = filt_best; - -#if CONFIG_LOOP_DERING - /* Decide whether to turn on deringing filter */ - { // NOLINT - int best_dering = 0; - int this_dering; - int last_err_diff = INT_MAX; - - for (this_dering = 1; this_dering <= 16; this_dering++) { - vp9_set_alt_lf_level(cpi, filt_best); - vp9_loop_filter_frame(cm, &cpi->mb.e_mbd, filt_high, 1, this_dering); - filt_err = vp9_calc_ss_err(sd, cm->frame_to_show); - vp8_yv12_copy_y(&cpi->last_frame_uf, cm->frame_to_show); - if (filt_err < best_err) { - best_err = filt_err; - best_dering = this_dering; - last_err_diff = INT_MAX; - } else { - if (filt_err - best_err > last_err_diff) - break; - last_err_diff = filt_err - best_err; - } - } - cm->dering_enabled = best_dering; - } -#endif } -- cgit v1.2.3