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

Side by Side Diff: talk/app/webrtc/peerconnection_unittest.cc

Issue 1204493002: Set / verify stats report timestamps. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 6 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
« no previous file with comments | « no previous file | talk/app/webrtc/statscollector.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 } 343 }
344 } 344 }
345 } 345 }
346 346
347 int GetAudioOutputLevelStats(webrtc::MediaStreamTrackInterface* track) { 347 int GetAudioOutputLevelStats(webrtc::MediaStreamTrackInterface* track) {
348 rtc::scoped_refptr<MockStatsObserver> 348 rtc::scoped_refptr<MockStatsObserver>
349 observer(new rtc::RefCountedObject<MockStatsObserver>()); 349 observer(new rtc::RefCountedObject<MockStatsObserver>());
350 EXPECT_TRUE(peer_connection_->GetStats( 350 EXPECT_TRUE(peer_connection_->GetStats(
351 observer, track, PeerConnectionInterface::kStatsOutputLevelStandard)); 351 observer, track, PeerConnectionInterface::kStatsOutputLevelStandard));
352 EXPECT_TRUE_WAIT(observer->called(), kMaxWaitMs); 352 EXPECT_TRUE_WAIT(observer->called(), kMaxWaitMs);
353 EXPECT_NE(0, observer->timestamp());
353 return observer->AudioOutputLevel(); 354 return observer->AudioOutputLevel();
354 } 355 }
355 356
356 int GetAudioInputLevelStats() { 357 int GetAudioInputLevelStats() {
357 rtc::scoped_refptr<MockStatsObserver> 358 rtc::scoped_refptr<MockStatsObserver>
358 observer(new rtc::RefCountedObject<MockStatsObserver>()); 359 observer(new rtc::RefCountedObject<MockStatsObserver>());
359 EXPECT_TRUE(peer_connection_->GetStats( 360 EXPECT_TRUE(peer_connection_->GetStats(
360 observer, NULL, PeerConnectionInterface::kStatsOutputLevelStandard)); 361 observer, NULL, PeerConnectionInterface::kStatsOutputLevelStandard));
361 EXPECT_TRUE_WAIT(observer->called(), kMaxWaitMs); 362 EXPECT_TRUE_WAIT(observer->called(), kMaxWaitMs);
363 EXPECT_NE(0, observer->timestamp());
362 return observer->AudioInputLevel(); 364 return observer->AudioInputLevel();
363 } 365 }
364 366
365 int GetBytesReceivedStats(webrtc::MediaStreamTrackInterface* track) { 367 int GetBytesReceivedStats(webrtc::MediaStreamTrackInterface* track) {
366 rtc::scoped_refptr<MockStatsObserver> 368 rtc::scoped_refptr<MockStatsObserver>
367 observer(new rtc::RefCountedObject<MockStatsObserver>()); 369 observer(new rtc::RefCountedObject<MockStatsObserver>());
368 EXPECT_TRUE(peer_connection_->GetStats( 370 EXPECT_TRUE(peer_connection_->GetStats(
369 observer, track, PeerConnectionInterface::kStatsOutputLevelStandard)); 371 observer, track, PeerConnectionInterface::kStatsOutputLevelStandard));
370 EXPECT_TRUE_WAIT(observer->called(), kMaxWaitMs); 372 EXPECT_TRUE_WAIT(observer->called(), kMaxWaitMs);
373 EXPECT_NE(0, observer->timestamp());
371 return observer->BytesReceived(); 374 return observer->BytesReceived();
372 } 375 }
373 376
374 int GetBytesSentStats(webrtc::MediaStreamTrackInterface* track) { 377 int GetBytesSentStats(webrtc::MediaStreamTrackInterface* track) {
375 rtc::scoped_refptr<MockStatsObserver> 378 rtc::scoped_refptr<MockStatsObserver>
376 observer(new rtc::RefCountedObject<MockStatsObserver>()); 379 observer(new rtc::RefCountedObject<MockStatsObserver>());
377 EXPECT_TRUE(peer_connection_->GetStats( 380 EXPECT_TRUE(peer_connection_->GetStats(
378 observer, track, PeerConnectionInterface::kStatsOutputLevelStandard)); 381 observer, track, PeerConnectionInterface::kStatsOutputLevelStandard));
379 EXPECT_TRUE_WAIT(observer->called(), kMaxWaitMs); 382 EXPECT_TRUE_WAIT(observer->called(), kMaxWaitMs);
383 EXPECT_NE(0, observer->timestamp());
380 return observer->BytesSent(); 384 return observer->BytesSent();
381 } 385 }
382 386
383 int GetAvailableReceivedBandwidthStats() { 387 int GetAvailableReceivedBandwidthStats() {
384 rtc::scoped_refptr<MockStatsObserver> 388 rtc::scoped_refptr<MockStatsObserver>
385 observer(new rtc::RefCountedObject<MockStatsObserver>()); 389 observer(new rtc::RefCountedObject<MockStatsObserver>());
386 EXPECT_TRUE(peer_connection_->GetStats( 390 EXPECT_TRUE(peer_connection_->GetStats(
387 observer, NULL, PeerConnectionInterface::kStatsOutputLevelStandard)); 391 observer, NULL, PeerConnectionInterface::kStatsOutputLevelStandard));
388 EXPECT_TRUE_WAIT(observer->called(), kMaxWaitMs); 392 EXPECT_TRUE_WAIT(observer->called(), kMaxWaitMs);
393 EXPECT_NE(0, observer->timestamp());
389 int bw = observer->AvailableReceiveBandwidth(); 394 int bw = observer->AvailableReceiveBandwidth();
390 return bw; 395 return bw;
391 } 396 }
392 397
393 std::string GetDtlsCipherStats() { 398 std::string GetDtlsCipherStats() {
394 rtc::scoped_refptr<MockStatsObserver> 399 rtc::scoped_refptr<MockStatsObserver>
395 observer(new rtc::RefCountedObject<MockStatsObserver>()); 400 observer(new rtc::RefCountedObject<MockStatsObserver>());
396 EXPECT_TRUE(peer_connection_->GetStats( 401 EXPECT_TRUE(peer_connection_->GetStats(
397 observer, NULL, PeerConnectionInterface::kStatsOutputLevelStandard)); 402 observer, NULL, PeerConnectionInterface::kStatsOutputLevelStandard));
398 EXPECT_TRUE_WAIT(observer->called(), kMaxWaitMs); 403 EXPECT_TRUE_WAIT(observer->called(), kMaxWaitMs);
404 EXPECT_NE(0, observer->timestamp());
399 return observer->DtlsCipher(); 405 return observer->DtlsCipher();
400 } 406 }
401 407
402 std::string GetSrtpCipherStats() { 408 std::string GetSrtpCipherStats() {
403 rtc::scoped_refptr<MockStatsObserver> 409 rtc::scoped_refptr<MockStatsObserver>
404 observer(new rtc::RefCountedObject<MockStatsObserver>()); 410 observer(new rtc::RefCountedObject<MockStatsObserver>());
405 EXPECT_TRUE(peer_connection_->GetStats( 411 EXPECT_TRUE(peer_connection_->GetStats(
406 observer, NULL, PeerConnectionInterface::kStatsOutputLevelStandard)); 412 observer, NULL, PeerConnectionInterface::kStatsOutputLevelStandard));
407 EXPECT_TRUE_WAIT(observer->called(), kMaxWaitMs); 413 EXPECT_TRUE_WAIT(observer->called(), kMaxWaitMs);
414 EXPECT_NE(0, observer->timestamp());
408 return observer->SrtpCipher(); 415 return observer->SrtpCipher();
409 } 416 }
410 417
411 int rendered_width() { 418 int rendered_width() {
412 EXPECT_FALSE(fake_video_renderers_.empty()); 419 EXPECT_FALSE(fake_video_renderers_.empty());
413 return fake_video_renderers_.empty() ? 1 : 420 return fake_video_renderers_.empty() ? 1 :
414 fake_video_renderers_.begin()->second->width(); 421 fake_video_renderers_.begin()->second->width();
415 } 422 }
416 423
417 int rendered_height() { 424 int rendered_height() {
(...skipping 1158 matching lines...) Expand 10 before | Expand all | Expand 10 after
1576 // TODO(holmer): Disabled due to sometimes crashing on buildbots. 1583 // TODO(holmer): Disabled due to sometimes crashing on buildbots.
1577 // See issue webrtc/2378. 1584 // See issue webrtc/2378.
1578 TEST_F(JsepPeerConnectionP2PTestClient, 1585 TEST_F(JsepPeerConnectionP2PTestClient,
1579 DISABLED_LocalP2PTestWithVideoDecoderFactory) { 1586 DISABLED_LocalP2PTestWithVideoDecoderFactory) {
1580 ASSERT_TRUE(CreateTestClients()); 1587 ASSERT_TRUE(CreateTestClients());
1581 EnableVideoDecoderFactory(); 1588 EnableVideoDecoderFactory();
1582 LocalP2PTest(); 1589 LocalP2PTest();
1583 } 1590 }
1584 1591
1585 #endif // if !defined(THREAD_SANITIZER) 1592 #endif // if !defined(THREAD_SANITIZER)
OLDNEW
« no previous file with comments | « no previous file | talk/app/webrtc/statscollector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698