ref: 7777e7a8d5d4993825f441abd1dd9eb35680bf60
parent: 3da6564f90d44d8cea1c5873ee9e20c0daeb5633
parent: 86ede50943ac378a8d63dc254cc0a0c679e97b10
author: Marco Paniconi <[email protected]>
date: Mon Oct 5 10:14:35 EDT 2015
Merge "Fix to denoiser with dynamic resize."
--- a/vp9/encoder/vp9_denoiser.c
+++ b/vp9/encoder/vp9_denoiser.c
@@ -375,8 +375,11 @@
FRAME_TYPE frame_type,
int refresh_alt_ref_frame,
int refresh_golden_frame,
- int refresh_last_frame) {- if (frame_type == KEY_FRAME) {+ int refresh_last_frame,
+ int resized) {+ // Copy source into denoised reference buffers on KEY_FRAME or
+ // if the just encoded frame was resized.
+ if (frame_type == KEY_FRAME || resized != 0) {int i;
// Start at 1 so as not to overwrite the INTRA_FRAME
for (i = 1; i < MAX_REF_FRAMES; ++i)
@@ -462,7 +465,6 @@
#endif
denoiser->increase_denoising = 0;
denoiser->frame_buffer_initialized = 1;
-
return 0;
}
--- a/vp9/encoder/vp9_denoiser.h
+++ b/vp9/encoder/vp9_denoiser.h
@@ -37,7 +37,8 @@
FRAME_TYPE frame_type,
int refresh_alt_ref_frame,
int refresh_golden_frame,
- int refresh_last_frame);
+ int refresh_last_frame,
+ int resized);
void vp9_denoiser_denoise(VP9_DENOISER *denoiser, MACROBLOCK *mb,
int mi_row, int mi_col, BLOCK_SIZE bs,
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -1739,8 +1739,10 @@
update_state_rt(cpi, td, ctx, mi_row, mi_col, bsize);
#if CONFIG_VP9_TEMPORAL_DENOISING
- if (cpi->oxcf.noise_sensitivity > 0 && output_enabled &&
- cpi->common.frame_type != KEY_FRAME) {+ if (cpi->oxcf.noise_sensitivity > 0 &&
+ output_enabled &&
+ cpi->common.frame_type != KEY_FRAME &&
+ cpi->resize_pending == 0) {vp9_denoiser_denoise(&cpi->denoiser, x, mi_row, mi_col,
VPXMAX(BLOCK_8X8, bsize), ctx);
}
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -2756,7 +2756,8 @@
cpi->common.frame_type,
cpi->refresh_alt_ref_frame,
cpi->refresh_golden_frame,
- cpi->refresh_last_frame);
+ cpi->refresh_last_frame,
+ cpi->resize_pending);
}
#endif
}
@@ -3099,6 +3100,21 @@
#endif // CONFIG_VP9_POSTPROC
}
+#if CONFIG_VP9_TEMPORAL_DENOISING
+static void setup_denoiser_buffer(VP9_COMP *cpi) {+ VP9_COMMON *const cm = &cpi->common;
+ if (cpi->oxcf.noise_sensitivity > 0 &&
+ !cpi->denoiser.frame_buffer_initialized) {+ vp9_denoiser_alloc(&(cpi->denoiser), cm->width, cm->height,
+ cm->subsampling_x, cm->subsampling_y,
+#if CONFIG_VP9_HIGHBITDEPTH
+ cm->use_highbitdepth,
+#endif
+ VP9_ENC_BORDER_IN_PIXELS);
+ }
+}
+#endif
+
static void init_motion_estimation(VP9_COMP *cpi) {int y_stride = cpi->scaled_source.y_stride;
@@ -3143,6 +3159,17 @@
// TODO(agrange) Scale cpi->max_mv_magnitude if frame-size has changed.
set_mv_search_params(cpi);
+
+#if CONFIG_VP9_TEMPORAL_DENOISING
+ // Reset the denoiser on the resized frame.
+ if (cpi->oxcf.noise_sensitivity > 0) {+ vp9_denoiser_free(&(cpi->denoiser));
+ setup_denoiser_buffer(cpi);
+ // Dynamic resize is only triggered for non-SVC, so we can force
+ // golden frame update here as temporary fix to denoiser.
+ cpi->refresh_golden_frame = 1;
+ }
+#endif
}
if ((oxcf->pass == 2) &&
@@ -3982,21 +4009,6 @@
cpi->initial_mbs = cm->MBs;
}
}
-
-#if CONFIG_VP9_TEMPORAL_DENOISING
-static void setup_denoiser_buffer(VP9_COMP *cpi) {- VP9_COMMON *const cm = &cpi->common;
- if (cpi->oxcf.noise_sensitivity > 0 &&
- !cpi->denoiser.frame_buffer_initialized) {- vp9_denoiser_alloc(&(cpi->denoiser), cm->width, cm->height,
- cm->subsampling_x, cm->subsampling_y,
-#if CONFIG_VP9_HIGHBITDEPTH
- cm->use_highbitdepth,
-#endif
- VP9_ENC_BORDER_IN_PIXELS);
- }
-}
-#endif
int vp9_receive_raw_frame(VP9_COMP *cpi, unsigned int frame_flags,
YV12_BUFFER_CONFIG *sd, int64_t time_stamp,