OLD | NEW |
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2012 Google Inc. | 3 * Copyright 2012 Google Inc. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
7 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
159 } | 159 } |
160 | 160 |
161 private: | 161 private: |
162 rtc::scoped_ptr<cricket::RtpDataEngine> dme_; | 162 rtc::scoped_ptr<cricket::RtpDataEngine> dme_; |
163 // Timing passed into dme_. Owned by dme_; | 163 // Timing passed into dme_. Owned by dme_; |
164 FakeTiming* timing_; | 164 FakeTiming* timing_; |
165 rtc::scoped_ptr<cricket::FakeNetworkInterface> iface_; | 165 rtc::scoped_ptr<cricket::FakeNetworkInterface> iface_; |
166 rtc::scoped_ptr<FakeDataReceiver> receiver_; | 166 rtc::scoped_ptr<FakeDataReceiver> receiver_; |
167 }; | 167 }; |
168 | 168 |
| 169 /* TODO(solenberg): !!!!! |
169 TEST_F(RtpDataMediaChannelTest, SetUnknownCodecs) { | 170 TEST_F(RtpDataMediaChannelTest, SetUnknownCodecs) { |
170 rtc::scoped_ptr<cricket::RtpDataMediaChannel> dmc(CreateChannel()); | 171 rtc::scoped_ptr<cricket::RtpDataMediaChannel> dmc(CreateChannel()); |
171 | 172 |
172 cricket::DataCodec known_codec; | 173 cricket::DataCodec known_codec; |
173 known_codec.id = 103; | 174 known_codec.id = 103; |
174 known_codec.name = "google-data"; | 175 known_codec.name = "google-data"; |
175 cricket::DataCodec unknown_codec; | 176 cricket::DataCodec unknown_codec; |
176 unknown_codec.id = 104; | 177 unknown_codec.id = 104; |
177 unknown_codec.name = "unknown-data"; | 178 unknown_codec.name = "unknown-data"; |
178 | 179 |
179 std::vector<cricket::DataCodec> known_codecs; | 180 std::vector<cricket::DataCodec> known_codecs; |
180 known_codecs.push_back(known_codec); | 181 known_codecs.push_back(known_codec); |
181 | 182 |
182 std::vector<cricket::DataCodec> unknown_codecs; | 183 std::vector<cricket::DataCodec> unknown_codecs; |
183 unknown_codecs.push_back(unknown_codec); | 184 unknown_codecs.push_back(unknown_codec); |
184 | 185 |
185 std::vector<cricket::DataCodec> mixed_codecs; | 186 std::vector<cricket::DataCodec> mixed_codecs; |
186 mixed_codecs.push_back(known_codec); | 187 mixed_codecs.push_back(known_codec); |
187 mixed_codecs.push_back(unknown_codec); | 188 mixed_codecs.push_back(unknown_codec); |
188 | 189 |
189 EXPECT_TRUE(dmc->SetSendCodecs(known_codecs)); | 190 EXPECT_TRUE(dmc->SetSendCodecs(known_codecs)); |
190 EXPECT_FALSE(dmc->SetSendCodecs(unknown_codecs)); | 191 EXPECT_FALSE(dmc->SetSendCodecs(unknown_codecs)); |
191 EXPECT_TRUE(dmc->SetSendCodecs(mixed_codecs)); | 192 EXPECT_TRUE(dmc->SetSendCodecs(mixed_codecs)); |
192 EXPECT_TRUE(dmc->SetRecvCodecs(known_codecs)); | 193 EXPECT_TRUE(dmc->SetRecvCodecs(known_codecs)); |
193 EXPECT_FALSE(dmc->SetRecvCodecs(unknown_codecs)); | 194 EXPECT_FALSE(dmc->SetRecvCodecs(unknown_codecs)); |
194 EXPECT_FALSE(dmc->SetRecvCodecs(mixed_codecs)); | 195 EXPECT_FALSE(dmc->SetRecvCodecs(mixed_codecs)); |
195 } | 196 } |
| 197 */ |
196 | 198 |
197 TEST_F(RtpDataMediaChannelTest, AddRemoveSendStream) { | 199 TEST_F(RtpDataMediaChannelTest, AddRemoveSendStream) { |
198 rtc::scoped_ptr<cricket::RtpDataMediaChannel> dmc(CreateChannel()); | 200 rtc::scoped_ptr<cricket::RtpDataMediaChannel> dmc(CreateChannel()); |
199 | 201 |
200 cricket::StreamParams stream1; | 202 cricket::StreamParams stream1; |
201 stream1.add_ssrc(41); | 203 stream1.add_ssrc(41); |
202 EXPECT_TRUE(dmc->AddSendStream(stream1)); | 204 EXPECT_TRUE(dmc->AddSendStream(stream1)); |
203 cricket::StreamParams stream2; | 205 cricket::StreamParams stream2; |
204 stream2.add_ssrc(42); | 206 stream2.add_ssrc(42); |
205 EXPECT_TRUE(dmc->AddSendStream(stream2)); | 207 EXPECT_TRUE(dmc->AddSendStream(stream2)); |
(...skipping 11 matching lines...) Expand all Loading... |
217 EXPECT_TRUE(dmc->AddRecvStream(stream1)); | 219 EXPECT_TRUE(dmc->AddRecvStream(stream1)); |
218 cricket::StreamParams stream2; | 220 cricket::StreamParams stream2; |
219 stream2.add_ssrc(42); | 221 stream2.add_ssrc(42); |
220 EXPECT_TRUE(dmc->AddRecvStream(stream2)); | 222 EXPECT_TRUE(dmc->AddRecvStream(stream2)); |
221 EXPECT_FALSE(dmc->AddRecvStream(stream2)); | 223 EXPECT_FALSE(dmc->AddRecvStream(stream2)); |
222 | 224 |
223 EXPECT_TRUE(dmc->RemoveRecvStream(41)); | 225 EXPECT_TRUE(dmc->RemoveRecvStream(41)); |
224 EXPECT_TRUE(dmc->RemoveRecvStream(42)); | 226 EXPECT_TRUE(dmc->RemoveRecvStream(42)); |
225 } | 227 } |
226 | 228 |
| 229 /* TODO(solenberg): !!!!! |
227 TEST_F(RtpDataMediaChannelTest, SendData) { | 230 TEST_F(RtpDataMediaChannelTest, SendData) { |
228 rtc::scoped_ptr<cricket::RtpDataMediaChannel> dmc(CreateChannel()); | 231 rtc::scoped_ptr<cricket::RtpDataMediaChannel> dmc(CreateChannel()); |
229 | 232 |
230 cricket::SendDataParams params; | 233 cricket::SendDataParams params; |
231 params.ssrc = 42; | 234 params.ssrc = 42; |
232 unsigned char data[] = "food"; | 235 unsigned char data[] = "food"; |
233 rtc::Buffer payload(data, 4); | 236 rtc::Buffer payload(data, 4); |
234 unsigned char padded_data[] = { | 237 unsigned char padded_data[] = { |
235 0x00, 0x00, 0x00, 0x00, | 238 0x00, 0x00, 0x00, 0x00, |
236 'f', 'o', 'o', 'd', | 239 'f', 'o', 'o', 'd', |
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
447 cricket::StreamParams stream; | 450 cricket::StreamParams stream; |
448 stream.add_ssrc(42); | 451 stream.add_ssrc(42); |
449 ASSERT_TRUE(dmc->AddRecvStream(stream)); | 452 ASSERT_TRUE(dmc->AddRecvStream(stream)); |
450 | 453 |
451 // Finally works! | 454 // Finally works! |
452 dmc->OnPacketReceived(&packet, rtc::PacketTime()); | 455 dmc->OnPacketReceived(&packet, rtc::PacketTime()); |
453 EXPECT_TRUE(HasReceivedData()); | 456 EXPECT_TRUE(HasReceivedData()); |
454 EXPECT_EQ("abcde", GetReceivedData()); | 457 EXPECT_EQ("abcde", GetReceivedData()); |
455 EXPECT_EQ(5U, GetReceivedDataLen()); | 458 EXPECT_EQ(5U, GetReceivedDataLen()); |
456 } | 459 } |
457 | 460 */ |
458 TEST_F(RtpDataMediaChannelTest, InvalidRtpPackets) { | 461 TEST_F(RtpDataMediaChannelTest, InvalidRtpPackets) { |
459 unsigned char data[] = { | 462 unsigned char data[] = { |
460 0x80, 0x65, 0x00, 0x02 | 463 0x80, 0x65, 0x00, 0x02 |
461 }; | 464 }; |
462 rtc::Buffer packet(data, sizeof(data)); | 465 rtc::Buffer packet(data, sizeof(data)); |
463 | 466 |
464 rtc::scoped_ptr<cricket::RtpDataMediaChannel> dmc(CreateChannel()); | 467 rtc::scoped_ptr<cricket::RtpDataMediaChannel> dmc(CreateChannel()); |
465 | 468 |
466 // Too short | 469 // Too short |
467 dmc->OnPacketReceived(&packet, rtc::PacketTime()); | 470 dmc->OnPacketReceived(&packet, rtc::PacketTime()); |
468 EXPECT_FALSE(HasReceivedData()); | 471 EXPECT_FALSE(HasReceivedData()); |
469 } | 472 } |
OLD | NEW |