From d0844a80deaab28d7df8e5dff9f71e6ab6919025 Mon Sep 17 00:00:00 2001 From: Florent Castelli Date: Tue, 23 Feb 2021 11:44:56 +0000 Subject: [PATCH] Revert "Add test for odd sizes with spatial layers" This reverts commit 6fe3fa14c6686ba9c51095b97ad2e6833a9b03e5. Reason for revert: Test failures on Android x86 Original change's description: > Add test for odd sizes with spatial layers > > Bug: webrtc:12398 > Change-Id: If28f22f8c08913315806d26ad0b355eabda67da6 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/203889 > Reviewed-by: Philip Eliasson > Commit-Queue: Jerome Jiang > Cr-Commit-Position: refs/heads/master@{#33319} Bug: webrtc:12398 Change-Id: I801d2d1d2b27e89e4b6af64d79af80a901708682 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/208521 Reviewed-by: Florent Castelli Commit-Queue: Florent Castelli Cr-Commit-Position: refs/heads/master@{#33323} --- .../codecs/av1/libaom_av1_encoder_unittest.cc | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/modules/video_coding/codecs/av1/libaom_av1_encoder_unittest.cc b/modules/video_coding/codecs/av1/libaom_av1_encoder_unittest.cc index ea77e091af..3cc373d4da 100644 --- a/modules/video_coding/codecs/av1/libaom_av1_encoder_unittest.cc +++ b/modules/video_coding/codecs/av1/libaom_av1_encoder_unittest.cc @@ -103,23 +103,6 @@ TEST(LibaomAv1EncoderTest, SetsEndOfPictureForLastFrameInTemporalUnit) { EXPECT_TRUE(encoded_frames[5].codec_specific_info.end_of_picture); } -TEST(LibaomAv1EncoderTest, CheckOddDimensionsWithSpatialLayers) { - std::unique_ptr encoder = CreateLibaomAv1Encoder(); - VideoCodec codec_settings = DefaultCodecSettings(); - // Configure encoder with 3 spatial layers. - codec_settings.SetScalabilityMode("L3T1"); - // Odd width and height values should not make encoder crash. - codec_settings.width = 623; - codec_settings.height = 405; - ASSERT_EQ(encoder->InitEncode(&codec_settings, DefaultEncoderSettings()), - WEBRTC_VIDEO_CODEC_OK); - EncodedVideoFrameProducer evfp(*encoder); - evfp.SetResolution(RenderResolution{623, 405}); - std::vector encoded_frames = - evfp.SetNumInputFrames(2).Encode(); - ASSERT_THAT(encoded_frames, SizeIs(6)); -} - TEST(LibaomAv1EncoderTest, EncoderInfoProvidesFpsAllocation) { std::unique_ptr encoder = CreateLibaomAv1Encoder(); VideoCodec codec_settings = DefaultCodecSettings();