admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove WebRTC-Dav1dDecoder kill switch.

Browse Source 
Bug: chromium:1330308, b/234414450
Change-Id: Iad9d38048b62d2fb99e5c76b072dd929c5e24954
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/291101
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39142}
This commit is contained in:
philipel 2023-01-18 15:27:47 +01:00 committed by WebRTC LUCI CQ
parent 299c02ede2
commit a0bc404607
2 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
media/engine/internal_decoder_factory.cc
View File

@ -29,7 +29,6 @@
namespace webrtc {
namespace {
constexpr char kDav1dFieldTrial[] = "WebRTC-Dav1dDecoder";
#if defined(RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY)
constexpr bool kDav1dIsIncluded = true;
#else
@ -50,7 +49,7 @@ std::vector<SdpVideoFormat> InternalDecoderFactory::GetSupportedFormats()
for (const SdpVideoFormat& h264_format : SupportedH264DecoderCodecs())
formats.push_back(h264_format);
if (kDav1dIsIncluded && !field_trial::IsDisabled(kDav1dFieldTrial)) {
if (kDav1dIsIncluded) {
formats.push_back(SdpVideoFormat(cricket::kAv1CodecName));
formats.push_back(SdpVideoFormat(
cricket::kAv1CodecName,
@ -94,7 +93,7 @@ std::unique_ptr<VideoDecoder> InternalDecoderFactory::CreateVideoDecoder(
return H264Decoder::Create();
if (absl::EqualsIgnoreCase(format.name, cricket::kAv1CodecName) &&
kDav1dIsIncluded && !field_trial::IsDisabled(kDav1dFieldTrial)) {
kDav1dIsIncluded) {
return CreateDav1dDecoder();
}

16
media/engine/internal_decoder_factory_unittest.cc
View File

@ -47,10 +47,6 @@ constexpr VideoDecoderFactory::CodecSupport kSupported = {
/*is_supported=*/true, /*is_power_efficient=*/false};
constexpr VideoDecoderFactory::CodecSupport kUnsupported = {
/*is_supported=*/false, /*is_power_efficient=*/false};
constexpr char kDav1dDecoderFieldTrialEnabled[] =
"WebRTC-Dav1dDecoder/Enabled/";
constexpr char kDav1dDecoderFieldTrialDisabled[] =
"WebRTC-Dav1dDecoder/Disabled/";
MATCHER_P(Support, expected, "") {
return arg.is_supported == expected.is_supported &&
@ -91,7 +87,6 @@ TEST(InternalDecoderFactoryTest, H264) {
TEST(InternalDecoderFactoryTest, Av1Profile0) {
InternalDecoderFactory factory;
InitFieldTrialsFromString(kDav1dDecoderFieldTrialEnabled);
if (kDav1dIsIncluded) {
EXPECT_THAT(factory.GetSupportedFormats(),
Contains(Field(&SdpVideoFormat::name, cricket::kAv1CodecName)));
@ -113,7 +108,6 @@ TEST(InternalDecoderFactoryTest, Av1) {
#endif
TEST(InternalDecoderFactoryTest, Av1Profile1_Dav1dDecoderTrialEnabled) {
InitFieldTrialsFromString(kDav1dDecoderFieldTrialEnabled);
InternalDecoderFactory factory;
std::unique_ptr<VideoDecoder> decoder = factory.CreateVideoDecoder(
SdpVideoFormat(cricket::kAv1CodecName,
@ -122,16 +116,6 @@ TEST(InternalDecoderFactoryTest, Av1Profile1_Dav1dDecoderTrialEnabled) {
EXPECT_EQ(static_cast<bool>(decoder), kDav1dIsIncluded);
}
TEST(InternalDecoderFactoryTest, Av1Profile1_Dav1dDecoderTrialDisabled) {
test::ScopedFieldTrials disable_dav1d(kDav1dDecoderFieldTrialDisabled);
InternalDecoderFactory factory;
std::unique_ptr<VideoDecoder> decoder = factory.CreateVideoDecoder(
SdpVideoFormat(cricket::kAv1CodecName,
{{kAV1FmtpProfile,
AV1ProfileToString(AV1Profile::kProfile1).data()}}));
EXPECT_FALSE(static_cast<bool>(decoder));
}
TEST(InternalDecoderFactoryTest, QueryCodecSupportNoReferenceScaling) {
InternalDecoderFactory factory;
EXPECT_THAT(factory.QueryCodecSupport(SdpVideoFormat(cricket::kVp8CodecName),