zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use DefaultVideoQualityAnalyzer as default, cleanup headers.

Browse Source 
Bug: webrtc:10138
Change-Id: I2435b22e4e2cc2d2bfe6fd537494bdba539bb367
Reviewed-on: https://webrtc-review.googlesource.com/c/125092
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26920}
This commit is contained in:
Artem Titov
2019-03-01 11:11:09 +01:00
committed by Commit Bot
parent c68ddd15c2
commit 859abef68c
4 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/pc/e2e/BUILD.gn
View File

@ -166,9 +166,6 @@ if (rtc_include_tests) {
"test_peer.h", "test_peer.h",
] ]
deps = [ deps = [
":default_encoded_image_data_injector",
":encoded_image_data_injector_api",
":example_video_quality_analyzer",
":video_quality_analyzer_injection_helper", ":video_quality_analyzer_injection_helper",
"../../../api:array_view", "../../../api:array_view",
"../../../api:scoped_refptr", "../../../api:scoped_refptr",
@ -204,7 +201,7 @@ if (rtc_include_tests) {
] ]
deps = [ deps = [
":default_audio_quality_analyzer", ":default_audio_quality_analyzer",
":example_video_quality_analyzer", ":default_video_quality_analyzer",
":single_process_encoded_image_data_injector", ":single_process_encoded_image_data_injector",
":stats_poller", ":stats_poller",
":test_peer", ":test_peer",

4
test/pc/e2e/peer_connection_quality_test.cc
View File

@ -26,7 +26,7 @@
#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/numerics/safe_conversions.h"
#include "system_wrappers/include/cpu_info.h" #include "system_wrappers/include/cpu_info.h"
#include "test/pc/e2e/analyzer/audio/default_audio_quality_analyzer.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/api/video_quality_analyzer_interface.h"
#include "test/pc/e2e/stats_poller.h" #include "test/pc/e2e/stats_poller.h"
#include "test/testsupport/file_utils.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 // even if there are no video streams, because it will be installed into video
// encoder/decoder factories. // encoder/decoder factories.
if (video_quality_analyzer == nullptr) { if (video_quality_analyzer == nullptr) {
video_quality_analyzer = absl::make_unique<ExampleVideoQualityAnalyzer>(); video_quality_analyzer = absl::make_unique<DefaultVideoQualityAnalyzer>();
} }
encoded_image_id_controller_ = encoded_image_id_controller_ =
absl::make_unique<SingleProcessEncodedImageDataInjector>(); absl::make_unique<SingleProcessEncodedImageDataInjector>();

7
test/pc/e2e/test_peer.cc
View File

@ -21,16 +21,9 @@
#include "logging/rtc_event_log/rtc_event_log_factory.h" #include "logging/rtc_event_log/rtc_event_log_factory.h"
#include "media/engine/webrtc_media_engine.h" #include "media/engine/webrtc_media_engine.h"
#include "modules/audio_device/include/audio_device.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 "modules/audio_processing/include/audio_processing.h"
#include "p2p/client/basic_port_allocator.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/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" #include "test/testsupport/copy_to_file_audio_capturer.h"
namespace webrtc { namespace webrtc {

1
test/pc/e2e/test_peer.h
View File

@ -22,7 +22,6 @@
#include "pc/test/mock_peer_connection_observers.h" #include "pc/test/mock_peer_connection_observers.h"
#include "rtc_base/network.h" #include "rtc_base/network.h"
#include "rtc_base/thread.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/analyzer/video/video_quality_analyzer_injection_helper.h"
#include "test/pc/e2e/api/peerconnection_quality_test_fixture.h" #include "test/pc/e2e/api/peerconnection_quality_test_fixture.h"