admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add starting of VideoQualityAnalyzer in the e2e peer connection level test

Browse Source 
Bug: webrtc:10138
Change-Id: Ic762543e21a5b55c7f15856fe752534b910dec8f
Reviewed-on: https://webrtc-review.googlesource.com/c/121941
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Reviewed-by: Peter Slatala <psla@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26599}
This commit is contained in:
Artem Titov 2019-02-08 00:35:13 +01:00 committed by Commit Bot
parent 5963fddac2
commit 9f97c9a528
3 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/pc/e2e/analyzer/video/video_quality_analyzer_injection_helper.cc
View File

@ -131,6 +131,10 @@ VideoQualityAnalyzerInjectionHelper::CreateVideoSink(
return absl::make_unique<AnalyzingVideoSink>(analyzer_.get(), writer);
}
void VideoQualityAnalyzerInjectionHelper::Start(int max_threads_count) {
analyzer_->Start(max_threads_count);
}
void VideoQualityAnalyzerInjectionHelper::Stop() {
analyzer_->Stop();
}

2
test/pc/e2e/analyzer/video/video_quality_analyzer_injection_helper.h
View File

@ -59,6 +59,8 @@ class VideoQualityAnalyzerInjectionHelper {
std::unique_ptr<rtc::VideoSinkInterface<VideoFrame>> CreateVideoSink(
VideoFrameWriter* writer) const;
void Start(int max_threads_count);
// Stops VideoQualityAnalyzerInterface to populate final data and metrics.
void Stop();

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

@ -18,6 +18,7 @@
#include "api/units/time_delta.h"
#include "rtc_base/bind.h"
#include "rtc_base/gunit.h"
#include "system_wrappers/include/cpu_info.h"
#include "test/pc/e2e/analyzer/video/example_video_quality_analyzer.h"
#include "test/pc/e2e/api/video_quality_analyzer_interface.h"
#include "test/testsupport/file_utils.h"
@ -30,6 +31,12 @@ using VideoConfig = PeerConnectionE2EQualityTestFixture::VideoConfig;
constexpr int kDefaultTimeoutMs = 10000;
constexpr char kSignalThreadName[] = "signaling_thread";
// 1 signaling, 2 network, 2 worker and 2 extra for codecs etc.
constexpr int kPeerConnectionUsedThreads = 7;
// Framework has extra thread for network layer and extra thread for peer
// connection stats polling.
constexpr int kFrameworkUsedThreads = 2;
constexpr int kMaxVideoAnalyzerThreads = 8;
std::string VideoConfigSourcePresenceToString(const VideoConfig& video_config) {
char buf[1024];
@ -115,10 +122,25 @@ PeerConnectionE2EQualityTest::PeerConnectionE2EQualityTest(
void PeerConnectionE2EQualityTest::Run(RunParams run_params) {
SetMissedVideoStreamLabels({alice_->params(), bob_->params()});
ValidateParams({alice_->params(), bob_->params()});
int num_cores = CpuInfo::DetectNumberOfCores();
RTC_DCHECK_GE(num_cores, 1);
int video_analyzer_threads =
num_cores - kPeerConnectionUsedThreads - kFrameworkUsedThreads;
if (video_analyzer_threads <= 0) {
video_analyzer_threads = 1;
}
video_analyzer_threads =
std::min(video_analyzer_threads, kMaxVideoAnalyzerThreads);
RTC_LOG(INFO) << "video_analyzer_threads=" << video_analyzer_threads;
video_quality_analyzer_injection_helper_->Start(video_analyzer_threads);
signaling_thread_->Invoke<void>(
RTC_FROM_HERE,
rtc::Bind(&PeerConnectionE2EQualityTest::RunOnSignalingThread, this,
run_params));
video_quality_analyzer_injection_helper_->Stop();
}
void PeerConnectionE2EQualityTest::SetMissedVideoStreamLabels(
@ -192,7 +214,6 @@ void PeerConnectionE2EQualityTest::RunOnSignalingThread(RunParams run_params) {
done.Wait(static_cast<int>(run_params.run_duration.ms()));
TearDownCall();
video_quality_analyzer_injection_helper_->Stop();
}
void PeerConnectionE2EQualityTest::AddMedia(TestPeer* peer) {