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

Fixing failing ScenarioTest for IOS ARM64 Debug builds.

Browse Source 
This CL does two things:

* It ensures that video quality analysis is always finished when a
Scenario test is stopped. This ensures consistency between different
task queue implementations.
* It disables one real time test that is too heavy to run on IOS
ARM64 debug builds.

Bug: webrtc:10515
Change-Id: I34b59ecde6f2b68c399734a43ecdbc7223725b17
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/131388
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Artem Titarenko <artit@google.com>
Cr-Commit-Position: refs/heads/master@{#27495}
This commit is contained in:
Sebastian Jansson 2019-04-08 16:47:49 +02:00 committed by Commit Bot
parent c01367db40
commit 7237c157ec
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/scenario/quality_stats.cc
View File

@ -28,7 +28,7 @@ VideoFrameMatcher::VideoFrameMatcher(
: frame_pair_handlers_(frame_pair_handlers), task_queue_("VideoAnalyzer") {}
VideoFrameMatcher::~VideoFrameMatcher() {
task_queue_.SendTask([] {});
task_queue_.SendTask([this] { Finalize(); });
}
void VideoFrameMatcher::RegisterLayer(int layer_id) {

4
test/scenario/quality_stats_unittest.cc
View File

@ -40,7 +40,7 @@ TEST(ScenarioAnalyzerTest, PsnrIsHighWhenNetworkIsGood) {
}
// This is mainty a regression test, the target is based on previous runs and
// might change due to changes in configuration and encoder etc.
EXPECT_GT(analyzer.stats().psnr.Mean(), 45);
EXPECT_GT(analyzer.stats().psnr.Mean(), 40);
}
TEST(ScenarioAnalyzerTest, PsnrIsLowWhenNetworkIsBad) {
@ -55,7 +55,7 @@ TEST(ScenarioAnalyzerTest, PsnrIsLowWhenNetworkIsBad) {
}
// This is mainty a regression test, the target is based on previous runs and
// might change due to changes in configuration and encoder etc.
EXPECT_LT(analyzer.stats().psnr.Mean(), 43);
EXPECT_LT(analyzer.stats().psnr.Mean(), 30);
}
} // namespace test
} // namespace webrtc

9
test/scenario/scenario_unittest.cc
View File

@ -83,7 +83,7 @@ void SetupVideoCall(Scenario& s, VideoQualityAnalyzer* analyzer) {
}
} // namespace
TEST(ScenarioTest, SimTimeEncoding) {
TEST(ScenarioTest, MAYBE_SimTimeEncoding) {
VideoQualityAnalyzerConfig analyzer_config;
analyzer_config.psnr_coverage = 0.1;
VideoQualityAnalyzer analyzer(analyzer_config);
@ -97,7 +97,12 @@ TEST(ScenarioTest, SimTimeEncoding) {
EXPECT_EQ(analyzer.stats().lost_count, 0);
}
TEST(ScenarioTest, RealTimeEncoding) {
#if defined(WEBRTC_IOS) && defined(WEBRTC_ARCH_ARM64) && !defined(NDEBUG)
#define MAYBE_RealTimeEncoding DISABLED_RealTimeEncoding
#else
#define MAYBE_RealTimeEncoding RealTimeEncoding
#endif
TEST(ScenarioTest, MAYBE_RealTimeEncoding) {
VideoQualityAnalyzerConfig analyzer_config;
analyzer_config.psnr_coverage = 0.1;
VideoQualityAnalyzer analyzer(analyzer_config);