diff options
| author | Yaowu Xu <yaowu@google.com> | 2013-04-17 11:08:36 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-04-17 11:08:36 -0700 |
| commit | 642ac924abfd24664335910d540742b4b71d58dd (patch) | |
| tree | 99a1d26667dbaaa8a2b59024de9c47afb4ffeefb /vp9 | |
| parent | c17c440233acc670eaf625e06a8b744f002106c9 (diff) | |
| parent | 0d310de97b3ff1c865ad3259e0171ce3dd0cf76e (diff) | |
| download | libvpx-642ac924abfd24664335910d540742b4b71d58dd.tar libvpx-642ac924abfd24664335910d540742b4b71d58dd.tar.gz libvpx-642ac924abfd24664335910d540742b4b71d58dd.tar.bz2 libvpx-642ac924abfd24664335910d540742b4b71d58dd.zip | |
Merge "replace hev_thr_lut[][] with simpler logic" into experimental
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/common/vp9_loopfilter.c | 21 | ||||
| -rw-r--r-- | vp9/common/vp9_loopfilter.h | 1 |
2 files changed, 1 insertions, 21 deletions
diff --git a/vp9/common/vp9_loopfilter.c b/vp9/common/vp9_loopfilter.c index e09dfced7..a57f766db 100644 --- a/vp9/common/vp9_loopfilter.c +++ b/vp9/common/vp9_loopfilter.c @@ -16,24 +16,6 @@ #include "vp9/common/vp9_seg_common.h" static void lf_init_lut(loop_filter_info_n *lfi) { - int filt_lvl; - - for (filt_lvl = 0; filt_lvl <= MAX_LOOP_FILTER; filt_lvl++) { - if (filt_lvl >= 40) { - lfi->hev_thr_lut[KEY_FRAME][filt_lvl] = 2; - lfi->hev_thr_lut[INTER_FRAME][filt_lvl] = 3; - } else if (filt_lvl >= 20) { - lfi->hev_thr_lut[KEY_FRAME][filt_lvl] = 1; - lfi->hev_thr_lut[INTER_FRAME][filt_lvl] = 2; - } else if (filt_lvl >= 15) { - lfi->hev_thr_lut[KEY_FRAME][filt_lvl] = 1; - lfi->hev_thr_lut[INTER_FRAME][filt_lvl] = 1; - } else { - lfi->hev_thr_lut[KEY_FRAME][filt_lvl] = 0; - lfi->hev_thr_lut[INTER_FRAME][filt_lvl] = 0; - } - } - lfi->mode_lf_lut[DC_PRED] = 1; lfi->mode_lf_lut[D45_PRED] = 1; lfi->mode_lf_lut[D135_PRED] = 1; @@ -207,7 +189,6 @@ static void lpf_mb(VP9_COMMON *cm, const MODE_INFO *mi, int y_stride, int uv_stride, int dering) { loop_filter_info_n *lfi_n = &cm->lf_info; struct loop_filter_info lfi; - const FRAME_TYPE frame_type = cm->frame_type; int mode = mi->mbmi.mode; int mode_index = lfi_n->mode_lf_lut[mode]; int seg = mi->mbmi.segment_id; @@ -218,7 +199,7 @@ static void lpf_mb(VP9_COMMON *cm, const MODE_INFO *mi, const int skip_lf = mb_lf_skip(&mi->mbmi); const int tx_size = mi->mbmi.txfm_size; if (cm->filter_type == NORMAL_LOOPFILTER) { - const int hev_index = lfi_n->hev_thr_lut[frame_type][filter_level]; + const int hev_index = filter_level >> 4; lfi.mblim = lfi_n->mblim[filter_level]; lfi.blim = lfi_n->blim[filter_level]; lfi.lim = lfi_n->lim[filter_level]; diff --git a/vp9/common/vp9_loopfilter.h b/vp9/common/vp9_loopfilter.h index bd9a35125..3b81146e2 100644 --- a/vp9/common/vp9_loopfilter.h +++ b/vp9/common/vp9_loopfilter.h @@ -37,7 +37,6 @@ typedef struct { DECLARE_ALIGNED(SIMD_WIDTH, unsigned char, hev_thr[4][SIMD_WIDTH]); unsigned char lvl[4][4][4]; - unsigned char hev_thr_lut[2][MAX_LOOP_FILTER + 1]; unsigned char mode_lf_lut[MB_MODE_COUNT]; } loop_filter_info_n; |