OLD | NEW |
---|---|
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 846 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
857 | 857 |
858 TEST_F(WebRtcVideoChannel2BaseTest, SendAndReceiveVp8Qvga) { | 858 TEST_F(WebRtcVideoChannel2BaseTest, SendAndReceiveVp8Qvga) { |
859 SendAndReceive(cricket::VideoCodec(100, "VP8", 320, 200, 30)); | 859 SendAndReceive(cricket::VideoCodec(100, "VP8", 320, 200, 30)); |
860 } | 860 } |
861 | 861 |
862 TEST_F(WebRtcVideoChannel2BaseTest, SendAndReceiveVp8SvcQqvga) { | 862 TEST_F(WebRtcVideoChannel2BaseTest, SendAndReceiveVp8SvcQqvga) { |
863 SendAndReceive(cricket::VideoCodec(100, "VP8", 160, 100, 30)); | 863 SendAndReceive(cricket::VideoCodec(100, "VP8", 160, 100, 30)); |
864 } | 864 } |
865 | 865 |
866 TEST_F(WebRtcVideoChannel2BaseTest, TwoStreamsSendAndReceive) { | 866 TEST_F(WebRtcVideoChannel2BaseTest, TwoStreamsSendAndReceive) { |
867 Base::TwoStreamsSendAndReceive(kVp8Codec); | 867 // Set a high bitrate to not be downscaled by VP8 due to low initial start |
868 // bitrates. This currently happens at <250k, and two streams sharing 300k | |
869 // initially will use QVGA instead of VGA initially. | |
870 cricket::VideoCodec codec = kVp8Codec; | |
871 codec.params[kCodecParamStartBitrate] = "1000000"; | |
872 Base::TwoStreamsSendAndReceive(codec); | |
stefan-webrtc
2016/04/19 06:46:37
Shouldn't we instead change TwoStreamsSendAndRecei
| |
868 } | 873 } |
869 | 874 |
870 class WebRtcVideoChannel2Test : public WebRtcVideoEngine2Test { | 875 class WebRtcVideoChannel2Test : public WebRtcVideoEngine2Test { |
871 public: | 876 public: |
872 WebRtcVideoChannel2Test() : WebRtcVideoChannel2Test("") {} | 877 WebRtcVideoChannel2Test() : WebRtcVideoChannel2Test("") {} |
873 explicit WebRtcVideoChannel2Test(const char* field_trials) | 878 explicit WebRtcVideoChannel2Test(const char* field_trials) |
874 : WebRtcVideoEngine2Test(field_trials), last_ssrc_(0) {} | 879 : WebRtcVideoEngine2Test(field_trials), last_ssrc_(0) {} |
875 void SetUp() override { | 880 void SetUp() override { |
876 fake_call_.reset(new FakeCall(webrtc::Call::Config())); | 881 fake_call_.reset(new FakeCall(webrtc::Call::Config())); |
877 engine_.Init(); | 882 engine_.Init(); |
(...skipping 2721 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3599 } | 3604 } |
3600 | 3605 |
3601 // Test that we normalize send codec format size in simulcast. | 3606 // Test that we normalize send codec format size in simulcast. |
3602 TEST_F(WebRtcVideoChannel2SimulcastTest, SetSendCodecsWithOddSizeInSimulcast) { | 3607 TEST_F(WebRtcVideoChannel2SimulcastTest, SetSendCodecsWithOddSizeInSimulcast) { |
3603 cricket::VideoCodec codec(kVp8Codec270p); | 3608 cricket::VideoCodec codec(kVp8Codec270p); |
3604 codec.width += 1; | 3609 codec.width += 1; |
3605 codec.height += 1; | 3610 codec.height += 1; |
3606 VerifySimulcastSettings(codec, 2, 2); | 3611 VerifySimulcastSettings(codec, 2, 2); |
3607 } | 3612 } |
3608 } // namespace cricket | 3613 } // namespace cricket |
OLD | NEW |