diff --git a/modules/video_coding/codecs/test/videoprocessor_integrationtest_libvpx.cc b/modules/video_coding/codecs/test/videoprocessor_integrationtest_libvpx.cc index fb117f69d1..ee4a8bb6ca 100644 --- a/modules/video_coding/codecs/test/videoprocessor_integrationtest_libvpx.cc +++ b/modules/video_coding/codecs/test/videoprocessor_integrationtest_libvpx.cc @@ -43,7 +43,6 @@ class VideoProcessorIntegrationTestLibvpx config_.output_filename = TempFilename(OutputPath(), "videoprocessor_integrationtest_libvpx"); config_.num_frames = kNumFramesLong; - config_.networking_config.packet_loss_probability = 0.0; // Only allow encoder/decoder to use single core, for predictability. config_.use_single_core = true; config_.hw_encoder = false; @@ -95,26 +94,6 @@ TEST_F(VideoProcessorIntegrationTestLibvpx, Process0PercentPacketLossVP9) { kNoVisualizationParams); } -// VP9: Run with 5% packet loss and fixed bitrate. Quality should be a bit -// lower. One key frame (first frame only) in sequence. -TEST_F(VideoProcessorIntegrationTestLibvpx, Process5PercentPacketLossVP9) { - config_.networking_config.packet_loss_probability = 0.05f; - config_.num_frames = kNumFramesShort; - config_.SetCodecSettings(kVideoCodecVP9, 1, false, false, true, false, - kResilienceOn, kCifWidth, kCifHeight); - - std::vector rate_profiles = {{500, 30, kNumFramesShort + 1}}; - - std::vector rc_thresholds = { - {0, 40, 20, 10, 20, 0, 1}}; - - QualityThresholds quality_thresholds(17.0, 14.0, 0.45, 0.36); - - ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds, - &quality_thresholds, nullptr, - kNoVisualizationParams); -} - // VP9: Run with no packet loss, with varying bitrate (3 rate updates): // low to high to medium. Check that quality and encoder response to the new // target rate/per-frame bandwidth (for each rate update) is within limits. @@ -231,46 +210,6 @@ TEST_F(VideoProcessorIntegrationTestLibvpx, ProcessZeroPacketLoss) { kNoVisualizationParams); } -// VP8: Run with 5% packet loss and fixed bitrate. Quality should be a bit -// lower. One key frame (first frame only) in sequence. -TEST_F(VideoProcessorIntegrationTestLibvpx, Process5PercentPacketLoss) { - config_.networking_config.packet_loss_probability = 0.05f; - config_.SetCodecSettings(kVideoCodecVP8, 1, false, true, true, false, - kResilienceOn, kCifWidth, kCifHeight); - config_.num_frames = kNumFramesShort; - - std::vector rate_profiles = {{500, 30, kNumFramesShort + 1}}; - - std::vector rc_thresholds = { - {0, 40, 20, 10, 15, 0, 1}}; - - QualityThresholds quality_thresholds(20.0, 16.0, 0.60, 0.40); - - ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds, - &quality_thresholds, nullptr, - kNoVisualizationParams); -} - -// VP8: Run with 10% packet loss and fixed bitrate. Quality should be lower. -// One key frame (first frame only) in sequence. -TEST_F(VideoProcessorIntegrationTestLibvpx, Process10PercentPacketLoss) { - config_.networking_config.packet_loss_probability = 0.1f; - config_.SetCodecSettings(kVideoCodecVP8, 1, false, true, true, false, - kResilienceOn, kCifWidth, kCifHeight); - config_.num_frames = kNumFramesShort; - - std::vector rate_profiles = {{500, 30, kNumFramesShort + 1}}; - - std::vector rc_thresholds = { - {0, 40, 20, 10, 15, 0, 1}}; - - QualityThresholds quality_thresholds(19.0, 16.0, 0.50, 0.35); - - ProcessFramesAndMaybeVerify(rate_profiles, &rc_thresholds, - &quality_thresholds, nullptr, - kNoVisualizationParams); -} - #endif // !defined(WEBRTC_IOS) // The tests below are currently disabled for Android. For ARM, the encoder