LineageOS/android_external_libvpx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vp9-denoiser: Modify skip denoising condition for small blocks.

Browse Source 
Skip denoising for blocks < 16x16, and for block = 16x16
skip denoising for low noise levels and width > 480 for now.
Allow for some speed-up in denoiser.

Change-Id: Ib46cefe4741962d145fa08775defea3a9c928567
This commit is contained in:
Marco
2017-01-25 11:39:02 -08:00
parent 70a3652693
commit 3b2d08a93b
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
vp9/encoder/vp9_denoiser.c
View File

@@ -188,7 +188,7 @@ static VP9_DENOISER_DECISION perform_motion_compensation(
VP9_DENOISER *denoiser, MACROBLOCK *mb, BLOCK_SIZE bs, VP9_DENOISER *denoiser, MACROBLOCK *mb, BLOCK_SIZE bs,
int increase_denoising, int mi_row, int mi_col, PICK_MODE_CONTEXT *ctx, int increase_denoising, int mi_row, int mi_col, PICK_MODE_CONTEXT *ctx,
int motion_magnitude, int is_skin, int *zeromv_filter, int consec_zeromv, int motion_magnitude, int is_skin, int *zeromv_filter, int consec_zeromv,
int num_spatial_layers) { int num_spatial_layers, int width) {
int sse_diff = ctx->zeromv_sse - ctx->newmv_sse; int sse_diff = ctx->zeromv_sse - ctx->newmv_sse;
MV_REFERENCE_FRAME frame; MV_REFERENCE_FRAME frame;
MACROBLOCKD *filter_mbd = &mb->e_mbd; MACROBLOCKD *filter_mbd = &mb->e_mbd;
@@ -203,11 +203,11 @@ static VP9_DENOISER_DECISION perform_motion_compensation(
if (is_skin && (motion_magnitude > 0 || consec_zeromv < 4)) return COPY_BLOCK; if (is_skin && (motion_magnitude > 0 || consec_zeromv < 4)) return COPY_BLOCK;
// Avoid denoising for small block (unless motion is small). // Avoid denoising small blocks. When noise > kDenLow or frame width > 480,
// Small blocks are selected in variance partition (before encoding) and // denoise 16x16 blocks.
// will typically lie on moving areas. if (bs == BLOCK_8X8 || bs == BLOCK_8X16 || bs == BLOCK_16X8 ||
if (denoiser->denoising_level < kDenHigh && motion_magnitude > 16 && (bs == BLOCK_16X16 && width > 480 &&
bs <= BLOCK_8X8) denoiser->denoising_level <= kDenLow))
return COPY_BLOCK; return COPY_BLOCK;
// If the best reference frame uses inter-prediction and there is enough of a // If the best reference frame uses inter-prediction and there is enough of a
@@ -366,7 +366,7 @@ void vp9_denoiser_denoise(VP9_COMP *cpi, MACROBLOCK *mb, int mi_row, int mi_col,
decision = perform_motion_compensation( decision = perform_motion_compensation(
denoiser, mb, bs, denoiser->increase_denoising, mi_row, mi_col, ctx, denoiser, mb, bs, denoiser->increase_denoising, mi_row, mi_col, ctx,
motion_magnitude, is_skin, &zeromv_filter, consec_zeromv, motion_magnitude, is_skin, &zeromv_filter, consec_zeromv,
cpi->svc.number_spatial_layers); cpi->svc.number_spatial_layers, cpi->Source->y_width);
if (decision == FILTER_BLOCK) { if (decision == FILTER_BLOCK) {
decision = vp9_denoiser_filter( decision = vp9_denoiser_filter(