Commit 84ca7a9f authored by Debargha Mukherjee's avatar Debargha Mukherjee

Loop restoration filter

Current implementation is a bilateral filter whose
parameters are transmitted in the bitstream.

derflr: -0.647% BDRATE
hevcmr: -0.794% BDRATE

This is a prelimary patch. Various other variations are to
be investigated next, that will hopefully be less expensive
on the decoder side.

Change-Id: I50634ae8f5014ad0bf7432306348908a349d81e1
parent 63b57c31
......@@ -81,6 +81,12 @@ void vp10_free_ref_frame_buffers(BufferPool *pool) {
}
}
#if CONFIG_LOOP_RESTORATION
void vp10_free_restoration_buffers(VP10_COMMON *cm) {
vpx_free_frame_buffer(&cm->tmp_loop_buf);
}
#endif // CONFIG_LOOP_RESTORATION
void vp10_free_postproc_buffers(VP10_COMMON *cm) {
#if CONFIG_VP9_POSTPROC
vpx_free_frame_buffer(&cm->post_proc_buffer);
......
......@@ -29,6 +29,9 @@ void vp10_free_context_buffers(struct VP10Common *cm);
void vp10_free_ref_frame_buffers(struct BufferPool *pool);
void vp10_free_postproc_buffers(struct VP10Common *cm);
#if CONFIG_LOOP_RESTORATION
void vp10_free_restoration_buffers(struct VP10Common *cm);
#endif // CONFIG_LOOP_RESTORATION
int vp10_alloc_state_buffers(struct VP10Common *cm, int width, int height);
void vp10_free_state_buffers(struct VP10Common *cm);
......
......@@ -1498,6 +1498,10 @@ void vp10_setup_past_independence(VP10_COMMON *cm) {
// To force update of the sharpness
lf->last_sharpness_level = -1;
#if CONFIG_LOOP_RESTORATION
lf->bilateral_level = 0;
lf->last_bilateral_level = 0;
#endif // CONFIG_LOOP_RESTORATION
vp10_default_coef_probs(cm);
init_mode_probs(cm->fc);
......
......@@ -8,6 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include <math.h>
#include "./vpx_config.h"
#include "./vpx_dsp_rtcd.h"
#include "vp10/common/loopfilter.h"
......@@ -212,6 +214,250 @@ static const int mode_lf_lut[MB_MODE_COUNT] = {
#endif // CONFIG_EXT_INTER
};
#if CONFIG_LOOP_RESTORATION
#define BILATERAL_RANGE 256
#define BILATERAL_RANGE_SYM (2 * BILATERAL_RANGE + 1)
static double bilateral_filters_r_kf[BILATERAL_LEVELS_KF + 1]
[BILATERAL_RANGE_SYM];
static double bilateral_filters_r[BILATERAL_LEVELS + 1][BILATERAL_RANGE_SYM];
static double bilateral_filters_s_kf[BILATERAL_LEVELS_KF + 1]
[BILATERAL_WIN][BILATERAL_WIN];
static double bilateral_filters_s[BILATERAL_LEVELS + 1]
[BILATERAL_WIN][BILATERAL_WIN];
void vp10_loop_bilateral_precal() {
int i;
for (i = 1; i < BILATERAL_LEVELS_KF + 1; i ++) {
const bilateral_params_t param = vp10_bilateral_level_to_params(i, 1);
const int sigma_x = param.sigma_x;
const int sigma_y = param.sigma_y;
const int sigma_r = param.sigma_r;
const double sigma_r_d = (double)sigma_r / BILATERAL_PRECISION;
const double sigma_x_d = (double)sigma_x / BILATERAL_PRECISION;
const double sigma_y_d = (double)sigma_y / BILATERAL_PRECISION;
double *fr = bilateral_filters_r_kf[i] + BILATERAL_RANGE;
int j, x, y;
for (j = 0; j <= BILATERAL_RANGE; j++) {
fr[j] = exp(-(j * j) / (2 * sigma_r_d * sigma_r_d));
fr[-j] = fr[j];
}
for (y = -BILATERAL_HALFWIN; y <= BILATERAL_HALFWIN; y++) {
for (x = -BILATERAL_HALFWIN; x <= BILATERAL_HALFWIN; x++) {
bilateral_filters_s_kf[i][y + BILATERAL_HALFWIN]
[x + BILATERAL_HALFWIN] =
exp(-(x * x) / (2 * sigma_x_d * sigma_x_d)
-(y * y) / (2 * sigma_y_d * sigma_y_d));
}
}
}
for (i = 1; i < BILATERAL_LEVELS + 1; i ++) {
const bilateral_params_t param = vp10_bilateral_level_to_params(i, 0);
const int sigma_x = param.sigma_x;
const int sigma_y = param.sigma_y;
const int sigma_r = param.sigma_r;
const double sigma_r_d = (double)sigma_r / BILATERAL_PRECISION;
const double sigma_x_d = (double)sigma_x / BILATERAL_PRECISION;
const double sigma_y_d = (double)sigma_y / BILATERAL_PRECISION;
double *fr = bilateral_filters_r[i] + BILATERAL_RANGE;
int j, x, y;
for (j = 0; j <= BILATERAL_RANGE; j++) {
fr[j] = exp(-(j * j) / (2 * sigma_r_d * sigma_r_d));
fr[-j] = fr[j];
}
for (y = -BILATERAL_HALFWIN; y <= BILATERAL_HALFWIN; y++) {
for (x = -BILATERAL_HALFWIN; x <= BILATERAL_HALFWIN; x++) {
bilateral_filters_s[i][y + BILATERAL_HALFWIN][x + BILATERAL_HALFWIN] =
exp(-(x * x) / (2 * sigma_x_d * sigma_x_d)
-(y * y) / (2 * sigma_y_d * sigma_y_d));
}
}
}
}
int vp10_bilateral_level_bits(const VP10_COMMON *const cm) {
return cm->frame_type == KEY_FRAME ?
BILATERAL_LEVEL_BITS_KF : BILATERAL_LEVEL_BITS;
}
int vp10_loop_bilateral_used(int level, int kf) {
const bilateral_params_t param = vp10_bilateral_level_to_params(level, kf);
return (param.sigma_x && param.sigma_y && param.sigma_r);
}
void vp10_loop_bilateral_init(loop_filter_info_n *lfi, int level, int kf) {
lfi->bilateral_used = vp10_loop_bilateral_used(level, kf);
if (lfi->bilateral_used) {
int i;
lfi->wr_lut = kf ? bilateral_filters_r_kf[level] :
bilateral_filters_r[level];
for (i = 0; i < BILATERAL_WIN; i++)
lfi->wx_lut[i] = kf ? bilateral_filters_s_kf[level][i] :
bilateral_filters_s[level][i];
}
}
static int is_in_image(int x, int y, int width, int height) {
return (x >= 0 && x < width && y >= 0 && y < height);
}
void loop_bilateral_filter(uint8_t *data, int width, int height,
int stride, loop_filter_info_n *lfi,
uint8_t *tmpdata, int tmpstride) {
int i, j;
const double *wr_lut_ = lfi->wr_lut + 256;
uint8_t *data_p = data;
uint8_t *tmpdata_p = tmpdata;
for (i = 0; i < height; ++i) {
for (j = 0; j < width; ++j) {
int x, y;
double flsum = 0, wtsum = 0, wt;
uint8_t *data_p2 = data_p + j - BILATERAL_HALFWIN * stride;
for (y = -BILATERAL_HALFWIN; y <= BILATERAL_HALFWIN; ++y) {
for (x = -BILATERAL_HALFWIN; x <= BILATERAL_HALFWIN; ++x) {
if (!is_in_image(j + x, i + y, width, height))
continue;
wt = lfi->wx_lut[y + BILATERAL_HALFWIN][x + BILATERAL_HALFWIN] *
wr_lut_[data_p2[x] - data_p[j]];
wtsum += wt;
flsum += wt * data_p2[x];
}
data_p2 += stride;
}
assert(wtsum > 0);
tmpdata_p[j] = clip_pixel((int)(flsum / wtsum + 0.5));
}
tmpdata_p += tmpstride;
data_p += stride;
}
for (i = 0; i < height; ++i) {
memcpy(data + i * stride, tmpdata + i * tmpstride,
width * sizeof(*data));
}
}
#if CONFIG_VP9_HIGHBITDEPTH
void loop_bilateral_filter_highbd(uint8_t *data8, int width, int height,
int stride, loop_filter_info_n *lfi,
uint8_t *tmpdata8, int tmpstride,
int bit_depth) {
int i, j;
const double *wr_lut_ = lfi->wr_lut + 256;
uint16_t *data = CONVERT_TO_SHORTPTR(data8);
uint16_t *tmpdata = CONVERT_TO_SHORTPTR(tmpdata8);
uint16_t *data_p = data;
uint16_t *tmpdata_p = tmpdata;
for (i = 0; i < height; ++i) {
for (j = 0; j < width; ++j) {
int x, y, diff_r;
double flsum = 0, wtsum = 0, wt;
uint16_t *data_p2 = data_p + j - BILATERAL_HALFWIN * stride;
for (y = -BILATERAL_HALFWIN; y <= BILATERAL_HALFWIN; ++y) {
for (x = -BILATERAL_HALFWIN; x <= BILATERAL_HALFWIN; ++x) {
if (!is_in_image(j + x, i + y, width, height))
continue;
diff_r = (data_p2[x] - data_p[j]) >> (bit_depth - 8);
assert(diff_r >= -256 && diff_r <= 256);
wt = lfi->wx_lut[y + BILATERAL_HALFWIN][x + BILATERAL_HALFWIN] *
wr_lut_[diff_r];
wtsum += wt;
flsum += wt * data_p2[x];
}
data_p2 += stride;
}
assert(wtsum > 0);
tmpdata_p[j] = (int)(flsum / wtsum + 0.5);
}
tmpdata_p += tmpstride;
data_p += stride;
}
for (i = 0; i < height; ++i) {
memcpy(data + i * stride, tmpdata + i * tmpstride,
width * sizeof(*data));
}
}
#endif // CONFIG_VP9_HIGHBITDEPTH
void vp10_loop_bilateral_rows(YV12_BUFFER_CONFIG *frame,
VP10_COMMON *cm,
int start_mi_row, int end_mi_row,
int y_only) {
const int ywidth = frame->y_crop_width;
const int ystride = frame->y_stride;
const int uvwidth = frame->uv_crop_width;
const int uvstride = frame->uv_stride;
const int ystart = start_mi_row << MI_SIZE_LOG2;
const int uvstart = ystart >> cm->subsampling_y;
int yend = end_mi_row << MI_SIZE_LOG2;
int uvend = yend >> cm->subsampling_y;
YV12_BUFFER_CONFIG *tmp_buf;
yend = VPXMIN(yend, cm->height);
uvend = VPXMIN(uvend, cm->subsampling_y ? (cm->height + 1) >> 1 : cm->height);
if (vpx_realloc_frame_buffer(&cm->tmp_loop_buf, cm->width, cm->height,
cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH
cm->use_highbitdepth,
#endif
VP9_DEC_BORDER_IN_PIXELS, cm->byte_alignment,
NULL, NULL, NULL) < 0)
vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR,
"Failed to allocate tmp restoration buffer");
tmp_buf = &cm->tmp_loop_buf;
#if CONFIG_VP9_HIGHBITDEPTH
if (cm->use_highbitdepth)
loop_bilateral_filter_highbd(frame->y_buffer + ystart * ystride,
ywidth, yend - ystart, ystride, &cm->lf_info,
tmp_buf->y_buffer + ystart * tmp_buf->y_stride,
tmp_buf->y_stride, cm->bit_depth);
else
#endif // CONFIG_VP9_HIGHBITDEPTH
loop_bilateral_filter(frame->y_buffer + ystart * ystride,
ywidth, yend - ystart, ystride, &cm->lf_info,
tmp_buf->y_buffer + ystart * tmp_buf->y_stride,
tmp_buf->y_stride);
if (!y_only) {
#if CONFIG_VP9_HIGHBITDEPTH
if (cm->use_highbitdepth) {
loop_bilateral_filter_highbd(
frame->u_buffer + uvstart * uvstride,
uvwidth, uvend - uvstart, uvstride, &cm->lf_info,
tmp_buf->u_buffer + uvstart * tmp_buf->uv_stride,
tmp_buf->uv_stride, cm->bit_depth);
loop_bilateral_filter_highbd(
frame->v_buffer + uvstart * uvstride,
uvwidth, uvend - uvstart, uvstride, &cm->lf_info,
tmp_buf->v_buffer + uvstart * tmp_buf->uv_stride,
tmp_buf->uv_stride, cm->bit_depth);
} else {
#endif // CONFIG_VP9_HIGHBITDEPTH
loop_bilateral_filter(frame->u_buffer + uvstart * uvstride,
uvwidth, uvend - uvstart, uvstride, &cm->lf_info,
tmp_buf->u_buffer + uvstart * tmp_buf->uv_stride,
tmp_buf->uv_stride);
loop_bilateral_filter(frame->v_buffer + uvstart * uvstride,
uvwidth, uvend - uvstart, uvstride, &cm->lf_info,
tmp_buf->v_buffer + uvstart * tmp_buf->uv_stride,
tmp_buf->uv_stride);
#if CONFIG_VP9_HIGHBITDEPTH
}
#endif // CONFIG_VP9_HIGHBITDEPTH
}
}
#endif // CONFIG_LOOP_RESTORATION
static void update_sharpness(loop_filter_info_n *lfi, int sharpness_lvl) {
int lvl;
......@@ -252,6 +498,10 @@ void vp10_loop_filter_init(VP10_COMMON *cm) {
// init hev threshold const vectors
for (lvl = 0; lvl <= MAX_LOOP_FILTER; lvl++)
memset(lfi->lfthr[lvl].hev_thr, (lvl >> 4), SIMD_WIDTH);
#if CONFIG_LOOP_RESTORATION
vp10_loop_bilateral_precal();
#endif // CONFIG_LOOP_RESTORATION
}
void vp10_loop_filter_frame_init(VP10_COMMON *cm, int default_filt_lvl) {
......@@ -1721,6 +1971,30 @@ void vp10_loop_filter_data_reset(
memcpy(lf_data->planes, planes, sizeof(lf_data->planes));
}
#if CONFIG_LOOP_RESTORATION
void vp10_loop_bilateral_frame(YV12_BUFFER_CONFIG *frame,
VP10_COMMON *cm,
int bilateral_level,
int y_only, int partial_frame) {
int start_mi_row, end_mi_row, mi_rows_to_filter;
// const int loop_bilateral_used = vp10_loop_bilateral_used(
// bilateral_level, cm->frame_type == KEY_FRAME);
vp10_loop_bilateral_init(&cm->lf_info, bilateral_level,
cm->frame_type == KEY_FRAME);
if (!cm->lf_info.bilateral_used)
return;
start_mi_row = 0;
mi_rows_to_filter = cm->mi_rows;
if (partial_frame && cm->mi_rows > 8) {
start_mi_row = cm->mi_rows >> 1;
start_mi_row &= 0xfffffff8;
mi_rows_to_filter = VPXMAX(cm->mi_rows / 8, 8);
}
end_mi_row = start_mi_row + mi_rows_to_filter;
vp10_loop_bilateral_rows(frame, cm, start_mi_row, end_mi_row, y_only);
}
#endif // CONFIG_LOOP_RESTORATION
int vp10_loop_filter_worker(LFWorkerData *const lf_data, void *unused) {
(void)unused;
vp10_loop_filter_rows(lf_data->frame_buffer, lf_data->cm, lf_data->planes,
......
......@@ -28,6 +28,69 @@ extern "C" {
#define MAX_MODE_LF_DELTAS 2
#if CONFIG_LOOP_RESTORATION
#define BILATERAL_LEVEL_BITS_KF 4
#define BILATERAL_LEVELS_KF (1 << BILATERAL_LEVEL_BITS_KF)
#define BILATERAL_LEVEL_BITS 3
#define BILATERAL_LEVELS (1 << BILATERAL_LEVEL_BITS)
#define DEF_BILATERAL_LEVEL 2
#define BILATERAL_PRECISION 16
#define BILATERAL_HALFWIN 3
#define BILATERAL_WIN (2 * BILATERAL_HALFWIN + 1)
typedef struct bilateral_params {
int sigma_x; // spatial variance x
int sigma_y; // spatial variance y
int sigma_r; // range variance
} bilateral_params_t;
static bilateral_params_t
bilateral_level_to_params_arr[BILATERAL_LEVELS + 1] = {
// Values are rounded to 1/16 th precision
{0, 0, 0}, // 0 - default
{8, 9, 30},
{9, 8, 30},
{9, 11, 32},
{11, 9, 32},
{14, 14, 32},
{18, 18, 36},
{24, 24, 40},
{32, 32, 40},
};
static bilateral_params_t
bilateral_level_to_params_arr_kf[BILATERAL_LEVELS_KF + 1] = {
// Values are rounded to 1/16 th precision
{0, 0, 0}, // 0 - default
{8, 8, 30},
{9, 9, 32},
{10, 10, 32},
{12, 12, 32},
{14, 14, 32},
{18, 18, 36},
{24, 24, 40},
{30, 30, 44},
{36, 36, 48},
{42, 42, 48},
{48, 48, 48},
{48, 48, 56},
{56, 56, 48},
{56, 56, 56},
{56, 56, 64},
{64, 64, 48},
};
int vp10_bilateral_level_bits(const struct VP10Common *const cm);
int vp10_loop_bilateral_used(int level, int kf);
static INLINE bilateral_params_t vp10_bilateral_level_to_params(
int index, int kf) {
return kf ? bilateral_level_to_params_arr_kf[index] :
bilateral_level_to_params_arr[index];
}
#endif // CONFIG_LOOP_RESTORATION
enum lf_path {
LF_PATH_420,
LF_PATH_444,
......@@ -51,6 +114,11 @@ struct loopfilter {
// 0 = ZERO_MV, MV
signed char mode_deltas[MAX_MODE_LF_DELTAS];
signed char last_mode_deltas[MAX_MODE_LF_DELTAS];
#if CONFIG_LOOP_RESTORATION
int bilateral_level;
int last_bilateral_level;
#endif // CONFIG_LOOP_RESTORATION
};
// Need to align this structure so when it is declared and
......@@ -64,6 +132,14 @@ typedef struct {
typedef struct {
loop_filter_thresh lfthr[MAX_LOOP_FILTER + 1];
uint8_t lvl[MAX_SEGMENTS][MAX_REF_FRAMES][MAX_MODE_LF_DELTAS];
#if CONFIG_LOOP_RESTORATION
double * wx_lut[BILATERAL_WIN];
double * wr_lut;
int bilateral_sigma_x_set;
int bilateral_sigma_y_set;
int bilateral_sigma_r_set;
int bilateral_used;
#endif // CONFIG_LOOP_RESTORATION
} loop_filter_info_n;
// This structure holds bit masks for all 8x8 blocks in a 64x64 region.
......@@ -133,6 +209,24 @@ void vp10_loop_filter_rows(YV12_BUFFER_CONFIG *frame_buffer,
struct macroblockd_plane planes[MAX_MB_PLANE],
int start, int stop, int y_only);
#if CONFIG_LOOP_RESTORATION
void vp10_loop_bilateral_frame(YV12_BUFFER_CONFIG *frame,
struct VP10Common *cm,
int bilateral_level,
int y_only, int partial_frame);
void vp10_loop_filter_bilateral_frame(YV12_BUFFER_CONFIG *frame,
struct VP10Common *cm,
struct macroblockd *mbd,
int frame_filter_level,
int bilateral_level,
int y_only, int partial_frame);
void vp10_loop_bilateral_init(loop_filter_info_n *lfi, int T, int kf);
void vp10_loop_bilateral_rows(YV12_BUFFER_CONFIG *frame,
struct VP10Common *cm,
int start_mi_row, int end_mi_row,
int y_only);
#endif // CONFIG_LOOP_RESTORATION
typedef struct LoopFilterWorkerData {
YV12_BUFFER_CONFIG *frame_buffer;
struct VP10Common *cm;
......
......@@ -172,6 +172,9 @@ typedef struct VP10Common {
YV12_BUFFER_CONFIG post_proc_buffer;
YV12_BUFFER_CONFIG post_proc_buffer_int;
#endif
#if CONFIG_LOOP_RESTORATION
YV12_BUFFER_CONFIG tmp_loop_buf;
#endif // CONFIG_LOOP_RESTORATION
FRAME_TYPE last_frame_type; /* last frame's frame type for motion search.*/
#if CONFIG_EXT_REFS
......
......@@ -2102,8 +2102,9 @@ static void setup_segmentation(VP10_COMMON *const cm,
}
}
static void setup_loopfilter(struct loopfilter *lf,
static void setup_loopfilter(VP10_COMMON *cm,
struct vpx_read_bit_buffer *rb) {
struct loopfilter *lf = &cm->lf;
lf->filter_level = vpx_rb_read_literal(rb, 6);
lf->sharpness_level = vpx_rb_read_literal(rb, 3);
......@@ -2126,6 +2127,19 @@ static void setup_loopfilter(struct loopfilter *lf,
lf->mode_deltas[i] = vpx_rb_read_inv_signed_literal(rb, 6);
}
}
#if CONFIG_LOOP_RESTORATION
lf->bilateral_level = vpx_rb_read_bit(rb);
if (lf->bilateral_level) {
int level = vpx_rb_read_literal(rb, vp10_bilateral_level_bits(cm));
lf->bilateral_level = level + (level >= lf->last_bilateral_level);
} else {
lf->bilateral_level = lf->last_bilateral_level;
}
if (cm->frame_type != KEY_FRAME)
cm->lf.last_bilateral_level = cm->lf.bilateral_level;
else
cm->lf.last_bilateral_level = 0;
#endif // CONFIG_LOOP_RESTORATION
}
static INLINE int read_delta_q(struct vpx_read_bit_buffer *rb) {
......@@ -3096,7 +3110,7 @@ static size_t read_uncompressed_header(VP10Decoder *pbi,
if (frame_is_intra_only(cm) || cm->error_resilient_mode)
vp10_setup_past_independence(cm);
setup_loopfilter(&cm->lf, rb);
setup_loopfilter(cm, rb);
setup_quantization(cm, rb);
#if CONFIG_VP9_HIGHBITDEPTH
xd->bd = (int)cm->bit_depth;
......@@ -3445,6 +3459,13 @@ void vp10_decode_frame(VP10Decoder *pbi,
} else {
*p_data_end = decode_tiles(pbi, data + first_partition_size, data_end);
}
#if CONFIG_LOOP_RESTORATION
vp10_loop_bilateral_init(&cm->lf_info, cm->lf.bilateral_level,
cm->frame_type == KEY_FRAME);
if (cm->lf_info.bilateral_used) {
vp10_loop_bilateral_rows(new_fb, cm, 0, cm->mi_rows, 0);
}
#endif // CONFIG_LOOP_RESTORATION
if (!xd->corrupted) {
if (cm->refresh_frame_context == REFRESH_FRAME_CONTEXT_BACKWARD) {
......
......@@ -1645,9 +1645,10 @@ static void update_coef_probs(VP10_COMP *cpi, vpx_writer* w) {
}
}
static void encode_loopfilter(struct loopfilter *lf,
static void encode_loopfilter(VP10_COMMON *cm,
struct vpx_write_bit_buffer *wb) {
int i;
struct loopfilter *lf = &cm->lf;
// Encode the loop filter level and type
vpx_wb_write_literal(wb, lf->filter_level, 6);
......@@ -1681,6 +1682,15 @@ static void encode_loopfilter(struct loopfilter *lf,
}
}
}
#if CONFIG_LOOP_RESTORATION
vpx_wb_write_bit(wb, lf->bilateral_level != lf->last_bilateral_level);
if (lf->bilateral_level != lf->last_bilateral_level) {
int level = lf->bilateral_level -
(lf->bilateral_level > lf->last_bilateral_level);
vpx_wb_write_literal(wb, level,
vp10_bilateral_level_bits(cm));
}
#endif // CONFIG_LOOP_RESTORATION
}
static void write_delta_q(struct vpx_write_bit_buffer *wb, int delta_q) {
......@@ -2139,7 +2149,7 @@ static void write_uncompressed_header(VP10_COMP *cpi,
vpx_wb_write_literal(wb, cm->frame_context_idx, FRAME_CONTEXTS_LOG2);
encode_loopfilter(&cm->lf, wb);
encode_loopfilter(cm, wb);
encode_quantization(cm, wb);
encode_segmentation(cm, xd, wb);
if (!cm->seg.enabled && xd->lossless[0])
......
......@@ -377,10 +377,16 @@ static void dealloc_compressor_data(VP10_COMP *cpi) {
vp10_free_ref_frame_buffers(cm->buffer_pool);
#if CONFIG_VP9_POSTPROC
vp10_free_postproc_buffers(cm);
#endif
#endif // CONFIG_VP9_POSTPROC
#if CONFIG_LOOP_RESTORATION
vp10_free_restoration_buffers(cm);
#endif // CONFIG_LOOP_RESTORATION
vp10_free_context_buffers(cm);
vpx_free_frame_buffer(&cpi->last_frame_uf);
#if CONFIG_LOOP_RESTORATION
vpx_free_frame_buffer(&cpi->last_frame_db);
#endif // CONFIG_LOOP_RESTORATION
vpx_free_frame_buffer(&cpi->scaled_source);
vpx_free_frame_buffer(&cpi->scaled_last_source);
vpx_free_frame_buffer(&cpi->alt_ref_buffer);
......@@ -634,6 +640,19 @@ static void alloc_util_frame_buffers(VP10_COMP *cpi) {
vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR,
"Failed to allocate last frame buffer");
#if CONFIG_LOOP_RESTORATION
if (vpx_realloc_frame_buffer(&cpi->last_frame_db,
cm->width, cm->height,
cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH
cm->use_highbitdepth,
#endif
VP9_ENC_BORDER_IN_PIXELS, cm->byte_alignment,
NULL, NULL, NULL))
vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR,
"Failed to allocate last frame deblocked buffer");
#endif // CONFIG_LOOP_RESTORATION
if (vpx_realloc_frame_buffer(&cpi->scaled_source,
cm->width, cm->height,
cm->subsampling_x, cm->subsampling_y,
......@@ -2759,6 +2778,12 @@ static void loopfilter_frame(VP10_COMP *cpi, VP10_COMMON *cm) {
vp10_loop_filter_frame(cm->frame_to_show, cm, xd, lf->filter_level, 0, 0);
#endif
}
#if CONFIG_LOOP_RESTORATION
vp10_loop_bilateral_init(&cm->lf_info, cm->lf.bilateral_level,
cm->frame_type == KEY_FRAME);
if (cm->lf_info.bilateral_used)
vp10_loop_bilateral_rows(cm->frame_to_show, cm, 0, cm->mi_rows, 0);
#endif // CONFIG_LOOP_RESTORATION
vpx_extend_frame_inner_borders(cm->frame_to_show);
}
......@@ -3867,6 +3892,12 @@ static void encode_frame_to_data_rate(VP10_COMP *cpi,
cm->last2_frame_type = cm->last_frame_type;
#endif // CONFIG_EXT_REFS
cm->last_frame_type = cm->frame_type;
#if CONFIG_LOOP_RESTORATION
if (cm->frame_type != KEY_FRAME)
cm->lf.last_bilateral_level = cm->lf.bilateral_level;
else
cm->lf.last_bilateral_level = 0;
#endif // CONFIG_LOOP_RESTORATION
vp10_rc_postencode_update(cpi, *size);
......
......@@ -338,6 +338,9 @@ typedef struct VP10_COMP {
int ext_refresh_frame_context;