From 859abef68cb57c7f3ebca978c8c37f607caa8e5d Mon Sep 17 00:00:00 2001 From: Artem Titov Date: Fri, 1 Mar 2019 11:11:09 +0100 Subject: [PATCH] Use DefaultVideoQualityAnalyzer as default, cleanup headers. Bug: webrtc:10138 Change-Id: I2435b22e4e2cc2d2bfe6fd537494bdba539bb367 Reviewed-on: https://webrtc-review.googlesource.com/c/125092 Commit-Queue: Artem Titov Reviewed-by: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#26920} --- test/pc/e2e/BUILD.gn | 5 +---- test/pc/e2e/peer_connection_quality_test.cc | 4 ++-- test/pc/e2e/test_peer.cc | 7 ------- test/pc/e2e/test_peer.h | 1 - 4 files changed, 3 insertions(+), 14 deletions(-) diff --git a/test/pc/e2e/BUILD.gn b/test/pc/e2e/BUILD.gn index 62d2b26df7..92021f52d7 100644 --- a/test/pc/e2e/BUILD.gn +++ b/test/pc/e2e/BUILD.gn @@ -166,9 +166,6 @@ if (rtc_include_tests) { "test_peer.h", ] deps = [ - ":default_encoded_image_data_injector", - ":encoded_image_data_injector_api", - ":example_video_quality_analyzer", ":video_quality_analyzer_injection_helper", "../../../api:array_view", "../../../api:scoped_refptr", @@ -204,7 +201,7 @@ if (rtc_include_tests) { ] deps = [ ":default_audio_quality_analyzer", - ":example_video_quality_analyzer", + ":default_video_quality_analyzer", ":single_process_encoded_image_data_injector", ":stats_poller", ":test_peer", diff --git a/test/pc/e2e/peer_connection_quality_test.cc b/test/pc/e2e/peer_connection_quality_test.cc index 803ddb41fb..8ccff69112 100644 --- a/test/pc/e2e/peer_connection_quality_test.cc +++ b/test/pc/e2e/peer_connection_quality_test.cc @@ -26,7 +26,7 @@ #include "rtc_base/numerics/safe_conversions.h" #include "system_wrappers/include/cpu_info.h" #include "test/pc/e2e/analyzer/audio/default_audio_quality_analyzer.h" -#include "test/pc/e2e/analyzer/video/example_video_quality_analyzer.h" +#include "test/pc/e2e/analyzer/video/default_video_quality_analyzer.h" #include "test/pc/e2e/api/video_quality_analyzer_interface.h" #include "test/pc/e2e/stats_poller.h" #include "test/testsupport/file_utils.h" @@ -108,7 +108,7 @@ PeerConnectionE2EQualityTest::PeerConnectionE2EQualityTest( // even if there are no video streams, because it will be installed into video // encoder/decoder factories. if (video_quality_analyzer == nullptr) { - video_quality_analyzer = absl::make_unique(); + video_quality_analyzer = absl::make_unique(); } encoded_image_id_controller_ = absl::make_unique(); diff --git a/test/pc/e2e/test_peer.cc b/test/pc/e2e/test_peer.cc index 5dac263e29..208e35767a 100644 --- a/test/pc/e2e/test_peer.cc +++ b/test/pc/e2e/test_peer.cc @@ -21,16 +21,9 @@ #include "logging/rtc_event_log/rtc_event_log_factory.h" #include "media/engine/webrtc_media_engine.h" #include "modules/audio_device/include/audio_device.h" -#include "modules/audio_device/include/test_audio_device.h" #include "modules/audio_processing/include/audio_processing.h" #include "p2p/client/basic_port_allocator.h" -#include "pc/test/mock_peer_connection_observers.h" -#include "rtc_base/bind.h" #include "rtc_base/location.h" -#include "rtc_base/network.h" -#include "test/frame_generator_capturer.h" -#include "test/pc/e2e/analyzer/video/default_encoded_image_data_injector.h" -#include "test/pc/e2e/analyzer/video/example_video_quality_analyzer.h" #include "test/testsupport/copy_to_file_audio_capturer.h" namespace webrtc { diff --git a/test/pc/e2e/test_peer.h b/test/pc/e2e/test_peer.h index 5f88de27f4..22efa14212 100644 --- a/test/pc/e2e/test_peer.h +++ b/test/pc/e2e/test_peer.h @@ -22,7 +22,6 @@ #include "pc/test/mock_peer_connection_observers.h" #include "rtc_base/network.h" #include "rtc_base/thread.h" -#include "test/pc/e2e/analyzer/video/encoded_image_data_injector.h" #include "test/pc/e2e/analyzer/video/video_quality_analyzer_injection_helper.h" #include "test/pc/e2e/api/peerconnection_quality_test_fixture.h"