Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(152)

Side by Side Diff: webrtc/media/engine/webrtcvideoengine2_unittest.cc

Issue 1902413002: Fix flake in TwoStreamsSendAndReceive. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: remove one initially Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/media/base/videoengine_unittest.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 853 matching lines...) Expand 10 before | Expand all | Expand 10 after
864 864
865 TEST_F(WebRtcVideoChannel2BaseTest, SendAndReceiveVp8Qvga) { 865 TEST_F(WebRtcVideoChannel2BaseTest, SendAndReceiveVp8Qvga) {
866 SendAndReceive(cricket::VideoCodec(100, "VP8", 320, 200, 30)); 866 SendAndReceive(cricket::VideoCodec(100, "VP8", 320, 200, 30));
867 } 867 }
868 868
869 TEST_F(WebRtcVideoChannel2BaseTest, SendAndReceiveVp8SvcQqvga) { 869 TEST_F(WebRtcVideoChannel2BaseTest, SendAndReceiveVp8SvcQqvga) {
870 SendAndReceive(cricket::VideoCodec(100, "VP8", 160, 100, 30)); 870 SendAndReceive(cricket::VideoCodec(100, "VP8", 160, 100, 30));
871 } 871 }
872 872
873 TEST_F(WebRtcVideoChannel2BaseTest, TwoStreamsSendAndReceive) { 873 TEST_F(WebRtcVideoChannel2BaseTest, TwoStreamsSendAndReceive) {
874 Base::TwoStreamsSendAndReceive(kVp8Codec); 874 // Set a high bitrate to not be downscaled by VP8 due to low initial start
875 // bitrates. This currently happens at <250k, and two streams sharing 300k
876 // initially will use QVGA instead of VGA.
877 // TODO(pbos): Set up the quality scaler so that both senders reliably start
878 // at QVGA, then verify that instead.
879 cricket::VideoCodec codec = kVp8Codec;
880 codec.params[kCodecParamStartBitrate] = "1000000";
881 Base::TwoStreamsSendAndReceive(codec);
875 } 882 }
876 883
877 class WebRtcVideoChannel2Test : public WebRtcVideoEngine2Test { 884 class WebRtcVideoChannel2Test : public WebRtcVideoEngine2Test {
878 public: 885 public:
879 WebRtcVideoChannel2Test() : WebRtcVideoChannel2Test("") {} 886 WebRtcVideoChannel2Test() : WebRtcVideoChannel2Test("") {}
880 explicit WebRtcVideoChannel2Test(const char* field_trials) 887 explicit WebRtcVideoChannel2Test(const char* field_trials)
881 : WebRtcVideoEngine2Test(field_trials), last_ssrc_(0) {} 888 : WebRtcVideoEngine2Test(field_trials), last_ssrc_(0) {}
882 void SetUp() override { 889 void SetUp() override {
883 fake_call_.reset(new FakeCall(webrtc::Call::Config())); 890 fake_call_.reset(new FakeCall(webrtc::Call::Config()));
884 engine_.Init(); 891 engine_.Init();
(...skipping 2721 matching lines...) Expand 10 before | Expand all | Expand 10 after
3606 } 3613 }
3607 3614
3608 // Test that we normalize send codec format size in simulcast. 3615 // Test that we normalize send codec format size in simulcast.
3609 TEST_F(WebRtcVideoChannel2SimulcastTest, SetSendCodecsWithOddSizeInSimulcast) { 3616 TEST_F(WebRtcVideoChannel2SimulcastTest, SetSendCodecsWithOddSizeInSimulcast) {
3610 cricket::VideoCodec codec(kVp8Codec270p); 3617 cricket::VideoCodec codec(kVp8Codec270p);
3611 codec.width += 1; 3618 codec.width += 1;
3612 codec.height += 1; 3619 codec.height += 1;
3613 VerifySimulcastSettings(codec, 2, 2); 3620 VerifySimulcastSettings(codec, 2, 2);
3614 } 3621 }
3615 } // namespace cricket 3622 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/media/base/videoengine_unittest.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698