Index: video/end_to_end_tests.cc |
diff --git a/video/end_to_end_tests.cc b/video/end_to_end_tests.cc |
index 06a711822814c264936f0797619498673cae819f..deff0fee6d3ce08a604cef779d9c21e6dc3fcfc8 100644 |
--- a/video/end_to_end_tests.cc |
+++ b/video/end_to_end_tests.cc |
@@ -696,8 +696,8 @@ TEST_F(EndToEndTest, ReceivesUlpfec) { |
// Enable ULPFEC over RED. |
send_config->rtp.ulpfec.red_payload_type = kRedPayloadType; |
send_config->rtp.ulpfec.ulpfec_payload_type = kUlpfecPayloadType; |
- (*receive_configs)[0].rtp.ulpfec.red_payload_type = kRedPayloadType; |
- (*receive_configs)[0].rtp.ulpfec.ulpfec_payload_type = kUlpfecPayloadType; |
+ (*receive_configs)[0].rtp.red_payload_type = kRedPayloadType; |
+ (*receive_configs)[0].rtp.ulpfec_payload_type = kUlpfecPayloadType; |
(*receive_configs)[0].renderer = this; |
} |
@@ -860,9 +860,6 @@ class FlexfecRenderObserver : public test::EndToEndTest, |
(*receive_configs)[0].rtp.nack.rtp_history_ms = |
test::CallTest::kNackRtpHistoryMs; |
- (*receive_configs)[0].rtp.ulpfec.red_rtx_payload_type = |
- test::CallTest::kRtxRedPayloadType; |
- |
(*receive_configs)[0].rtp.rtx_ssrc = test::CallTest::kSendRtxSsrcs[0]; |
(*receive_configs)[0] |
.rtp |
@@ -1043,8 +1040,8 @@ TEST_F(EndToEndTest, ReceivedUlpfecPacketsNotNacked) { |
send_config->encoder_settings.payload_type = kFakeVideoSendPayloadType; |
(*receive_configs)[0].rtp.nack.rtp_history_ms = kNackRtpHistoryMs; |
- (*receive_configs)[0].rtp.ulpfec.red_payload_type = kRedPayloadType; |
- (*receive_configs)[0].rtp.ulpfec.ulpfec_payload_type = kUlpfecPayloadType; |
+ (*receive_configs)[0].rtp.red_payload_type = kRedPayloadType; |
+ (*receive_configs)[0].rtp.ulpfec_payload_type = kUlpfecPayloadType; |
(*receive_configs)[0].decoders.resize(1); |
(*receive_configs)[0].decoders[0].payload_type = |
@@ -1171,12 +1168,10 @@ void EndToEndTest::DecodesRetransmittedFrame(bool enable_rtx, bool enable_red) { |
send_config->rtp.ulpfec.red_payload_type = kRedPayloadType; |
if (retransmission_ssrc_ == kSendRtxSsrcs[0]) |
send_config->rtp.ulpfec.red_rtx_payload_type = kRtxRedPayloadType; |
- (*receive_configs)[0].rtp.ulpfec.ulpfec_payload_type = |
+ (*receive_configs)[0].rtp.ulpfec_payload_type = |
send_config->rtp.ulpfec.ulpfec_payload_type; |
- (*receive_configs)[0].rtp.ulpfec.red_payload_type = |
+ (*receive_configs)[0].rtp.red_payload_type = |
send_config->rtp.ulpfec.red_payload_type; |
- (*receive_configs)[0].rtp.ulpfec.red_rtx_payload_type = |
- send_config->rtp.ulpfec.red_rtx_payload_type; |
} |
if (retransmission_ssrc_ == kSendRtxSsrcs[0]) { |
@@ -2768,9 +2763,8 @@ void EndToEndTest::VerifyHistogramStats(bool use_rtx, |
send_config->encoder_settings.encoder = vp8_encoder_.get(); |
send_config->encoder_settings.payload_name = "VP8"; |
(*receive_configs)[0].decoders[0].payload_name = "VP8"; |
- (*receive_configs)[0].rtp.ulpfec.red_payload_type = kRedPayloadType; |
- (*receive_configs)[0].rtp.ulpfec.ulpfec_payload_type = |
- kUlpfecPayloadType; |
+ (*receive_configs)[0].rtp.red_payload_type = kRedPayloadType; |
+ (*receive_configs)[0].rtp.ulpfec_payload_type = kUlpfecPayloadType; |
} |
// RTX |
if (use_rtx_) { |
@@ -4838,7 +4832,10 @@ TEST_F(EndToEndTest, VerifyDefaultVideoReceiveConfigParameters) { |
<< "Enabling RTP extensions require negotiation."; |
VerifyEmptyNackConfig(default_receive_config.rtp.nack); |
- VerifyEmptyUlpfecConfig(default_receive_config.rtp.ulpfec); |
+ EXPECT_EQ(-1, default_receive_config.rtp.ulpfec_payload_type) |
+ << "Enabling ULPFEC requires rtpmap: ulpfec negotiation."; |
+ EXPECT_EQ(-1, default_receive_config.rtp.red_payload_type) |
+ << "Enabling ULPFEC requires rtpmap: red negotiation."; |
} |
TEST_F(EndToEndTest, VerifyDefaultFlexfecReceiveConfigParameters) { |