generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "vp9: Remove alt-ref from denoiser."

Browse Source
This commit is contained in:
Jerome Jiang 2017-07-10 20:03:51 +00:00 committed by Gerrit Code Review
commit 125a532b34
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
vp9/encoder/vp9_denoiser.c
View File

@ -217,7 +217,7 @@ static VP9_DENOISER_DECISION perform_motion_compensation(
// 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
// difference in sum-squared-error, use it. // difference in sum-squared-error, use it.
if (frame != INTRA_FRAME && if (frame != INTRA_FRAME && frame != ALTREF_FRAME &&
(frame != GOLDEN_FRAME || num_spatial_layers == 1) && (frame != GOLDEN_FRAME || num_spatial_layers == 1) &&
sse_diff > sse_diff_thresh(bs, increase_denoising, motion_magnitude)) { sse_diff > sse_diff_thresh(bs, increase_denoising, motion_magnitude)) {
mi->ref_frame[0] = ctx->best_reference_frame; mi->ref_frame[0] = ctx->best_reference_frame;
@ -228,7 +228,7 @@ static VP9_DENOISER_DECISION perform_motion_compensation(
frame = ctx->best_zeromv_reference_frame; frame = ctx->best_zeromv_reference_frame;
ctx->newmv_sse = ctx->zeromv_sse; ctx->newmv_sse = ctx->zeromv_sse;
// Bias to last reference. // Bias to last reference.
if (num_spatial_layers > 1 || if (num_spatial_layers > 1 || frame == ALTREF_FRAME ||
(frame != LAST_FRAME && (frame != LAST_FRAME &&
((ctx->zeromv_lastref_sse<(5 * ctx->zeromv_sse)>> 2) || ((ctx->zeromv_lastref_sse<(5 * ctx->zeromv_sse)>> 2) ||
denoiser->denoising_level >= kDenHigh))) { denoiser->denoising_level >= kDenHigh))) {
@ -420,10 +420,12 @@ static void swap_frame_buffer(YV12_BUFFER_CONFIG *const dest,
src->y_buffer = tmp_buf; src->y_buffer = tmp_buf;
} }
void vp9_denoiser_update_frame_info( void vp9_denoiser_update_frame_info(VP9_DENOISER *denoiser,
VP9_DENOISER *denoiser, YV12_BUFFER_CONFIG src, FRAME_TYPE frame_type, YV12_BUFFER_CONFIG src,
int refresh_alt_ref_frame, int refresh_golden_frame, int refresh_last_frame, FRAME_TYPE frame_type,
int resized, int svc_base_is_key) { int refresh_golden_frame,
int refresh_last_frame, int resized,
int svc_base_is_key) {
// Copy source into denoised reference buffers on KEY_FRAME or // Copy source into denoised reference buffers on KEY_FRAME or
// if the just encoded frame was resized. For SVC, copy source if the base // if the just encoded frame was resized. For SVC, copy source if the base
// spatial layer was key frame. // spatial layer was key frame.
@ -431,18 +433,14 @@ void vp9_denoiser_update_frame_info(
svc_base_is_key) { svc_base_is_key) {
int i; int i;
// Start at 1 so as not to overwrite the INTRA_FRAME // Start at 1 so as not to overwrite the INTRA_FRAME
for (i = 1; i < MAX_REF_FRAMES; ++i) for (i = 1; i < DENOISER_REF_FRAMES; ++i)
copy_frame(&denoiser->running_avg_y[i], &src); copy_frame(&denoiser->running_avg_y[i], &src);
denoiser->reset = 0; denoiser->reset = 0;
return; return;
} }
// If more than one refresh occurs, must copy frame buffer. // If more than one refresh occurs, must copy frame buffer.
if ((refresh_alt_ref_frame + refresh_golden_frame + refresh_last_frame) > 1) { if (refresh_golden_frame + refresh_last_frame > 1) {
if (refresh_alt_ref_frame) {
copy_frame(&denoiser->running_avg_y[ALTREF_FRAME],
&denoiser->running_avg_y[INTRA_FRAME]);
}
if (refresh_golden_frame) { if (refresh_golden_frame) {
copy_frame(&denoiser->running_avg_y[GOLDEN_FRAME], copy_frame(&denoiser->running_avg_y[GOLDEN_FRAME],
&denoiser->running_avg_y[INTRA_FRAME]); &denoiser->running_avg_y[INTRA_FRAME]);
@ -452,10 +450,6 @@ void vp9_denoiser_update_frame_info(
&denoiser->running_avg_y[INTRA_FRAME]); &denoiser->running_avg_y[INTRA_FRAME]);
} }
} else { } else {
if (refresh_alt_ref_frame) {
swap_frame_buffer(&denoiser->running_avg_y[ALTREF_FRAME],
&denoiser->running_avg_y[INTRA_FRAME]);
}
if (refresh_golden_frame) { if (refresh_golden_frame) {
swap_frame_buffer(&denoiser->running_avg_y[GOLDEN_FRAME], swap_frame_buffer(&denoiser->running_avg_y[GOLDEN_FRAME],
&denoiser->running_avg_y[INTRA_FRAME]); &denoiser->running_avg_y[INTRA_FRAME]);
@ -501,7 +495,7 @@ int vp9_denoiser_alloc(VP9_DENOISER *denoiser, int width, int height, int ssx,
const int legacy_byte_alignment = 0; const int legacy_byte_alignment = 0;
assert(denoiser != NULL); assert(denoiser != NULL);
for (i = 0; i < MAX_REF_FRAMES; ++i) { for (i = 0; i < DENOISER_REF_FRAMES; ++i) {
fail = vpx_alloc_frame_buffer(&denoiser->running_avg_y[i], width, height, fail = vpx_alloc_frame_buffer(&denoiser->running_avg_y[i], width, height,
ssx, ssy, ssx, ssy,
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
@ -553,7 +547,7 @@ void vp9_denoiser_free(VP9_DENOISER *denoiser) {
return; return;
} }
denoiser->frame_buffer_initialized = 0; denoiser->frame_buffer_initialized = 0;
for (i = 0; i < MAX_REF_FRAMES; ++i) { for (i = 0; i < DENOISER_REF_FRAMES; ++i) {
vpx_free_frame_buffer(&denoiser->running_avg_y[i]); vpx_free_frame_buffer(&denoiser->running_avg_y[i]);
} }
vpx_free_frame_buffer(&denoiser->mc_running_avg_y); vpx_free_frame_buffer(&denoiser->mc_running_avg_y);

16
vp9/encoder/vp9_denoiser.h
View File

@ -21,6 +21,10 @@ extern "C" {
#define MOTION_MAGNITUDE_THRESHOLD (8 * 3) #define MOTION_MAGNITUDE_THRESHOLD (8 * 3)
// Denoiser is used in real-time mode which does not use alt-ref, so no need to
// allocate for it, and hence we need MAX_REF_FRAME - 1
#define DENOISER_REF_FRAMES MAX_REF_FRAMES - 1
typedef enum vp9_denoiser_decision { typedef enum vp9_denoiser_decision {
COPY_BLOCK, COPY_BLOCK,
FILTER_BLOCK, FILTER_BLOCK,
@ -35,7 +39,7 @@ typedef enum vp9_denoiser_level {
} VP9_DENOISER_LEVEL; } VP9_DENOISER_LEVEL;
typedef struct vp9_denoiser { typedef struct vp9_denoiser {
YV12_BUFFER_CONFIG running_avg_y[MAX_REF_FRAMES]; YV12_BUFFER_CONFIG running_avg_y[DENOISER_REF_FRAMES];
YV12_BUFFER_CONFIG mc_running_avg_y; YV12_BUFFER_CONFIG mc_running_avg_y;
YV12_BUFFER_CONFIG last_source; YV12_BUFFER_CONFIG last_source;
int frame_buffer_initialized; int frame_buffer_initialized;
@ -58,10 +62,12 @@ typedef struct {
struct VP9_COMP; struct VP9_COMP;
void vp9_denoiser_update_frame_info( void vp9_denoiser_update_frame_info(VP9_DENOISER *denoiser,
VP9_DENOISER *denoiser, YV12_BUFFER_CONFIG src, FRAME_TYPE frame_type, YV12_BUFFER_CONFIG src,
int refresh_alt_ref_frame, int refresh_golden_frame, int refresh_last_frame, FRAME_TYPE frame_type,
int resized, int svc_base_is_key); int refresh_golden_frame,
int refresh_last_frame, int resized,
int svc_base_is_key);
void vp9_denoiser_denoise(struct VP9_COMP *cpi, MACROBLOCK *mb, int mi_row, void vp9_denoiser_denoise(struct VP9_COMP *cpi, MACROBLOCK *mb, int mi_row,
int mi_col, BLOCK_SIZE bs, PICK_MODE_CONTEXT *ctx, int mi_col, BLOCK_SIZE bs, PICK_MODE_CONTEXT *ctx,

4
vp9/encoder/vp9_encoder.c
View File

@ -2897,8 +2897,8 @@ void vp9_update_reference_frames(VP9_COMP *cpi) {
} }
vp9_denoiser_update_frame_info( vp9_denoiser_update_frame_info(
&cpi->denoiser, *cpi->Source, cpi->common.frame_type, &cpi->denoiser, *cpi->Source, cpi->common.frame_type,
cpi->refresh_alt_ref_frame, cpi->refresh_golden_frame, cpi->refresh_golden_frame, cpi->refresh_last_frame, cpi->resize_pending,
cpi->refresh_last_frame, cpi->resize_pending, svc_base_is_key); svc_base_is_key);
} }
#endif #endif
if (is_one_pass_cbr_svc(cpi)) { if (is_one_pass_cbr_svc(cpi)) {