| 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 850 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 861 } | 861 } |
| 862 | 862 |
| 863 TEST_F(WebRtcVideoChannel2BaseTest, SendAndReceiveVp8SvcQqvga) { | 863 TEST_F(WebRtcVideoChannel2BaseTest, SendAndReceiveVp8SvcQqvga) { |
| 864 SendAndReceive(cricket::VideoCodec(100, "VP8", 160, 100, 30, 0)); | 864 SendAndReceive(cricket::VideoCodec(100, "VP8", 160, 100, 30, 0)); |
| 865 } | 865 } |
| 866 | 866 |
| 867 TEST_F(WebRtcVideoChannel2BaseTest, TwoStreamsSendAndReceive) { | 867 TEST_F(WebRtcVideoChannel2BaseTest, TwoStreamsSendAndReceive) { |
| 868 Base::TwoStreamsSendAndReceive(kVp8Codec); | 868 Base::TwoStreamsSendAndReceive(kVp8Codec); |
| 869 } | 869 } |
| 870 | 870 |
| 871 TEST_F(WebRtcVideoChannel2BaseTest, TwoStreamsReUseFirstStream) { | |
| 872 Base::TwoStreamsReUseFirstStream(kVp8Codec); | |
| 873 } | |
| 874 | |
| 875 class WebRtcVideoChannel2Test : public WebRtcVideoEngine2Test { | 871 class WebRtcVideoChannel2Test : public WebRtcVideoEngine2Test { |
| 876 public: | 872 public: |
| 877 WebRtcVideoChannel2Test() : WebRtcVideoChannel2Test("") {} | 873 WebRtcVideoChannel2Test() : WebRtcVideoChannel2Test("") {} |
| 878 explicit WebRtcVideoChannel2Test(const char* field_trials) | 874 explicit WebRtcVideoChannel2Test(const char* field_trials) |
| 879 : WebRtcVideoEngine2Test(field_trials), last_ssrc_(0) {} | 875 : WebRtcVideoEngine2Test(field_trials), last_ssrc_(0) {} |
| 880 void SetUp() override { | 876 void SetUp() override { |
| 881 fake_call_.reset(new FakeCall(webrtc::Call::Config())); | 877 fake_call_.reset(new FakeCall(webrtc::Call::Config())); |
| 882 engine_.Init(); | 878 engine_.Init(); |
| 883 channel_.reset( | 879 channel_.reset( |
| 884 engine_.CreateChannel(fake_call_.get(), MediaConfig(), VideoOptions())); | 880 engine_.CreateChannel(fake_call_.get(), MediaConfig(), VideoOptions())); |
| (...skipping 2507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3392 } | 3388 } |
| 3393 | 3389 |
| 3394 // Test that we normalize send codec format size in simulcast. | 3390 // Test that we normalize send codec format size in simulcast. |
| 3395 TEST_F(WebRtcVideoChannel2SimulcastTest, SetSendCodecsWithOddSizeInSimulcast) { | 3391 TEST_F(WebRtcVideoChannel2SimulcastTest, SetSendCodecsWithOddSizeInSimulcast) { |
| 3396 cricket::VideoCodec codec(kVp8Codec270p); | 3392 cricket::VideoCodec codec(kVp8Codec270p); |
| 3397 codec.width += 1; | 3393 codec.width += 1; |
| 3398 codec.height += 1; | 3394 codec.height += 1; |
| 3399 VerifySimulcastSettings(codec, 2, 2); | 3395 VerifySimulcastSettings(codec, 2, 2); |
| 3400 } | 3396 } |
| 3401 } // namespace cricket | 3397 } // namespace cricket |
| OLD | NEW |