OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 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 #include <algorithm> | 10 #include <algorithm> |
(...skipping 3871 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3882 EXPECT_TRUE(default_receive_config.rtp.rtx.empty()) | 3882 EXPECT_TRUE(default_receive_config.rtp.rtx.empty()) |
3883 << "Enabling RTX requires rtpmap: rtx negotiation."; | 3883 << "Enabling RTX requires rtpmap: rtx negotiation."; |
3884 EXPECT_TRUE(default_receive_config.rtp.extensions.empty()) | 3884 EXPECT_TRUE(default_receive_config.rtp.extensions.empty()) |
3885 << "Enabling RTP extensions require negotiation."; | 3885 << "Enabling RTP extensions require negotiation."; |
3886 | 3886 |
3887 VerifyEmptyNackConfig(default_receive_config.rtp.nack); | 3887 VerifyEmptyNackConfig(default_receive_config.rtp.nack); |
3888 VerifyEmptyUlpfecConfig(default_receive_config.rtp.ulpfec); | 3888 VerifyEmptyUlpfecConfig(default_receive_config.rtp.ulpfec); |
3889 } | 3889 } |
3890 | 3890 |
3891 TEST_P(EndToEndTest, VerifyDefaultFlexfecReceiveConfigParameters) { | 3891 TEST_P(EndToEndTest, VerifyDefaultFlexfecReceiveConfigParameters) { |
3892 FlexfecReceiveStream::Config default_receive_config; | 3892 test::NullTransport rtcp_send_transport; |
| 3893 FlexfecReceiveStream::Config default_receive_config(&rtcp_send_transport); |
3893 EXPECT_EQ(-1, default_receive_config.payload_type) | 3894 EXPECT_EQ(-1, default_receive_config.payload_type) |
3894 << "Enabling FlexFEC requires rtpmap: flexfec negotiation."; | 3895 << "Enabling FlexFEC requires rtpmap: flexfec negotiation."; |
3895 EXPECT_EQ(0U, default_receive_config.remote_ssrc) | 3896 EXPECT_EQ(0U, default_receive_config.remote_ssrc) |
3896 << "Enabling FlexFEC requires ssrc-group: FEC-FR negotiation."; | 3897 << "Enabling FlexFEC requires ssrc-group: FEC-FR negotiation."; |
3897 EXPECT_TRUE(default_receive_config.protected_media_ssrcs.empty()) | 3898 EXPECT_TRUE(default_receive_config.protected_media_ssrcs.empty()) |
3898 << "Enabling FlexFEC requires ssrc-group: FEC-FR negotiation."; | 3899 << "Enabling FlexFEC requires ssrc-group: FEC-FR negotiation."; |
3899 } | 3900 } |
3900 | 3901 |
3901 TEST_P(EndToEndTest, TransportSeqNumOnAudioAndVideo) { | 3902 TEST_P(EndToEndTest, TransportSeqNumOnAudioAndVideo) { |
3902 static const int kExtensionId = 8; | 3903 static const int kExtensionId = 8; |
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4065 std::unique_ptr<VideoEncoder> encoder_; | 4066 std::unique_ptr<VideoEncoder> encoder_; |
4066 std::unique_ptr<VideoDecoder> decoder_; | 4067 std::unique_ptr<VideoDecoder> decoder_; |
4067 rtc::CriticalSection crit_; | 4068 rtc::CriticalSection crit_; |
4068 int recorded_frames_ GUARDED_BY(crit_); | 4069 int recorded_frames_ GUARDED_BY(crit_); |
4069 } test(this); | 4070 } test(this); |
4070 | 4071 |
4071 RunBaseTest(&test); | 4072 RunBaseTest(&test); |
4072 } | 4073 } |
4073 | 4074 |
4074 } // namespace webrtc | 4075 } // namespace webrtc |
OLD | NEW |