| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/memory/scoped_ptr.h" | 5 #include "base/memory/scoped_ptr.h" |
| 6 #include "base/test/simple_test_tick_clock.h" | 6 #include "base/test/simple_test_tick_clock.h" |
| 7 #include "media/cast/cast_environment.h" | 7 #include "media/cast/cast_environment.h" |
| 8 #include "media/cast/net/cast_transport_defines.h" | 8 #include "media/cast/net/cast_transport_defines.h" |
| 9 #include "media/cast/net/rtcp/rtcp_utility.h" | 9 #include "media/cast/net/rtcp/rtcp_utility.h" |
| 10 #include "media/cast/net/rtcp/test_rtcp_packet_builder.h" | 10 #include "media/cast/net/rtcp/test_rtcp_packet_builder.h" |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 EXPECT_EQ(expected_it->event_log_messages_.size(), | 101 EXPECT_EQ(expected_it->event_log_messages_.size(), |
| 102 incoming_it->event_log_messages_.size()); | 102 incoming_it->event_log_messages_.size()); |
| 103 | 103 |
| 104 RtcpReceiverEventLogMessages::const_iterator event_incoming_it = | 104 RtcpReceiverEventLogMessages::const_iterator event_incoming_it = |
| 105 incoming_it->event_log_messages_.begin(); | 105 incoming_it->event_log_messages_.begin(); |
| 106 RtcpReceiverEventLogMessages::const_iterator event_expected_it = | 106 RtcpReceiverEventLogMessages::const_iterator event_expected_it = |
| 107 expected_it->event_log_messages_.begin(); | 107 expected_it->event_log_messages_.begin(); |
| 108 for (; event_incoming_it != incoming_it->event_log_messages_.end(); | 108 for (; event_incoming_it != incoming_it->event_log_messages_.end(); |
| 109 ++event_incoming_it, ++event_expected_it) { | 109 ++event_incoming_it, ++event_expected_it) { |
| 110 EXPECT_EQ(event_expected_it->type, event_incoming_it->type); | 110 EXPECT_EQ(event_expected_it->type, event_incoming_it->type); |
| 111 // SimpleTestTickClock starts at 1 microsecond, add to incoming |
| 112 // timestamp |
| 111 EXPECT_EQ(event_expected_it->event_timestamp, | 113 EXPECT_EQ(event_expected_it->event_timestamp, |
| 112 event_incoming_it->event_timestamp); | 114 event_incoming_it->event_timestamp + |
| 115 base::TimeDelta::FromMicroseconds(1)); |
| 113 if (event_expected_it->type == PACKET_RECEIVED) { | 116 if (event_expected_it->type == PACKET_RECEIVED) { |
| 114 EXPECT_EQ(event_expected_it->packet_id, event_incoming_it->packet_id); | 117 EXPECT_EQ(event_expected_it->packet_id, event_incoming_it->packet_id); |
| 115 } else { | 118 } else { |
| 116 EXPECT_EQ(event_expected_it->delay_delta, | 119 EXPECT_EQ(event_expected_it->delay_delta, |
| 117 event_incoming_it->delay_delta); | 120 event_incoming_it->delay_delta); |
| 118 } | 121 } |
| 119 } | 122 } |
| 120 } | 123 } |
| 121 } | 124 } |
| 122 | 125 |
| (...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 395 p.AddReceiverEventLog(static_cast<uint16>(delay), FRAME_ACK_SENT, 0); | 398 p.AddReceiverEventLog(static_cast<uint16>(delay), FRAME_ACK_SENT, 0); |
| 396 } | 399 } |
| 397 | 400 |
| 398 RtcpParser parser(kSourceSsrc, kSenderSsrc); | 401 RtcpParser parser(kSourceSsrc, kSenderSsrc); |
| 399 EXPECT_TRUE(parser.Parse(p.Reader())); | 402 EXPECT_TRUE(parser.Parse(p.Reader())); |
| 400 ExpectReceiverLog(parser, receiver_log); | 403 ExpectReceiverLog(parser, receiver_log); |
| 401 } | 404 } |
| 402 | 405 |
| 403 } // namespace cast | 406 } // namespace cast |
| 404 } // namespace media | 407 } // namespace media |
| OLD | NEW |