OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright 2016 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2016 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 411 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
422 return verifier.ExpectAllMembersSuccessfullyTested(); | 422 return verifier.ExpectAllMembersSuccessfullyTested(); |
423 } | 423 } |
424 | 424 |
425 bool VerifyRTCMediaStreamTrackStats( | 425 bool VerifyRTCMediaStreamTrackStats( |
426 const RTCMediaStreamTrackStats& media_stream_track) { | 426 const RTCMediaStreamTrackStats& media_stream_track) { |
427 RTCStatsVerifier verifier(report_, &media_stream_track); | 427 RTCStatsVerifier verifier(report_, &media_stream_track); |
428 verifier.TestMemberIsDefined(media_stream_track.track_identifier); | 428 verifier.TestMemberIsDefined(media_stream_track.track_identifier); |
429 verifier.TestMemberIsDefined(media_stream_track.remote_source); | 429 verifier.TestMemberIsDefined(media_stream_track.remote_source); |
430 verifier.TestMemberIsDefined(media_stream_track.ended); | 430 verifier.TestMemberIsDefined(media_stream_track.ended); |
431 verifier.TestMemberIsDefined(media_stream_track.detached); | 431 verifier.TestMemberIsDefined(media_stream_track.detached); |
432 verifier.TestMemberIsDefined(media_stream_track.kind); | |
432 // Video or audio media stream track? | 433 // Video or audio media stream track? |
433 if (media_stream_track.frame_width.is_defined()) { | 434 if (*media_stream_track.kind == RTCMediaStreamTrackKind::kVideo) { |
434 // Video-only members | 435 // Video-only members |
435 verifier.TestMemberIsNonNegative<uint32_t>( | 436 if (!*media_stream_track.remote_source) { |
436 media_stream_track.frame_width); | 437 verifier.TestMemberIsNonNegative<uint32_t>( |
437 verifier.TestMemberIsNonNegative<uint32_t>( | 438 media_stream_track.frame_width); |
438 media_stream_track.frame_height); | 439 verifier.TestMemberIsNonNegative<uint32_t>( |
440 media_stream_track.frame_height); | |
441 } else { | |
442 // TODO(hbos): Frame width/height should be defined for the remote case. | |
443 // Is this a real problem or an artifact of testing? crbug.com/659137 | |
hbos
2017/01/16 22:15:40
This CL uncovered this bug, it was not caused by t
| |
444 verifier.TestMemberIsUndefined(media_stream_track.frame_width); | |
445 verifier.TestMemberIsUndefined(media_stream_track.frame_height); | |
446 } | |
439 verifier.TestMemberIsUndefined(media_stream_track.frames_per_second); | 447 verifier.TestMemberIsUndefined(media_stream_track.frames_per_second); |
440 verifier.TestMemberIsUndefined(media_stream_track.frames_sent); | 448 verifier.TestMemberIsUndefined(media_stream_track.frames_sent); |
441 verifier.TestMemberIsUndefined(media_stream_track.frames_received); | 449 verifier.TestMemberIsUndefined(media_stream_track.frames_received); |
442 verifier.TestMemberIsUndefined(media_stream_track.frames_decoded); | 450 verifier.TestMemberIsUndefined(media_stream_track.frames_decoded); |
443 verifier.TestMemberIsUndefined(media_stream_track.frames_dropped); | 451 verifier.TestMemberIsUndefined(media_stream_track.frames_dropped); |
444 verifier.TestMemberIsUndefined(media_stream_track.frames_corrupted); | 452 verifier.TestMemberIsUndefined(media_stream_track.frames_corrupted); |
445 verifier.TestMemberIsUndefined(media_stream_track.partial_frames_lost); | 453 verifier.TestMemberIsUndefined(media_stream_track.partial_frames_lost); |
446 verifier.TestMemberIsUndefined(media_stream_track.full_frames_lost); | 454 verifier.TestMemberIsUndefined(media_stream_track.full_frames_lost); |
447 // Audio-only members should be undefined | 455 // Audio-only members should be undefined |
448 verifier.TestMemberIsUndefined(media_stream_track.audio_level); | 456 verifier.TestMemberIsUndefined(media_stream_track.audio_level); |
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
611 caller_ = nullptr; | 619 caller_ = nullptr; |
612 // Any pending stats requests should have completed in the act of destroying | 620 // Any pending stats requests should have completed in the act of destroying |
613 // the peer connection. | 621 // the peer connection. |
614 EXPECT_TRUE(stats_obtainer->report()); | 622 EXPECT_TRUE(stats_obtainer->report()); |
615 } | 623 } |
616 #endif // HAVE_SCTP | 624 #endif // HAVE_SCTP |
617 | 625 |
618 } // namespace | 626 } // namespace |
619 | 627 |
620 } // namespace webrtc | 628 } // namespace webrtc |
OLD | NEW |