diff options
author | Tim Kopp <tkopp@google.com> | 2014-06-30 08:29:32 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-06-30 08:29:32 -0700 |
commit | 04d9720c63d879242e40fb31ef00ab7bcbf5db38 (patch) | |
tree | 4fb918f75813ed7d1c3f61541e996768ebee8608 /vp9 | |
parent | 783107fd45466d23afa0c9f0019121393b26b414 (diff) | |
parent | 2826c1d259870906944d02412d85a741d9ba6982 (diff) | |
download | libvpx-04d9720c63d879242e40fb31ef00ab7bcbf5db38.tar libvpx-04d9720c63d879242e40fb31ef00ab7bcbf5db38.tar.gz libvpx-04d9720c63d879242e40fb31ef00ab7bcbf5db38.tar.bz2 libvpx-04d9720c63d879242e40fb31ef00ab7bcbf5db38.zip |
Merge "Implemented motion compensation for VP9 denoiser"
Diffstat (limited to 'vp9')
-rw-r--r-- | vp9/encoder/vp9_denoiser.c | 137 | ||||
-rw-r--r-- | vp9/encoder/vp9_encoder.c | 43 |
2 files changed, 171 insertions, 9 deletions
diff --git a/vp9/encoder/vp9_denoiser.c b/vp9/encoder/vp9_denoiser.c index 89ca01a89..ff66abb0c 100644 --- a/vp9/encoder/vp9_denoiser.c +++ b/vp9/encoder/vp9_denoiser.c @@ -12,6 +12,7 @@ #include <limits.h> #include "vpx_scale/yv12config.h" #include "vpx/vpx_integer.h" +#include "vp9/common/vp9_reconinter.h" #include "vp9/encoder/vp9_denoiser.h" static const int widths[] = {4, 4, 8, 8, 8, 16, 16, 16, 32, 32, 32, 64, 64}; @@ -89,6 +90,138 @@ void copy_block(uint8_t *dest, int dest_stride, } } +static int perform_motion_compensation(VP9_DENOISER *denoiser, MACROBLOCK *mb, + BLOCK_SIZE bs, int increase_denoising, + int mi_row, int mi_col) { + // constants + // TODO(tkopp): empirically determine good constants, or functions of block + // size. + int NOISE_MOTION_THRESHOLD = 25 * 25; + int SSE_DIFF_THRESHOLD = heights[bs] * widths[bs] * 20; + unsigned int SSE_THRESH = heights[bs] * widths[bs] * 40; + unsigned int SSE_THRESH_HI = heights[bs] * widths[bs] * 60; + + int mv_col, mv_row; + int sse_diff = denoiser->zero_mv_sse - denoiser->best_sse; + int sse_diff_thresh; + int sse_thresh; + MV_REFERENCE_FRAME frame; + MACROBLOCKD *filter_mbd = &mb->e_mbd; + MB_MODE_INFO *mbmi = &filter_mbd->mi[0]->mbmi; + + // We will restore these after motion compensation. + MB_MODE_INFO saved_mbmi = *mbmi; + struct buf_2d saved_dst = filter_mbd->plane[0].dst; + struct buf_2d saved_pre[2]; + saved_pre[0] = filter_mbd->plane[0].pre[0]; + saved_pre[1] = filter_mbd->plane[0].pre[1]; + + // Decide the threshold for sum squared error. + mv_col = denoiser->best_sse_mv.as_mv.col; + mv_row = denoiser->best_sse_mv.as_mv.row; + if (mv_row * mv_row + mv_col * mv_col > NOISE_MOTION_THRESHOLD) { + sse_diff_thresh = 0; + } else { + sse_diff_thresh = SSE_DIFF_THRESHOLD; + } + + frame = denoiser->best_reference_frame; + + // If the best reference frame uses inter-prediction and there is enough of a + // difference in sum-squared-error, use it. + if (frame != INTRA_FRAME && sse_diff > sse_diff_thresh) { + mbmi->ref_frame[0] = denoiser->best_reference_frame; + mbmi->mode = denoiser->best_sse_inter_mode; + mbmi->mv[0] = denoiser->best_sse_mv; + } else { + // Otherwise, use the zero reference frame. + frame = denoiser->best_zeromv_reference_frame; + + mbmi->ref_frame[0] = denoiser->best_zeromv_reference_frame; + mbmi->mode = ZEROMV; + mbmi->mv[0].as_int = 0; + + denoiser->best_sse_inter_mode = ZEROMV; + denoiser->best_sse_mv.as_int = 0; + denoiser->best_sse = denoiser->zero_mv_sse; + } + + // Set the pointers in the MACROBLOCKD to point to the buffers in the denoiser + // struct. + filter_mbd->plane[0].pre[0].buf = + block_start(denoiser->running_avg_y[frame].y_buffer, + denoiser->running_avg_y[frame].y_stride, + mi_row, mi_col); + filter_mbd->plane[0].pre[0].stride = denoiser->running_avg_y[frame].y_stride; + + filter_mbd->plane[1].pre[0].buf = + block_start(denoiser->running_avg_y[frame].u_buffer, + denoiser->running_avg_y[frame].uv_stride, + mi_row, mi_col); + filter_mbd->plane[1].pre[0].stride = denoiser->running_avg_y[frame].uv_stride; + + filter_mbd->plane[2].pre[0].buf = + block_start(denoiser->running_avg_y[frame].v_buffer, + denoiser->running_avg_y[frame].uv_stride, + mi_row, mi_col); + filter_mbd->plane[2].pre[0].stride = denoiser->running_avg_y[frame].uv_stride; + + filter_mbd->plane[0].pre[1].buf = + block_start(denoiser->running_avg_y[frame].y_buffer, + denoiser->running_avg_y[frame].y_stride, + mi_row, mi_col); + filter_mbd->plane[0].pre[1].stride = denoiser->running_avg_y[frame].y_stride; + + filter_mbd->plane[1].pre[1].buf = + block_start(denoiser->running_avg_y[frame].u_buffer, + denoiser->running_avg_y[frame].uv_stride, + mi_row, mi_col); + filter_mbd->plane[1].pre[1].stride = denoiser->running_avg_y[frame].uv_stride; + + filter_mbd->plane[2].pre[1].buf = + block_start(denoiser->running_avg_y[frame].v_buffer, + denoiser->running_avg_y[frame].uv_stride, + mi_row, mi_col); + filter_mbd->plane[2].pre[1].stride = denoiser->running_avg_y[frame].uv_stride; + + filter_mbd->plane[0].dst.buf = + block_start(denoiser->mc_running_avg_y.y_buffer, + denoiser->mc_running_avg_y.y_stride, + mi_row, mi_col); + filter_mbd->plane[0].dst.stride = denoiser->mc_running_avg_y.y_stride; + + filter_mbd->plane[1].dst.buf = + block_start(denoiser->mc_running_avg_y.u_buffer, + denoiser->mc_running_avg_y.uv_stride, + mi_row, mi_col); + filter_mbd->plane[1].dst.stride = denoiser->mc_running_avg_y.y_stride; + + filter_mbd->plane[2].dst.buf = + block_start(denoiser->mc_running_avg_y.v_buffer, + denoiser->mc_running_avg_y.uv_stride, + mi_row, mi_col); + filter_mbd->plane[2].dst.stride = denoiser->mc_running_avg_y.y_stride; + + vp9_build_inter_predictors_sby(filter_mbd, mv_row, mv_col, bs); + + // Restore everything to its original state + filter_mbd->plane[0].pre[0] = saved_pre[0]; + filter_mbd->plane[0].pre[1] = saved_pre[1]; + filter_mbd->plane[0].dst = saved_dst; + *mbmi = saved_mbmi; + + mv_row = denoiser->best_sse_mv.as_mv.row; + mv_col = denoiser->best_sse_mv.as_mv.col; + sse_thresh = denoiser->increase_denoising ? SSE_THRESH_HI : SSE_THRESH; + + // TODO(tkopp) why 8? + if (denoiser->best_sse > sse_thresh || + mv_row * mv_row + mv_col * mv_col > 8 * NOISE_MOTION_THRESHOLD) { + return COPY_BLOCK; + } + return FILTER_BLOCK; +} + void vp9_denoiser_denoise(VP9_DENOISER *denoiser, MACROBLOCK *mb, int mi_row, int mi_col, BLOCK_SIZE bs) { int decision = COPY_BLOCK; @@ -100,7 +233,9 @@ void vp9_denoiser_denoise(VP9_DENOISER *denoiser, MACROBLOCK *mb, mi_row, mi_col); struct buf_2d src = mb->plane[0].src; - + decision = perform_motion_compensation(denoiser, mb, bs, + denoiser->increase_denoising, + mi_row, mi_col); update_running_avg(mc_avg_start, mc_avg.y_stride, avg_start, avg.y_stride, mb->plane[0].src.buf, mb->plane[0].src.stride, 0, bs); diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index 4b5e0c94c..ecfefd3ba 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -653,12 +653,7 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) { #if CONFIG_DENOISING vp9_denoiser_alloc(&(cpi->denoiser), cm->width, cm->height, - // TODO(tkopp) An unrelated bug causes - // cm->subsampling_{x,y} to be uninitialized at this point - // in execution. For now we assume YUV-420, which is x/y - // subsampling of 1. - 1, 1, - // cm->subsampling_x, cm->subsampling_y, + cm->subsampling_x, cm->subsampling_y, VP9_ENC_BORDER_IN_PIXELS); #endif } @@ -1271,7 +1266,7 @@ int vp9_update_entropy(VP9_COMP * cpi, int update) { } -#if defined(OUTPUT_YUV_SRC) || defined(OUTPUT_YUV_DENOISED) +#if defined(OUTPUT_YUV_SRC) void vp9_write_yuv_frame(YV12_BUFFER_CONFIG *s, FILE *f) { uint8_t *src = s->y_buffer; int h = s->y_height; @@ -1299,6 +1294,38 @@ void vp9_write_yuv_frame(YV12_BUFFER_CONFIG *s, FILE *f) { } #endif +#if defined(OUTPUT_YUV_DENOISED) +// The denoiser buffer is allocated as a YUV 440 buffer. This function writes it +// as YUV 420. We simply use the top-left pixels of the UV buffers, since we do +// not denoise the UV channels at this time. If ever we implement UV channel +// denoising we will have to modify this. +void vp9_write_yuv_frame_420(YV12_BUFFER_CONFIG *s, FILE *f) { + uint8_t *src = s->y_buffer; + int h = s->y_height; + + do { + fwrite(src, s->y_width, 1, f); + src += s->y_stride; + } while (--h); + + src = s->u_buffer; + h = s->uv_height / 2; + + do { + fwrite(src, s->uv_width / 2, 1, f); + src += s->uv_stride + s->uv_width / 2; + } while (--h); + + src = s->v_buffer; + h = s->uv_height / 2; + + do { + fwrite(src, s->uv_width / 2, 1, f); + src += s->uv_stride + s->uv_width / 2; + } while (--h); +} +#endif + #ifdef OUTPUT_YUV_REC void vp9_write_yuv_rec_frame(VP9_COMMON *cm) { YV12_BUFFER_CONFIG *s = cm->frame_to_show; @@ -2134,7 +2161,7 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi, #endif #ifdef OUTPUT_YUV_DENOISED - vp9_write_yuv_frame(&cpi->denoiser.running_avg_y[INTRA_FRAME], + vp9_write_yuv_frame_420(&cpi->denoiser.running_avg_y[INTRA_FRAME], yuv_denoised_file); #endif #ifdef OUTPUT_YUV_SRC |