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

Side by Side Diff: talk/media/webrtc/webrtcvideoengine2_unittest.cc

Issue 1363573002: Wire up transport sequence number / send time callbacks to webrtc via libjingle. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: . Created 5 years, 2 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 * libjingle 2 * libjingle
3 * Copyright 2004 Google Inc. 3 * Copyright 2004 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 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 for (size_t i = 0; i < extensions.size(); ++i) { 251 for (size_t i = 0; i < extensions.size(); ++i) {
252 if (extensions[i].uri == kRtpAbsoluteSenderTimeHeaderExtension) { 252 if (extensions[i].uri == kRtpAbsoluteSenderTimeHeaderExtension) {
253 EXPECT_EQ(kRtpAbsoluteSenderTimeHeaderExtensionDefaultId, 253 EXPECT_EQ(kRtpAbsoluteSenderTimeHeaderExtensionDefaultId,
254 extensions[i].id); 254 extensions[i].id);
255 return; 255 return;
256 } 256 }
257 } 257 }
258 FAIL() << "Absolute Sender Time extension not in header-extension list."; 258 FAIL() << "Absolute Sender Time extension not in header-extension list.";
259 } 259 }
260 260
261 TEST_F(WebRtcVideoEngine2Test, SupportsTransportSequenceNumberHeaderExtension) {
262 std::vector<RtpHeaderExtension> extensions = engine_.rtp_header_extensions();
263 ASSERT_FALSE(extensions.empty());
264 for (size_t i = 0; i < extensions.size(); ++i) {
265 if (extensions[i].uri == kRtpTransportSequenceNumberHeaderExtension) {
266 EXPECT_EQ(kRtpTransportSequenceNumberHeaderExtensionDefaultId,
267 extensions[i].id);
268 return;
269 }
270 }
271 FAIL() << "Transport sequence number extension not in header-extension list.";
272 }
273
261 TEST_F(WebRtcVideoEngine2Test, SupportsVideoRotationHeaderExtension) { 274 TEST_F(WebRtcVideoEngine2Test, SupportsVideoRotationHeaderExtension) {
262 std::vector<RtpHeaderExtension> extensions = engine_.rtp_header_extensions(); 275 std::vector<RtpHeaderExtension> extensions = engine_.rtp_header_extensions();
263 ASSERT_FALSE(extensions.empty()); 276 ASSERT_FALSE(extensions.empty());
264 for (size_t i = 0; i < extensions.size(); ++i) { 277 for (size_t i = 0; i < extensions.size(); ++i) {
265 if (extensions[i].uri == kRtpVideoRotationHeaderExtension) { 278 if (extensions[i].uri == kRtpVideoRotationHeaderExtension) {
266 EXPECT_EQ(kRtpVideoRotationHeaderExtensionDefaultId, extensions[i].id); 279 EXPECT_EQ(kRtpVideoRotationHeaderExtensionDefaultId, extensions[i].id);
267 return; 280 return;
268 } 281 }
269 } 282 }
270 FAIL() << "Video Rotation extension not in header-extension list."; 283 FAIL() << "Video Rotation extension not in header-extension list.";
(...skipping 898 matching lines...) Expand 10 before | Expand all | Expand 10 after
1169 // Test support for absolute send time header extension. 1182 // Test support for absolute send time header extension.
1170 TEST_F(WebRtcVideoChannel2Test, SendAbsoluteSendTimeHeaderExtensions) { 1183 TEST_F(WebRtcVideoChannel2Test, SendAbsoluteSendTimeHeaderExtensions) {
1171 TestSetSendRtpHeaderExtensions(kRtpAbsoluteSenderTimeHeaderExtension, 1184 TestSetSendRtpHeaderExtensions(kRtpAbsoluteSenderTimeHeaderExtension,
1172 webrtc::RtpExtension::kAbsSendTime); 1185 webrtc::RtpExtension::kAbsSendTime);
1173 } 1186 }
1174 TEST_F(WebRtcVideoChannel2Test, RecvAbsoluteSendTimeHeaderExtensions) { 1187 TEST_F(WebRtcVideoChannel2Test, RecvAbsoluteSendTimeHeaderExtensions) {
1175 TestSetRecvRtpHeaderExtensions(kRtpAbsoluteSenderTimeHeaderExtension, 1188 TestSetRecvRtpHeaderExtensions(kRtpAbsoluteSenderTimeHeaderExtension,
1176 webrtc::RtpExtension::kAbsSendTime); 1189 webrtc::RtpExtension::kAbsSendTime);
1177 } 1190 }
1178 1191
1192 // Test support for transport sequence number header extension.
1193 TEST_F(WebRtcVideoChannel2Test, SendTransportSequenceNumberHeaderExtensions) {
1194 TestSetSendRtpHeaderExtensions(
1195 kRtpTransportSequenceNumberHeaderExtension,
1196 webrtc::RtpExtension::kTransportSequenceNumber);
1197 }
1198 TEST_F(WebRtcVideoChannel2Test, RecvTransportSequenceNumberHeaderExtensions) {
1199 TestSetRecvRtpHeaderExtensions(
1200 kRtpTransportSequenceNumberHeaderExtension,
1201 webrtc::RtpExtension::kTransportSequenceNumber);
1202 }
1203
1179 // Test support for video rotation header extension. 1204 // Test support for video rotation header extension.
1180 TEST_F(WebRtcVideoChannel2Test, SendVideoRotationHeaderExtensions) { 1205 TEST_F(WebRtcVideoChannel2Test, SendVideoRotationHeaderExtensions) {
1181 TestSetSendRtpHeaderExtensions(kRtpVideoRotationHeaderExtension, 1206 TestSetSendRtpHeaderExtensions(kRtpVideoRotationHeaderExtension,
1182 webrtc::RtpExtension::kVideoRotation); 1207 webrtc::RtpExtension::kVideoRotation);
1183 } 1208 }
1184 TEST_F(WebRtcVideoChannel2Test, RecvVideoRotationHeaderExtensions) { 1209 TEST_F(WebRtcVideoChannel2Test, RecvVideoRotationHeaderExtensions) {
1185 TestSetRecvRtpHeaderExtensions(kRtpVideoRotationHeaderExtension, 1210 TestSetRecvRtpHeaderExtensions(kRtpVideoRotationHeaderExtension,
1186 webrtc::RtpExtension::kVideoRotation); 1211 webrtc::RtpExtension::kVideoRotation);
1187 } 1212 }
1188 1213
(...skipping 1111 matching lines...) Expand 10 before | Expand all | Expand 10 after
2300 // Verify previous value is not modified if dscp option is not set. 2325 // Verify previous value is not modified if dscp option is not set.
2301 cricket::VideoSendParameters parameters1 = send_parameters_; 2326 cricket::VideoSendParameters parameters1 = send_parameters_;
2302 EXPECT_TRUE(channel_->SetSendParameters(parameters1)); 2327 EXPECT_TRUE(channel_->SetSendParameters(parameters1));
2303 EXPECT_EQ(rtc::DSCP_AF41, network_interface->dscp()); 2328 EXPECT_EQ(rtc::DSCP_AF41, network_interface->dscp());
2304 parameters1.options.dscp.Set(false); 2329 parameters1.options.dscp.Set(false);
2305 EXPECT_TRUE(channel_->SetSendParameters(parameters1)); 2330 EXPECT_TRUE(channel_->SetSendParameters(parameters1));
2306 EXPECT_EQ(rtc::DSCP_DEFAULT, network_interface->dscp()); 2331 EXPECT_EQ(rtc::DSCP_DEFAULT, network_interface->dscp());
2307 channel_->SetInterface(NULL); 2332 channel_->SetInterface(NULL);
2308 } 2333 }
2309 2334
2335 TEST_F(WebRtcVideoChannel2Test, OnSentPacketPropagatesToCall) {
2336 webrtc::SentPacket packet = fake_call_->last_packet_sent();
2337 EXPECT_EQ(-1, packet.transport_sequence_number);
2338 EXPECT_EQ(-1, packet.send_time_ms);
2339
2340 rtc::SentPacket rtc_sent(1, 1234);
2341 channel_->OnPacketSent(rtc_sent);
2342 packet = fake_call_->last_packet_sent();
2343 EXPECT_EQ(rtc_sent.transport_sequence_number,
2344 packet.transport_sequence_number);
2345 EXPECT_EQ(rtc_sent.send_time_ms, packet.send_time_ms);
2346
2347 rtc::SentPacket rtc_sent2(2, 1244);
2348 channel_->OnPacketSent(rtc_sent2);
2349 packet = fake_call_->last_packet_sent();
2350 EXPECT_EQ(rtc_sent2.transport_sequence_number,
2351 packet.transport_sequence_number);
2352 EXPECT_EQ(rtc_sent2.send_time_ms, packet.send_time_ms);
2353 }
2354
2310 TEST_F(WebRtcVideoChannel2Test, OnReadyToSendSignalsNetworkState) { 2355 TEST_F(WebRtcVideoChannel2Test, OnReadyToSendSignalsNetworkState) {
2311 EXPECT_EQ(webrtc::kNetworkUp, fake_call_->GetNetworkState()); 2356 EXPECT_EQ(webrtc::kNetworkUp, fake_call_->GetNetworkState());
2312 2357
2313 channel_->OnReadyToSend(false); 2358 channel_->OnReadyToSend(false);
2314 EXPECT_EQ(webrtc::kNetworkDown, fake_call_->GetNetworkState()); 2359 EXPECT_EQ(webrtc::kNetworkDown, fake_call_->GetNetworkState());
2315 2360
2316 channel_->OnReadyToSend(true); 2361 channel_->OnReadyToSend(true);
2317 EXPECT_EQ(webrtc::kNetworkUp, fake_call_->GetNetworkState()); 2362 EXPECT_EQ(webrtc::kNetworkUp, fake_call_->GetNetworkState());
2318 } 2363 }
2319 2364
(...skipping 881 matching lines...) Expand 10 before | Expand all | Expand 10 after
3201 // Ensures that the correct settings are applied to the codec when two temporal 3246 // Ensures that the correct settings are applied to the codec when two temporal
3202 // layer screencasting is enabled, and that the correct simulcast settings are 3247 // layer screencasting is enabled, and that the correct simulcast settings are
3203 // reapplied when disabling screencasting. 3248 // reapplied when disabling screencasting.
3204 TEST_F(WebRtcVideoChannel2SimulcastTest, 3249 TEST_F(WebRtcVideoChannel2SimulcastTest,
3205 DISABLED_TwoTemporalLayerScreencastSettings) { 3250 DISABLED_TwoTemporalLayerScreencastSettings) {
3206 // TODO(pbos): Implement. 3251 // TODO(pbos): Implement.
3207 FAIL() << "Not implemented."; 3252 FAIL() << "Not implemented.";
3208 } 3253 }
3209 3254
3210 } // namespace cricket 3255 } // namespace cricket
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698