Bug 1766646 - Vendor libwebrtc from 2a25a96973

Upstream commit: https://webrtc.googlesource.com/src/+/2a25a969731da40dbcf3468ff58713ea5c643484
    Disable flacky tests on mac bots

    Bug: webrtc:12846
    Change-Id: I4bde0e2533e499c0dcc92582288c3c22a2662b08
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/221201
    Reviewed-by: Henrik Boström <hbos@webrtc.org>
    Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org>
    Cr-Commit-Position: refs/heads/master@{#34212}
This commit is contained in:
Michael Froman 2022-05-26 15:58:50 -05:00 committed by Connor Sheehan
parent 4ccec5a5e2
commit 1382433374
3 changed files with 11 additions and 0 deletions

View File

@ -6174,3 +6174,6 @@ ab229b0706
# MOZ_LIBWEBRTC_SRC=/home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src MOZ_LIBWEBRTC_COMMIT=mjfdev bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh
# base of lastest vendoring
f3ff3c5b77
# MOZ_LIBWEBRTC_SRC=/home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src MOZ_LIBWEBRTC_COMMIT=mjfdev bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh
# base of lastest vendoring
2a25a96973

View File

@ -4118,3 +4118,5 @@ libwebrtc updated from /home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwe
libwebrtc updated from /home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src commit mjfdev on 2022-05-26T20:57:22.025831.
# python3 vendor-libwebrtc.py --from-local /home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src --commit mjfdev libwebrtc
libwebrtc updated from /home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src commit mjfdev on 2022-05-26T20:58:03.238570.
# python3 vendor-libwebrtc.py --from-local /home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src --commit mjfdev libwebrtc
libwebrtc updated from /home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src commit mjfdev on 2022-05-26T20:58:45.564463.

View File

@ -455,6 +455,8 @@ TEST_F(OveruseFrameDetectorTest, RunOnTqNormalUsage) {
EXPECT_TRUE(event.Wait(10000));
}
// TODO(crbug.com/webrtc/12846): investigate why the test fails on MAC bots.
#if !defined(WEBRTC_MAC)
TEST_F(OveruseFrameDetectorTest, MaxIntervalScalesWithFramerate) {
const int kCapturerMaxFrameRate = 30;
const int kEncodeMaxFrameRate = 20; // Maximum fps the encoder can sustain.
@ -490,6 +492,7 @@ TEST_F(OveruseFrameDetectorTest, MaxIntervalScalesWithFramerate) {
processing_time_us);
overuse_detector_->CheckForOveruse(observer_);
}
#endif
TEST_F(OveruseFrameDetectorTest, RespectsMinFramerate) {
const int kMinFrameRate = 7; // Minimum fps allowed by current detector impl.
@ -821,6 +824,8 @@ TEST_F(OveruseFrameDetectorTest2, ResetAfterFrameTimeout) {
EXPECT_EQ(InitialUsage(), UsagePercent());
}
// TODO(crbug.com/webrtc/12846): investigate why the test fails on MAC bots.
#if !defined(WEBRTC_MAC)
TEST_F(OveruseFrameDetectorTest2, ConvergesSlowly) {
overuse_detector_->SetOptions(options_);
InsertAndSendFramesWithInterval(1, kFrameIntervalUs, kWidth, kHeight,
@ -842,6 +847,7 @@ TEST_F(OveruseFrameDetectorTest2, ConvergesSlowly) {
kProcessTimeUs);
EXPECT_NEAR(UsagePercent(), 20, 5);
}
#endif
TEST_F(OveruseFrameDetectorTest2, InitialProcessingUsage) {
overuse_detector_->SetOptions(options_);