Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / media / cast / logging / receiver_time_offset_estimator_impl_unittest.cc

diff --git a/src/media/cast/logging/receiver_time_offset_estimator_impl_unittest.cc b/src/media/cast/logging/receiver_time_offset_estimator_impl_unittest.cc
index 36985b6..c1059ae 100644 (file)
--- a/src/media/cast/logging/receiver_time_offset_estimator_impl_unittest.cc
+++ b/src/media/cast/logging/receiver_time_offset_estimator_impl_unittest.cc
@@ -65,24 +65,40 @@ TEST_F(ReceiverTimeOffsetEstimatorImplTest, EstimateOffset) {
 
   cast_environment_->Logging()->InsertEncodedFrameEvent(
       sender_clock_->NowTicks(),
-      kVideoFrameEncoded,
+      FRAME_ENCODED, VIDEO_EVENT,
       rtp_timestamp,
       frame_id,
       1234,
       true,
       5678);
 
+  cast_environment_->Logging()->InsertPacketEvent(
+      sender_clock_->NowTicks(),
+      PACKET_SENT_TO_NETWORK, VIDEO_EVENT,
+      rtp_timestamp,
+      frame_id,
+      56, 78, 1500);
+
   EXPECT_FALSE(estimator_.GetReceiverOffsetBounds(&lower_bound, &upper_bound));
 
   AdvanceClocks(base::TimeDelta::FromMilliseconds(10));
   cast_environment_->Logging()->InsertFrameEvent(
-      receiver_clock_.NowTicks(), kVideoAckSent, rtp_timestamp, frame_id);
+      receiver_clock_.NowTicks(), FRAME_ACK_SENT, VIDEO_EVENT,
+      rtp_timestamp, frame_id);
+
+  cast_environment_->Logging()->InsertPacketEvent(
+      receiver_clock_.NowTicks(),
+      PACKET_RECEIVED, VIDEO_EVENT,
+      rtp_timestamp,
+      frame_id,
+      56, 78, 1500);
 
   EXPECT_FALSE(estimator_.GetReceiverOffsetBounds(&lower_bound, &upper_bound));
 
   AdvanceClocks(base::TimeDelta::FromMilliseconds(30));
   cast_environment_->Logging()->InsertFrameEvent(
-      sender_clock_->NowTicks(), kVideoAckReceived, rtp_timestamp, frame_id);
+      sender_clock_->NowTicks(), FRAME_ACK_RECEIVED, VIDEO_EVENT,
+      rtp_timestamp, frame_id);
 
   EXPECT_TRUE(estimator_.GetReceiverOffsetBounds(&lower_bound, &upper_bound));
 
@@ -112,13 +128,20 @@ TEST_F(ReceiverTimeOffsetEstimatorImplTest, EventCArrivesBeforeEventB) {
 
   cast_environment_->Logging()->InsertEncodedFrameEvent(
       sender_clock_->NowTicks(),
-      kVideoFrameEncoded,
+      FRAME_ENCODED, VIDEO_EVENT,
       rtp_timestamp,
       frame_id,
       1234,
       true,
       5678);
 
+  cast_environment_->Logging()->InsertPacketEvent(
+      sender_clock_->NowTicks(),
+      PACKET_SENT_TO_NETWORK, VIDEO_EVENT,
+      rtp_timestamp,
+      frame_id,
+      56, 78, 1500);
+
   EXPECT_FALSE(estimator_.GetReceiverOffsetBounds(&lower_bound, &upper_bound));
 
   AdvanceClocks(base::TimeDelta::FromMilliseconds(10));
@@ -127,12 +150,19 @@ TEST_F(ReceiverTimeOffsetEstimatorImplTest, EventCArrivesBeforeEventB) {
   base::TimeTicks event_c_time = sender_clock_->NowTicks();
 
   cast_environment_->Logging()->InsertFrameEvent(
-      event_c_time, kVideoAckReceived, rtp_timestamp, frame_id);
+      event_c_time, FRAME_ACK_RECEIVED, VIDEO_EVENT, rtp_timestamp, frame_id);
 
   EXPECT_FALSE(estimator_.GetReceiverOffsetBounds(&lower_bound, &upper_bound));
 
+  cast_environment_->Logging()->InsertPacketEvent(
+      event_b_time,
+      PACKET_RECEIVED, VIDEO_EVENT,
+      rtp_timestamp,
+      frame_id,
+      56, 78, 1500);
+
   cast_environment_->Logging()->InsertFrameEvent(
-      event_b_time, kVideoAckSent, rtp_timestamp, frame_id);
+      event_b_time, FRAME_ACK_SENT, VIDEO_EVENT, rtp_timestamp, frame_id);
 
   EXPECT_TRUE(estimator_.GetReceiverOffsetBounds(&lower_bound, &upper_bound));
 
