From 7d73c6cf9d717a21117da3ebc8c7879dae5b15c4 Mon Sep 17 00:00:00 2001 From: Emil Lundmark Date: Tue, 15 Sep 2020 11:33:11 +0200 Subject: [PATCH] Explicitly enable CDEF MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It should already be enabled by default in libaom, but explicitly enable it here in case that changes. Bug: None Change-Id: I93a1dfc92f9c02bc5ec823c326d8cf6ff163bceb Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/184262 Reviewed-by: Erik Språng Commit-Queue: Emil Lundmark Cr-Commit-Position: refs/heads/master@{#32114} --- modules/video_coding/codecs/av1/libaom_av1_encoder.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/video_coding/codecs/av1/libaom_av1_encoder.cc b/modules/video_coding/codecs/av1/libaom_av1_encoder.cc index b1c85b8a09..508a051219 100644 --- a/modules/video_coding/codecs/av1/libaom_av1_encoder.cc +++ b/modules/video_coding/codecs/av1/libaom_av1_encoder.cc @@ -223,6 +223,12 @@ int LibaomAv1Encoder::InitEncode(const VideoCodec* codec_settings, << " on control AV1E_SET_CPUUSED."; return WEBRTC_VIDEO_CODEC_ERROR; } + ret = aom_codec_control(&ctx_, AV1E_SET_ENABLE_CDEF, 1); + if (ret != AOM_CODEC_OK) { + RTC_LOG(LS_WARNING) << "LibaomAv1Encoder::EncodeInit returned " << ret + << " on control AV1E_SET_ENABLE_CDEF."; + return WEBRTC_VIDEO_CODEC_ERROR; + } ret = aom_codec_control(&ctx_, AV1E_SET_ENABLE_TPL_MODEL, 0); if (ret != AOM_CODEC_OK) { RTC_LOG(LS_WARNING) << "LibaomAv1Encoder::EncodeInit returned " << ret