From b0dc518f82b2a50c1b3e3062d3b58ee221d2e028 Mon Sep 17 00:00:00 2001 From: Fyodor Kyslov Date: Wed, 17 Mar 2021 10:14:55 -0700 Subject: [PATCH] AV1: Use Default TX type for encoding This will further speed up intra frame encoding Bug: None Change-Id: I1a105c6d2cdd9dc82f84d0039dbea3f0d090ab93 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/212320 Reviewed-by: Marco Paniconi Commit-Queue: Fyodor Kyslov Cr-Commit-Position: refs/heads/master@{#33492} --- modules/video_coding/codecs/av1/libaom_av1_encoder.cc | 7 +++++++ modules/video_coding/codecs/test/videocodec_test_libaom.cc | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/video_coding/codecs/av1/libaom_av1_encoder.cc b/modules/video_coding/codecs/av1/libaom_av1_encoder.cc index 0edbd74c6c..0f938f9105 100644 --- a/modules/video_coding/codecs/av1/libaom_av1_encoder.cc +++ b/modules/video_coding/codecs/av1/libaom_av1_encoder.cc @@ -410,6 +410,13 @@ int LibaomAv1Encoder::InitEncode(const VideoCodec* codec_settings, return WEBRTC_VIDEO_CODEC_ERROR; } + ret = aom_codec_control(&ctx_, AV1E_SET_INTRA_DEFAULT_TX_ONLY, 1); + if (ret != AOM_CODEC_OK) { + RTC_LOG(LS_WARNING) << "LibaomAv1Encoder::EncodeInit returned " << ret + << " on control AV1E_SET_INTRA_DEFAULT_TX_ONLY."; + return WEBRTC_VIDEO_CODEC_ERROR; + } + return WEBRTC_VIDEO_CODEC_OK; } diff --git a/modules/video_coding/codecs/test/videocodec_test_libaom.cc b/modules/video_coding/codecs/test/videocodec_test_libaom.cc index 9510b0f173..c3263e7134 100644 --- a/modules/video_coding/codecs/test/videocodec_test_libaom.cc +++ b/modules/video_coding/codecs/test/videocodec_test_libaom.cc @@ -89,7 +89,7 @@ TEST(VideoCodecTestLibaom, HdAV1) { std::vector rc_thresholds = { {13, 3, 0, 1, 0.3, 0.1, 0, 1}}; - std::vector quality_thresholds = {{36, 31.9, 0.93, 0.87}}; + std::vector quality_thresholds = {{36, 31.7, 0.93, 0.87}}; fixture->RunTest(rate_profiles, &rc_thresholds, &quality_thresholds, nullptr); }