diff options
| author | John Koleszar <jkoleszar@google.com> | 2013-03-26 08:36:55 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-03-26 08:36:55 -0700 |
| commit | 8e1c368486672a191e12b52b8aa3d3c2aab6d07a (patch) | |
| tree | 74a8b8eea2e9a401fefa81322b19e9b04a022304 /vp9/decoder | |
| parent | 7d9a7fb2970e46c24814a6737bbb7f9df42fdf69 (diff) | |
| parent | 441e2eab1b86ca77521a084abfc2fbbf96c4abb9 (diff) | |
| download | libvpx-8e1c368486672a191e12b52b8aa3d3c2aab6d07a.tar libvpx-8e1c368486672a191e12b52b8aa3d3c2aab6d07a.tar.gz libvpx-8e1c368486672a191e12b52b8aa3d3c2aab6d07a.tar.bz2 libvpx-8e1c368486672a191e12b52b8aa3d3c2aab6d07a.zip | |
Merge "Add an in-loop deringing experiment" into experimental
Diffstat (limited to 'vp9/decoder')
| -rw-r--r-- | vp9/decoder/vp9_decodframe.c | 6 | ||||
| -rw-r--r-- | vp9/decoder/vp9_onyxd_if.c | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c index e60324686..0e409f727 100644 --- a/vp9/decoder/vp9_decodframe.c +++ b/vp9/decoder/vp9_decodframe.c @@ -1508,6 +1508,12 @@ int vp9_decode_frame(VP9D_COMP *pbi, const unsigned char **p_data_end) { pc->filter_type = (LOOPFILTERTYPE) vp9_read_bit(&header_bc); pc->filter_level = vp9_read_literal(&header_bc, 6); pc->sharpness_level = vp9_read_literal(&header_bc, 3); +#if CONFIG_LOOP_DERING + if (vp9_read_bit(&header_bc)) + pc->dering_enabled = 1 + vp9_read_literal(&header_bc, 4); + else + pc->dering_enabled = 0; +#endif /* Read in loop filter deltas applied at the MB level based on mode or ref frame. */ xd->mode_ref_lf_delta_update = 0; diff --git a/vp9/decoder/vp9_onyxd_if.c b/vp9/decoder/vp9_onyxd_if.c index a243f41fd..bcb5897e6 100644 --- a/vp9/decoder/vp9_onyxd_if.c +++ b/vp9/decoder/vp9_onyxd_if.c @@ -356,7 +356,8 @@ int vp9_receive_compressed_data(VP9D_PTR ptr, unsigned long size, if (cm->filter_level) { /* Apply the loop filter if appropriate. */ - vp9_loop_filter_frame(cm, &pbi->mb, cm->filter_level, 0); + vp9_loop_filter_frame(cm, &pbi->mb, cm->filter_level, 0, + cm->dering_enabled); } vp8_yv12_extend_frame_borders(cm->frame_to_show); } |