diff --git a/modules/video_coding/codecs/test/plot_webrtc_test_logs.py b/modules/video_coding/codecs/test/plot_webrtc_test_logs.py index 22e415778d..a0cdc0637f 100755 --- a/modules/video_coding/codecs/test/plot_webrtc_test_logs.py +++ b/modules/video_coding/codecs/test/plot_webrtc_test_logs.py @@ -18,9 +18,8 @@ import re import matplotlib.pyplot as plt # Log events. -EVENT_START = \ - 'RUN ] CodecSettings/VideoProcessorIntegrationTestParameterized.' -EVENT_END = 'OK ] CodecSettings/VideoProcessorIntegrationTestParameterized.' +EVENT_START = 'RUN ] CodecSettings/VideoCodecTestParameterized.' +EVENT_END = 'OK ] CodecSettings/VideoCodecTestParameterized.' # Metrics to plot, tuple: (name to parse in file, label to use when plotting). WIDTH = ('width', 'width') diff --git a/modules/video_coding/codecs/test/videocodec_test_libvpx.cc b/modules/video_coding/codecs/test/videocodec_test_libvpx.cc index 3e7332ae01..10ab8af4e9 100644 --- a/modules/video_coding/codecs/test/videocodec_test_libvpx.cc +++ b/modules/video_coding/codecs/test/videocodec_test_libvpx.cc @@ -92,7 +92,7 @@ void PrintRdPerf(std::map> rd_stats) { #if !defined(WEBRTC_IOS) #if !defined(RTC_DISABLE_VP9) -TEST(VideoProcessorIntegrationTestLibvpx, HighBitrateVP9) { +TEST(VideoCodecTestLibvpx, HighBitrateVP9) { auto config = CreateTestConfig(); config.SetCodecSettings(cricket::kVp9CodecName, 1, 1, 1, false, true, false, kCifWidth, kCifHeight); @@ -112,7 +112,7 @@ TEST(VideoProcessorIntegrationTestLibvpx, HighBitrateVP9) { nullptr); } -TEST(VideoProcessorIntegrationTestLibvpx, ChangeBitrateVP9) { +TEST(VideoCodecTestLibvpx, ChangeBitrateVP9) { auto config = CreateTestConfig(); config.SetCodecSettings(cricket::kVp9CodecName, 1, 1, 1, false, true, false, kCifWidth, kCifHeight); @@ -137,7 +137,7 @@ TEST(VideoProcessorIntegrationTestLibvpx, ChangeBitrateVP9) { nullptr); } -TEST(VideoProcessorIntegrationTestLibvpx, ChangeFramerateVP9) { +TEST(VideoCodecTestLibvpx, ChangeFramerateVP9) { auto config = CreateTestConfig(); config.SetCodecSettings(cricket::kVp9CodecName, 1, 1, 1, false, true, false, kCifWidth, kCifHeight); @@ -164,7 +164,7 @@ TEST(VideoProcessorIntegrationTestLibvpx, ChangeFramerateVP9) { nullptr); } -TEST(VideoProcessorIntegrationTestLibvpx, DenoiserOnVP9) { +TEST(VideoCodecTestLibvpx, DenoiserOnVP9) { auto config = CreateTestConfig(); config.SetCodecSettings(cricket::kVp9CodecName, 1, 1, 1, true, true, false, kCifWidth, kCifHeight); @@ -184,7 +184,7 @@ TEST(VideoProcessorIntegrationTestLibvpx, DenoiserOnVP9) { nullptr); } -TEST(VideoProcessorIntegrationTestLibvpx, VeryLowBitrateVP9) { +TEST(VideoCodecTestLibvpx, VeryLowBitrateVP9) { auto config = CreateTestConfig(); config.SetCodecSettings(cricket::kVp9CodecName, 1, 1, 1, false, true, true, kCifWidth, kCifHeight); @@ -208,7 +208,7 @@ TEST(VideoProcessorIntegrationTestLibvpx, VeryLowBitrateVP9) { #endif // !defined(RTC_DISABLE_VP9) -TEST(VideoProcessorIntegrationTestLibvpx, HighBitrateVP8) { +TEST(VideoCodecTestLibvpx, HighBitrateVP8) { auto config = CreateTestConfig(); config.SetCodecSettings(cricket::kVp8CodecName, 1, 1, 1, true, true, false, kCifWidth, kCifHeight); @@ -248,7 +248,7 @@ TEST(VideoProcessorIntegrationTestLibvpx, HighBitrateVP8) { #else #define MAYBE_ChangeBitrateVP8 ChangeBitrateVP8 #endif -TEST(VideoProcessorIntegrationTestLibvpx, MAYBE_ChangeBitrateVP8) { +TEST(VideoCodecTestLibvpx, MAYBE_ChangeBitrateVP8) { auto config = CreateTestConfig(); config.SetCodecSettings(cricket::kVp8CodecName, 1, 1, 1, true, true, false, kCifWidth, kCifHeight); @@ -283,7 +283,7 @@ TEST(VideoProcessorIntegrationTestLibvpx, MAYBE_ChangeBitrateVP8) { #else #define MAYBE_ChangeFramerateVP8 ChangeFramerateVP8 #endif -TEST(VideoProcessorIntegrationTestLibvpx, MAYBE_ChangeFramerateVP8) { +TEST(VideoCodecTestLibvpx, MAYBE_ChangeFramerateVP8) { auto config = CreateTestConfig(); config.SetCodecSettings(cricket::kVp8CodecName, 1, 1, 1, true, true, false, kCifWidth, kCifHeight); @@ -324,7 +324,7 @@ TEST(VideoProcessorIntegrationTestLibvpx, MAYBE_ChangeFramerateVP8) { #else #define MAYBE_TemporalLayersVP8 TemporalLayersVP8 #endif -TEST(VideoProcessorIntegrationTestLibvpx, MAYBE_TemporalLayersVP8) { +TEST(VideoCodecTestLibvpx, MAYBE_TemporalLayersVP8) { auto config = CreateTestConfig(); config.SetCodecSettings(cricket::kVp8CodecName, 1, 1, 3, true, true, false, kCifWidth, kCifHeight); @@ -360,7 +360,7 @@ TEST(VideoProcessorIntegrationTestLibvpx, MAYBE_TemporalLayersVP8) { #else #define MAYBE_MultiresVP8 MultiresVP8 #endif -TEST(VideoProcessorIntegrationTestLibvpx, MAYBE_MultiresVP8) { +TEST(VideoCodecTestLibvpx, MAYBE_MultiresVP8) { auto config = CreateTestConfig(); config.filename = "ConferenceMotion_1280_720_50"; config.filepath = ResourcePath(config.filename, "yuv"); @@ -387,7 +387,7 @@ TEST(VideoProcessorIntegrationTestLibvpx, MAYBE_MultiresVP8) { #else #define MAYBE_SimulcastVP8 SimulcastVP8 #endif -TEST(VideoProcessorIntegrationTestLibvpx, MAYBE_SimulcastVP8) { +TEST(VideoCodecTestLibvpx, MAYBE_SimulcastVP8) { auto config = CreateTestConfig(); config.filename = "ConferenceMotion_1280_720_50"; config.filepath = ResourcePath(config.filename, "yuv"); @@ -415,7 +415,7 @@ TEST(VideoProcessorIntegrationTestLibvpx, MAYBE_SimulcastVP8) { #else #define MAYBE_SvcVP9 SvcVP9 #endif -TEST(VideoProcessorIntegrationTestLibvpx, MAYBE_SvcVP9) { +TEST(VideoCodecTestLibvpx, MAYBE_SvcVP9) { auto config = CreateTestConfig(); config.filename = "ConferenceMotion_1280_720_50"; config.filepath = ResourcePath(config.filename, "yuv"); @@ -436,7 +436,7 @@ TEST(VideoProcessorIntegrationTestLibvpx, MAYBE_SvcVP9) { nullptr); } -TEST(VideoProcessorIntegrationTestLibvpx, DISABLED_MultiresVP8RdPerf) { +TEST(VideoCodecTestLibvpx, DISABLED_MultiresVP8RdPerf) { auto config = CreateTestConfig(); config.filename = "FourPeople_1280x720_30"; config.filepath = ResourcePath(config.filename, "yuv"); @@ -463,7 +463,7 @@ TEST(VideoProcessorIntegrationTestLibvpx, DISABLED_MultiresVP8RdPerf) { PrintRdPerf(rd_stats); } -TEST(VideoProcessorIntegrationTestLibvpx, DISABLED_SvcVP9RdPerf) { +TEST(VideoCodecTestLibvpx, DISABLED_SvcVP9RdPerf) { auto config = CreateTestConfig(); config.filename = "FourPeople_1280x720_30"; config.filepath = ResourcePath(config.filename, "yuv"); diff --git a/modules/video_coding/codecs/test/videocodec_test_mediacodec.cc b/modules/video_coding/codecs/test/videocodec_test_mediacodec.cc index aa6c2d4048..2bbbda9e94 100644 --- a/modules/video_coding/codecs/test/videocodec_test_mediacodec.cc +++ b/modules/video_coding/codecs/test/videocodec_test_mediacodec.cc @@ -37,7 +37,7 @@ TestConfig CreateTestConfig() { } } // namespace -TEST(VideoProcessorIntegrationTestMediaCodec, ForemanCif500kbpsVp8) { +TEST(VideoCodecTestMediaCodec, ForemanCif500kbpsVp8) { auto config = CreateTestConfig(); config.SetCodecSettings(cricket::kVp8CodecName, 1, 1, 1, false, false, false, 352, 288); @@ -58,7 +58,7 @@ TEST(VideoProcessorIntegrationTestMediaCodec, ForemanCif500kbpsVp8) { nullptr); } -TEST(VideoProcessorIntegrationTestMediaCodec, ForemanCif500kbpsH264CBP) { +TEST(VideoCodecTestMediaCodec, ForemanCif500kbpsH264CBP) { auto config = CreateTestConfig(); const auto frame_checker = rtc::MakeUnique< VideoCodecTestFixtureImpl::H264KeyframeChecker>(); @@ -84,8 +84,7 @@ TEST(VideoProcessorIntegrationTestMediaCodec, ForemanCif500kbpsH264CBP) { // TODO(brandtr): Enable this test when we have trybots/buildbots with // HW encoders that support CHP. -TEST(VideoProcessorIntegrationTestMediaCodec, - DISABLED_ForemanCif500kbpsH264CHP) { +TEST(VideoCodecTestMediaCodec, DISABLED_ForemanCif500kbpsH264CHP) { auto config = CreateTestConfig(); const auto frame_checker = rtc::MakeUnique< VideoCodecTestFixtureImpl::H264KeyframeChecker>(); @@ -111,7 +110,7 @@ TEST(VideoProcessorIntegrationTestMediaCodec, nullptr); } -TEST(VideoProcessorIntegrationTestMediaCodec, ForemanMixedRes100kbpsVp8H264) { +TEST(VideoCodecTestMediaCodec, ForemanMixedRes100kbpsVp8H264) { auto config = CreateTestConfig(); const int kNumFrames = 30; const std::vector codecs = {cricket::kVp8CodecName, diff --git a/modules/video_coding/codecs/test/videocodec_test_openh264.cc b/modules/video_coding/codecs/test/videocodec_test_openh264.cc index 682e4745e6..d2bcc7f07b 100644 --- a/modules/video_coding/codecs/test/videocodec_test_openh264.cc +++ b/modules/video_coding/codecs/test/videocodec_test_openh264.cc @@ -38,7 +38,7 @@ TestConfig CreateTestConfig() { } } // namespace -TEST(VideoProcessorIntegrationTestOpenH264, ConstantHighBitrate) { +TEST(VideoCodecTestOpenH264, ConstantHighBitrate) { auto frame_checker = rtc::MakeUnique< VideoCodecTestFixtureImpl::H264KeyframeChecker>(); auto config = CreateTestConfig(); @@ -60,7 +60,7 @@ TEST(VideoProcessorIntegrationTestOpenH264, ConstantHighBitrate) { // H264: Enable SingleNalUnit packetization mode. Encoder should split // large frames into multiple slices and limit length of NAL units. -TEST(VideoProcessorIntegrationTestOpenH264, SingleNalUnit) { +TEST(VideoCodecTestOpenH264, SingleNalUnit) { auto frame_checker = rtc::MakeUnique< VideoCodecTestFixtureImpl::H264KeyframeChecker>(); auto config = CreateTestConfig(); diff --git a/modules/video_coding/codecs/test/videocodec_test_parameterized.cc b/modules/video_coding/codecs/test/videocodec_test_parameterized.cc index 200af91536..c0c8a14bb2 100644 --- a/modules/video_coding/codecs/test/videocodec_test_parameterized.cc +++ b/modules/video_coding/codecs/test/videocodec_test_parameterized.cc @@ -40,16 +40,16 @@ const int kNumFrames = 30; } // namespace // Tests for plotting statistics from logs. -class VideoProcessorIntegrationTestParameterized +class VideoCodecTestParameterized : public ::testing::Test, public ::testing::WithParamInterface< ::testing::tuple> { protected: - VideoProcessorIntegrationTestParameterized() + VideoCodecTestParameterized() : bitrate_(::testing::get<0>(GetParam())), codec_type_(::testing::get<1>(GetParam())), hw_codec_(::testing::get<2>(GetParam())) {} - ~VideoProcessorIntegrationTestParameterized() override = default; + ~VideoCodecTestParameterized() override = default; void RunTest(size_t width, size_t height, @@ -89,17 +89,16 @@ class VideoProcessorIntegrationTestParameterized }; INSTANTIATE_TEST_CASE_P(CodecSettings, - VideoProcessorIntegrationTestParameterized, + VideoCodecTestParameterized, ::testing::Combine(::testing::ValuesIn(kBitrates), ::testing::ValuesIn(kVideoCodecType), ::testing::ValuesIn(kHwCodec))); -TEST_P(VideoProcessorIntegrationTestParameterized, Foreman_352x288_30) { +TEST_P(VideoCodecTestParameterized, Foreman_352x288_30) { RunTest(352, 288, 30, "foreman_cif"); } -TEST_P(VideoProcessorIntegrationTestParameterized, - DISABLED_FourPeople_1280x720_30) { +TEST_P(VideoCodecTestParameterized, DISABLED_FourPeople_1280x720_30) { RunTest(1280, 720, 30, "FourPeople_1280x720_30"); } diff --git a/modules/video_coding/codecs/test/videocodec_test_videotoolbox.cc b/modules/video_coding/codecs/test/videocodec_test_videotoolbox.cc index 67232b4f96..6d1ec8e3aa 100644 --- a/modules/video_coding/codecs/test/videocodec_test_videotoolbox.cc +++ b/modules/video_coding/codecs/test/videocodec_test_videotoolbox.cc @@ -52,8 +52,7 @@ std::unique_ptr CreateTestFixtureWithConfig( // TODO(kthelgason): Use RC Thresholds when the internal bitrateAdjuster is no // longer in use. -MAYBE_TEST(VideoProcessorIntegrationTestVideoToolbox, - ForemanCif500kbpsH264CBP) { +MAYBE_TEST(VideoCodecTestVideoToolbox, ForemanCif500kbpsH264CBP) { const auto frame_checker = rtc::MakeUnique< VideoCodecTestFixtureImpl::H264KeyframeChecker>(); auto config = CreateTestConfig(); @@ -70,8 +69,7 @@ MAYBE_TEST(VideoProcessorIntegrationTestVideoToolbox, nullptr); } -MAYBE_TEST(VideoProcessorIntegrationTestVideoToolbox, - ForemanCif500kbpsH264CHP) { +MAYBE_TEST(VideoCodecTestVideoToolbox, ForemanCif500kbpsH264CHP) { const auto frame_checker = rtc::MakeUnique< VideoCodecTestFixtureImpl::H264KeyframeChecker>(); auto config = CreateTestConfig();