diff --git a/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc b/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc index c8170837e7..0f398b8410 100644 --- a/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc +++ b/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc @@ -399,9 +399,9 @@ bool LibvpxVp9Encoder::SetSvcRates( if (seen_active_layer && performance_flags_.use_per_layer_speed) { bool denoiser_on = - AllowDenoising() && + AllowDenoising() && codec_.VP9()->denoisingOn && performance_flags_by_spatial_index_[num_active_spatial_layers_ - 1] - .denoiser_on; + .allow_denoising; libvpx_->codec_control(encoder_, VP9E_SET_NOISE_SENSITIVITY, denoiser_on ? 1 : 0); } @@ -823,9 +823,9 @@ int LibvpxVp9Encoder::InitAndSetControlSettings(const VideoCodec* inst) { performance_flags_by_spatial_index_[si].deblock_mode; } bool denoiser_on = - AllowDenoising() && + AllowDenoising() && inst->VP9().denoisingOn && performance_flags_by_spatial_index_[num_spatial_layers_ - 1] - .denoiser_on; + .allow_denoising; libvpx_->codec_control(encoder_, VP9E_SET_NOISE_SENSITIVITY, denoiser_on ? 1 : 0); } @@ -1911,7 +1911,7 @@ LibvpxVp9Encoder::ParsePerformanceFlagsFromTrials( FieldTrialStructMember("deblock_mode", [](Params* p) { return &p->deblock_mode; }), FieldTrialStructMember("denoiser", - [](Params* p) { return &p->denoiser_on; })}, + [](Params* p) { return &p->allow_denoising; })}, {}); FieldTrialFlag per_layer_speed("use_per_layer_speed"); diff --git a/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.h b/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.h index e1be0f7c40..dd1ef3c763 100644 --- a/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.h +++ b/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.h @@ -220,7 +220,7 @@ class LibvpxVp9Encoder : public VP9Encoder { // 1 = disable deblock for top-most TL // 2 = disable deblock for all TLs int deblock_mode = 0; - bool denoiser_on = true; + bool allow_denoising = true; }; // Map from min pixel count to settings for that resolution and above. // E.g. if you want some settings A if below wvga (640x360) and some other