Fix to denoiser as use_svc was moved out AV1_COMP Change-Id: Iad31c38c533fa114af92f973b85610e9752017a5
diff --git a/av1/encoder/av1_temporal_denoiser.c b/av1/encoder/av1_temporal_denoiser.c index 8e42471..2840441 100644 --- a/av1/encoder/av1_temporal_denoiser.c +++ b/av1/encoder/av1_temporal_denoiser.c
@@ -349,7 +349,7 @@ &cpi->common, denoiser, mb, bs, increase_denoising, mi_row, mi_col, ctx, motion_magnitude, &zeromv_filter, cpi->svc.number_spatial_layers, cpi->source->y_width, cpi->svc.ref_idx[0], cpi->svc.ref_idx[3], - cpi->use_svc, cpi->svc.spatial_layer_id, use_gf_temporal_ref); + cpi->ppi->use_svc, cpi->svc.spatial_layer_id, use_gf_temporal_ref); if (decision == FILTER_BLOCK) { decision = av1_denoiser_filter(src.buf, src.stride, mc_avg_start, @@ -724,7 +724,7 @@ (cpi->common.width != cpi->resize_pending_params.width || cpi->common.height != cpi->resize_pending_params.height)); - if (cpi->use_svc) { + if (cpi->ppi->use_svc) { // TODO(kyslov) Enable when SVC temporal denosing is implemented #if 0 const int svc_buf_shift =
diff --git a/av1/encoder/nonrd_pickmode.c b/av1/encoder/nonrd_pickmode.c index e4ffca2..337fccf 100644 --- a/av1/encoder/nonrd_pickmode.c +++ b/av1/encoder/nonrd_pickmode.c
@@ -2175,7 +2175,8 @@ #if CONFIG_AV1_TEMPORAL_DENOISING if (cpi->oxcf.noise_sensitivity > 0) { - // if (cpi->use_svc) denoise_svc_pickmode = av1_denoise_svc_non_key(cpi); + // if (cpi->ppi->use_svc) denoise_svc_pickmode = + // av1_denoise_svc_non_key(cpi); if (cpi->denoiser.denoising_level > kDenLowLow && denoise_svc_pickmode) av1_denoiser_reset_frame_stats(ctx); }