From 31af34ba8ce17f60c2f4be643a84c7ed23b6f879 Mon Sep 17 00:00:00 2001 From: philipel Date: Mon, 3 Apr 2023 17:50:50 +0200 Subject: [PATCH] Update Dav1dDecoderTemplateAdapater to include AV1 profile1 support. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:13573 Change-Id: Ibc81b6400eb8e22ce28ae434c83a22013ef96c79 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/299946 Reviewed-by: Erik Språng Commit-Queue: Philip Eliasson Cr-Commit-Position: refs/heads/main@{#39757} --- .../test/video_decoder_factory_template_tests.cc | 4 ++-- .../video_decoder_factory_template_dav1d_adapter.h | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/api/video_codecs/test/video_decoder_factory_template_tests.cc b/api/video_codecs/test/video_decoder_factory_template_tests.cc index e9d7052501..1cc2b58274 100644 --- a/api/video_codecs/test/video_decoder_factory_template_tests.cc +++ b/api/video_codecs/test/video_decoder_factory_template_tests.cc @@ -114,8 +114,8 @@ TEST(VideoDecoderFactoryTemplate, OpenH264) { TEST(VideoDecoderFactoryTemplate, Dav1d) { VideoDecoderFactoryTemplate factory; auto formats = factory.GetSupportedFormats(); - EXPECT_THAT(formats.size(), 1); - EXPECT_THAT(formats[0], Field(&SdpVideoFormat::name, "AV1")); + EXPECT_THAT(formats, Not(IsEmpty())); + EXPECT_THAT(formats, Each(Field(&SdpVideoFormat::name, "AV1"))); EXPECT_THAT(factory.CreateVideoDecoder(formats[0]), Ne(nullptr)); } diff --git a/api/video_codecs/video_decoder_factory_template_dav1d_adapter.h b/api/video_codecs/video_decoder_factory_template_dav1d_adapter.h index 6d80cadf83..bffbdc43d3 100644 --- a/api/video_codecs/video_decoder_factory_template_dav1d_adapter.h +++ b/api/video_codecs/video_decoder_factory_template_dav1d_adapter.h @@ -14,13 +14,17 @@ #include #include +#include "api/video_codecs/av1_profile.h" #include "api/video_codecs/sdp_video_format.h" #include "modules/video_coding/codecs/av1/dav1d_decoder.h" namespace webrtc { struct Dav1dDecoderTemplateAdapter { static std::vector SupportedFormats() { - return {SdpVideoFormat("AV1")}; + return {SdpVideoFormat("AV1"), + SdpVideoFormat( + "AV1", {{kAV1FmtpProfile, + AV1ProfileToString(AV1Profile::kProfile1).data()}})}; } static std::unique_ptr CreateDecoder(