| 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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 } | 77 } |
| 78 } | 78 } |
| 79 return false; | 79 return false; |
| 80 } | 80 } |
| 81 | 81 |
| 82 rtc::scoped_refptr<webrtc::VideoFrameBuffer> CreateBlackFrameBuffer( | 82 rtc::scoped_refptr<webrtc::VideoFrameBuffer> CreateBlackFrameBuffer( |
| 83 int width, | 83 int width, |
| 84 int height) { | 84 int height) { |
| 85 rtc::scoped_refptr<webrtc::I420Buffer> buffer = | 85 rtc::scoped_refptr<webrtc::I420Buffer> buffer = |
| 86 webrtc::I420Buffer::Create(width, height); | 86 webrtc::I420Buffer::Create(width, height); |
| 87 buffer->SetToBlack(); | 87 webrtc::I420Buffer::SetBlack(buffer); |
| 88 return buffer; | 88 return buffer; |
| 89 } | 89 } |
| 90 | 90 |
| 91 void VerifySendStreamHasRtxTypes(const webrtc::VideoSendStream::Config& config, | 91 void VerifySendStreamHasRtxTypes(const webrtc::VideoSendStream::Config& config, |
| 92 const std::map<int, int>& rtx_types) { | 92 const std::map<int, int>& rtx_types) { |
| 93 std::map<int, int>::const_iterator it; | 93 std::map<int, int>::const_iterator it; |
| 94 it = rtx_types.find(config.encoder_settings.payload_type); | 94 it = rtx_types.find(config.encoder_settings.payload_type); |
| 95 EXPECT_TRUE(it != rtx_types.end() && | 95 EXPECT_TRUE(it != rtx_types.end() && |
| 96 it->second == config.rtp.rtx.payload_type); | 96 it->second == config.rtp.rtx.payload_type); |
| 97 | 97 |
| (...skipping 3960 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4058 | 4058 |
| 4059 TEST_F(WebRtcVideoChannel2SimulcastTest, SetSendCodecsWith3SimulcastStreams) { | 4059 TEST_F(WebRtcVideoChannel2SimulcastTest, SetSendCodecsWith3SimulcastStreams) { |
| 4060 VerifySimulcastSettings(cricket::VideoCodec("VP8"), 1280, 720, 3, 3); | 4060 VerifySimulcastSettings(cricket::VideoCodec("VP8"), 1280, 720, 3, 3); |
| 4061 } | 4061 } |
| 4062 | 4062 |
| 4063 // Test that we normalize send codec format size in simulcast. | 4063 // Test that we normalize send codec format size in simulcast. |
| 4064 TEST_F(WebRtcVideoChannel2SimulcastTest, SetSendCodecsWithOddSizeInSimulcast) { | 4064 TEST_F(WebRtcVideoChannel2SimulcastTest, SetSendCodecsWithOddSizeInSimulcast) { |
| 4065 VerifySimulcastSettings(cricket::VideoCodec("VP8"), 541, 271, 2, 2); | 4065 VerifySimulcastSettings(cricket::VideoCodec("VP8"), 541, 271, 2, 2); |
| 4066 } | 4066 } |
| 4067 } // namespace cricket | 4067 } // namespace cricket |
| OLD | NEW |