@@ -166,68 +196,111 @@ TEST_F(ReceiverTimeOffsetEstimatorImplTest, MultipleIterations) {
   AdvanceClocks(base::TimeDelta::FromMilliseconds(20));
   cast_environment_->Logging()->InsertEncodedFrameEvent(
       sender_clock_->NowTicks(),
-      kVideoFrameEncoded,
+      FRAME_ENCODED, VIDEO_EVENT,
       rtp_timestamp_a,
       frame_id_a,
       1234,
       true,
       5678);
 
+  cast_environment_->Logging()->InsertPacketEvent(
+      sender_clock_->NowTicks(),
+      PACKET_SENT_TO_NETWORK, VIDEO_EVENT,
+      rtp_timestamp_a,
+      frame_id_a,
+      56, 78, 1500);
+
   AdvanceClocks(base::TimeDelta::FromMilliseconds(10));
   cast_environment_->Logging()->InsertEncodedFrameEvent(
       sender_clock_->NowTicks(),
-      kVideoFrameEncoded,
+      FRAME_ENCODED, VIDEO_EVENT,
       rtp_timestamp_b,
       frame_id_b,
       1234,
       true,
       5678);
+
+  cast_environment_->Logging()->InsertPacketEvent(
+      sender_clock_->NowTicks(),
+      PACKET_SENT_TO_NETWORK, VIDEO_EVENT,
+      rtp_timestamp_b,
+      frame_id_b,
+      56, 78, 1500);
+
   cast_environment_->Logging()->InsertFrameEvent(
-      receiver_clock_.NowTicks(), kVideoAckSent, rtp_timestamp_a, frame_id_a);
+      receiver_clock_.NowTicks(), FRAME_ACK_SENT, VIDEO_EVENT,
+      rtp_timestamp_a, frame_id_a);
 
   AdvanceClocks(base::TimeDelta::FromMilliseconds(20));
+
+  cast_environment_->Logging()->InsertPacketEvent(
+      receiver_clock_.NowTicks(),
+      PACKET_RECEIVED, VIDEO_EVENT,
+      rtp_timestamp_b,
+      frame_id_b,
+      56, 78, 1500);
+
   cast_environment_->Logging()->InsertFrameEvent(
-      receiver_clock_.NowTicks(), kVideoAckSent, rtp_timestamp_b, frame_id_b);
+      receiver_clock_.NowTicks(), FRAME_ACK_SENT, VIDEO_EVENT,
+      rtp_timestamp_b, frame_id_b);
 
   AdvanceClocks(base::TimeDelta::FromMilliseconds(5));
   cast_environment_->Logging()->InsertFrameEvent(sender_clock_->NowTicks(),
-                                                 kVideoAckReceived,
+                                                 FRAME_ACK_RECEIVED,
+                                                 VIDEO_EVENT,
                                                  rtp_timestamp_b,
                                                  frame_id_b);
 
   AdvanceClocks(base::TimeDelta::FromMilliseconds(5));
   cast_environment_->Logging()->InsertFrameEvent(sender_clock_->NowTicks(),
-                                                 kVideoAckReceived,
+                                                 FRAME_ACK_RECEIVED,
+                                                 VIDEO_EVENT,
                                                  rtp_timestamp_a,
                                                  frame_id_a);
 
   AdvanceClocks(base::TimeDelta::FromMilliseconds(17));
   cast_environment_->Logging()->InsertEncodedFrameEvent(
       sender_clock_->NowTicks(),
-      kVideoFrameEncoded,
+      FRAME_ENCODED, VIDEO_EVENT,
       rtp_timestamp_c,
       frame_id_c,
       1234,
       true,
       5678);
 
+  cast_environment_->Logging()->InsertPacketEvent(
+      sender_clock_->NowTicks(),
+      PACKET_SENT_TO_NETWORK, VIDEO_EVENT,
+      rtp_timestamp_c,
+      frame_id_c,
+      56, 78, 1500);
+
   AdvanceClocks(base::TimeDelta::FromMilliseconds(3));
+  cast_environment_->Logging()->InsertPacketEvent(
+      receiver_clock_.NowTicks(),
+      PACKET_RECEIVED, VIDEO_EVENT,
+      rtp_timestamp_c,
+      frame_id_c,
+      56, 78, 1500);
+
   cast_environment_->Logging()->InsertFrameEvent(
-      receiver_clock_.NowTicks(), kVideoAckSent, rtp_timestamp_c, frame_id_c);
+      receiver_clock_.NowTicks(), FRAME_ACK_SENT, VIDEO_EVENT,
+      rtp_timestamp_c, frame_id_c);
 
   AdvanceClocks(base::TimeDelta::FromMilliseconds(30));
   cast_environment_->Logging()->InsertFrameEvent(sender_clock_->NowTicks(),
-                                                 kVideoAckReceived,
+                                                 FRAME_ACK_RECEIVED,
+                                                 VIDEO_EVENT,
                                                  rtp_timestamp_c,
                                                  frame_id_c);
 
   EXPECT_TRUE(estimator_.GetReceiverOffsetBounds(&lower_bound, &upper_bound));
   int64 lower_bound_ms = lower_bound.InMilliseconds();
   int64 upper_bound_ms = upper_bound.InMilliseconds();
-  EXPECT_EQ(95, lower_bound_ms);
-  EXPECT_EQ(103, upper_bound_ms);
-  EXPECT_GE(true_offset_ms, lower_bound_ms);
-  EXPECT_LE(true_offset_ms, upper_bound_ms);
+  EXPECT_GT(lower_bound_ms, 90);
+  EXPECT_LE(lower_bound_ms, true_offset_ms);
+  EXPECT_LT(upper_bound_ms, 150);
+  EXPECT_GT(upper_bound_ms, true_offset_ms);
 }
 
 }  // namespace cast