Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Side by Side Diff: webrtc/modules/rtp_rtcp/source/producer_fec_unittest.cc

Issue 2305793003: Simplify public interface of ProducerFec. (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 producer_.SetFecParameters(&params, 0); // Expecting one FEC packet. 115 producer_.SetFecParameters(&params, 0); // Expecting one FEC packet.
116 uint32_t last_timestamp = 0; 116 uint32_t last_timestamp = 0;
117 for (size_t i = 0; i < kNumPackets; ++i) { 117 for (size_t i = 0; i < kNumPackets; ++i) {
118 std::unique_ptr<AugmentedPacket> packet = 118 std::unique_ptr<AugmentedPacket> packet =
119 packet_generator_.NextPacket(i, 10); 119 packet_generator_.NextPacket(i, 10);
120 EXPECT_EQ(0, producer_.AddRtpPacketAndGenerateFec( 120 EXPECT_EQ(0, producer_.AddRtpPacketAndGenerateFec(
121 packet->data, packet->length, kRtpHeaderSize)); 121 packet->data, packet->length, kRtpHeaderSize));
122 last_timestamp = packet->header.header.timestamp; 122 last_timestamp = packet->header.header.timestamp;
123 packets.push_back(std::move(packet)); 123 packets.push_back(std::move(packet));
124 } 124 }
125 EXPECT_TRUE(producer_.FecAvailable()); 125 EXPECT_GT(producer_.NumAvailableFecPackets(), 0u);
126 uint16_t seq_num = packet_generator_.NextSeqNum(); 126 uint16_t seq_num = packet_generator_.NextSeqNum();
127 std::vector<std::unique_ptr<RedPacket>> red_packets = 127 std::vector<std::unique_ptr<RedPacket>> red_packets =
128 producer_.GetFecPacketsAsRed(kRedPayloadType, kFecPayloadType, seq_num, 128 producer_.GetFecPacketsAsRed(kRedPayloadType, kFecPayloadType, seq_num,
129 kRtpHeaderSize); 129 kRtpHeaderSize);
130 EXPECT_FALSE(producer_.FecAvailable()); 130 EXPECT_EQ(producer_.NumAvailableFecPackets(), 0u);
131 ASSERT_EQ(1u, red_packets.size()); 131 ASSERT_EQ(1u, red_packets.size());
132 VerifyHeader(seq_num, last_timestamp, kRedPayloadType, kFecPayloadType, 132 VerifyHeader(seq_num, last_timestamp, kRedPayloadType, kFecPayloadType,
133 red_packets.front().get(), false); 133 red_packets.front().get(), false);
134 } 134 }
135 135
136 TEST_F(ProducerFecTest, TwoFrameFec) { 136 TEST_F(ProducerFecTest, TwoFrameFec) {
137 // The number of media packets/frame (|kNumPackets|), the number of frames 137 // The number of media packets/frame (|kNumPackets|), the number of frames
138 // (|kNumFrames|), and the protection factor (|params->fec_rate|) are set to 138 // (|kNumFrames|), and the protection factor (|params->fec_rate|) are set to
139 // make sure the conditions for generating FEC are satisfied. This means: 139 // make sure the conditions for generating FEC are satisfied. This means:
140 // (1) protection factor is high enough so that actual overhead over 140 // (1) protection factor is high enough so that actual overhead over
(...skipping 11 matching lines...) Expand all
152 packet_generator_.NewFrame(kNumPackets); 152 packet_generator_.NewFrame(kNumPackets);
153 for (size_t j = 0; j < kNumPackets; ++j) { 153 for (size_t j = 0; j < kNumPackets; ++j) {
154 std::unique_ptr<AugmentedPacket> packet = 154 std::unique_ptr<AugmentedPacket> packet =
155 packet_generator_.NextPacket(i * kNumPackets + j, 10); 155 packet_generator_.NextPacket(i * kNumPackets + j, 10);
156 EXPECT_EQ(0, producer_.AddRtpPacketAndGenerateFec( 156 EXPECT_EQ(0, producer_.AddRtpPacketAndGenerateFec(
157 packet->data, packet->length, kRtpHeaderSize)); 157 packet->data, packet->length, kRtpHeaderSize));
158 last_timestamp = packet->header.header.timestamp; 158 last_timestamp = packet->header.header.timestamp;
159 packets.push_back(std::move(packet)); 159 packets.push_back(std::move(packet));
160 } 160 }
161 } 161 }
162 EXPECT_TRUE(producer_.FecAvailable()); 162 EXPECT_GT(producer_.NumAvailableFecPackets(), 0u);
163 uint16_t seq_num = packet_generator_.NextSeqNum(); 163 uint16_t seq_num = packet_generator_.NextSeqNum();
164 std::vector<std::unique_ptr<RedPacket>> red_packets = 164 std::vector<std::unique_ptr<RedPacket>> red_packets =
165 producer_.GetFecPacketsAsRed(kRedPayloadType, kFecPayloadType, seq_num, 165 producer_.GetFecPacketsAsRed(kRedPayloadType, kFecPayloadType, seq_num,
166 kRtpHeaderSize); 166 kRtpHeaderSize);
167 EXPECT_FALSE(producer_.FecAvailable()); 167 EXPECT_EQ(producer_.NumAvailableFecPackets(), 0u);
168 ASSERT_EQ(1u, red_packets.size()); 168 ASSERT_EQ(1u, red_packets.size());
169 VerifyHeader(seq_num, last_timestamp, kRedPayloadType, kFecPayloadType, 169 VerifyHeader(seq_num, last_timestamp, kRedPayloadType, kFecPayloadType,
170 red_packets.front().get(), false); 170 red_packets.front().get(), false);
171 } 171 }
172 172
173 TEST_F(ProducerFecTest, BuildRedPacket) { 173 TEST_F(ProducerFecTest, BuildRedPacket) {
174 packet_generator_.NewFrame(1); 174 packet_generator_.NewFrame(1);
175 std::unique_ptr<AugmentedPacket> packet = packet_generator_.NextPacket(0, 10); 175 std::unique_ptr<AugmentedPacket> packet = packet_generator_.NextPacket(0, 10);
176 std::unique_ptr<RedPacket> red_packet = 176 std::unique_ptr<RedPacket> red_packet =
177 ProducerFec::BuildRedPacket(packet->data, packet->length - kRtpHeaderSize, 177 ProducerFec::BuildRedPacket(packet->data, packet->length - kRtpHeaderSize,
(...skipping 20 matching lines...) Expand all
198 ProducerFec::BuildRedPacket(packet->data, packet->length - kRtpHeaderSize, 198 ProducerFec::BuildRedPacket(packet->data, packet->length - kRtpHeaderSize,
199 kRtpHeaderSize, kRedPayloadType); 199 kRtpHeaderSize, kRedPayloadType);
200 EXPECT_EQ(packet->length + kRedForFecHeaderLength, red_packet->length()); 200 EXPECT_EQ(packet->length + kRedForFecHeaderLength, red_packet->length());
201 VerifyHeader(packet->header.header.sequenceNumber, 201 VerifyHeader(packet->header.header.sequenceNumber,
202 packet->header.header.timestamp, kRedPayloadType, 202 packet->header.header.timestamp, kRedPayloadType,
203 packet->header.header.payloadType, red_packet.get(), 203 packet->header.header.payloadType, red_packet.get(),
204 true); // Marker bit set. 204 true); // Marker bit set.
205 } 205 }
206 206
207 } // namespace webrtc 207 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698