Replace uses of raw uint32's with a type-checked RtpTimeTicks data type.

media/cast/logging/encoding_event_subscriber_unittest.cc

Index: media/cast/logging/encoding_event_subscriber_unittest.cc
diff --git a/media/cast/logging/encoding_event_subscriber_unittest.cc b/media/cast/logging/encoding_event_subscriber_unittest.cc
index 123a8fe7bd10541340366ecae43b263f30c79aa1..a3d0341994f89ae7ae6e2bd0a0598f5aca50885e 100644
--- a/media/cast/logging/encoding_event_subscriber_unittest.cc
+++ b/media/cast/logging/encoding_event_subscriber_unittest.cc
@@ -37,8 +37,7 @@ class EncodingEventSubscriberTest : public ::testing::Test {
             scoped_ptr<base::TickClock>(testing_clock_).Pass(),
             task_runner_,
             task_runner_,
-            task_runner_)),
-        first_rtp_timestamp_(0) {}
+            task_runner_)) {}
 
   void Init(EventMediaType event_media_type) {
     DCHECK(!event_subscriber_);
@@ -54,7 +53,8 @@ class EncodingEventSubscriberTest : public ::testing::Test {
   void GetEventsAndReset() {
     event_subscriber_->GetEventsAndReset(
         &metadata_, &frame_events_, &packet_events_);
-    first_rtp_timestamp_ = metadata_.first_rtp_timestamp();
+    first_rtp_timestamp_ =
+        RtpTimeTicks().Expand(metadata_.first_rtp_timestamp());
   }
 
   base::SimpleTestTickClock* testing_clock_;  // Owned by CastEnvironment.
@@ -64,7 +64,7 @@ class EncodingEventSubscriberTest : public ::testing::Test {
   FrameEventList frame_events_;
   PacketEventList packet_events_;
   LogMetadata metadata_;
-  RtpTimestamp first_rtp_timestamp_;
+  RtpTimeTicks first_rtp_timestamp_;
 };
 
 TEST_F(EncodingEventSubscriberTest, FrameEventTruncating) {
@@ -80,14 +80,15 @@ TEST_F(EncodingEventSubscriberTest, FrameEventTruncating) {
     capture_begin_event->timestamp = now;
     capture_begin_event->type = FRAME_CAPTURE_BEGIN;
     capture_begin_event->media_type = VIDEO_EVENT;
-    capture_begin_event->rtp_timestamp = i * 100;
+    capture_begin_event->rtp_timestamp =
+        RtpTimeTicks().Expand<uint32_t>(i * 100);
     cast_environment_->logger()->DispatchFrameEvent(capture_begin_event.Pass());
 
     scoped_ptr<FrameEvent> capture_end_event(new FrameEvent());
     capture_end_event->timestamp = now;
     capture_end_event->type = FRAME_CAPTURE_END;
     capture_end_event->media_type = VIDEO_EVENT;
-    capture_end_event->rtp_timestamp = i * 100;
+    capture_end_event->rtp_timestamp = RtpTimeTicks().Expand<uint32_t>(i * 100);
     capture_end_event->width = width;
     capture_end_event->height = height;
     cast_environment_->logger()->DispatchFrameEvent(capture_end_event.Pass());
@@ -96,7 +97,7 @@ TEST_F(EncodingEventSubscriberTest, FrameEventTruncating) {
     decoded_event->timestamp = now;
     decoded_event->type = FRAME_DECODED;
     decoded_event->media_type = VIDEO_EVENT;
-    decoded_event->rtp_timestamp = i * 100;
+    decoded_event->rtp_timestamp = RtpTimeTicks().Expand<uint32_t>(i * 100);
     decoded_event->frame_id = 0;
     cast_environment_->logger()->DispatchFrameEvent(decoded_event.Pass());
 
@@ -130,7 +131,7 @@ TEST_F(EncodingEventSubscriberTest, PacketEventTruncating) {
     receive_event->timestamp = now;
     receive_event->type = PACKET_RECEIVED;
     receive_event->media_type = AUDIO_EVENT;
-    receive_event->rtp_timestamp = i * 100;
+    receive_event->rtp_timestamp = RtpTimeTicks().Expand<uint32_t>(i * 100);
     receive_event->frame_id = 0;
     receive_event->packet_id = i;
     receive_event->max_packet_id = 10;
@@ -149,7 +150,7 @@ TEST_F(EncodingEventSubscriberTest, EventFiltering) {
   Init(VIDEO_EVENT);
 
   base::TimeTicks now(testing_clock_->NowTicks());
-  RtpTimestamp rtp_timestamp = 100;
+  RtpTimeTicks rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(100));
   scoped_ptr<FrameEvent> video_event(new FrameEvent());
   video_event->timestamp = now;
   video_event->type = FRAME_DECODED;
@@ -186,7 +187,7 @@ TEST_F(EncodingEventSubscriberTest, EventFiltering) {
 TEST_F(EncodingEventSubscriberTest, FrameEvent) {
   Init(VIDEO_EVENT);
   base::TimeTicks now(testing_clock_->NowTicks());
-  RtpTimestamp rtp_timestamp = 100;
+  RtpTimeTicks rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(100));
   scoped_ptr<FrameEvent> decode_event(new FrameEvent());
   decode_event->timestamp = now;
   decode_event->type = FRAME_DECODED;
@@ -199,12 +200,12 @@ TEST_F(EncodingEventSubscriberTest, FrameEvent) {
 
   ASSERT_EQ(1u, frame_events_.size());
 
-  RtpTimestamp relative_rtp_timestamp = rtp_timestamp - first_rtp_timestamp_;
   FrameEventList::iterator it = frame_events_.begin();
 
   linked_ptr<AggregatedFrameEvent> event = *it;
 
-  EXPECT_EQ(relative_rtp_timestamp, event->relative_rtp_timestamp());
+  EXPECT_EQ((rtp_timestamp - first_rtp_timestamp_).lower_32_bits(),
+            event->relative_rtp_timestamp());
 
   ASSERT_EQ(1, event->event_type_size());
   EXPECT_EQ(media::cast::proto::FRAME_DECODED, event->event_type(0));
@@ -221,7 +222,7 @@ TEST_F(EncodingEventSubscriberTest, FrameEvent) {
 TEST_F(EncodingEventSubscriberTest, FrameEventDelay) {
   Init(AUDIO_EVENT);
   base::TimeTicks now(testing_clock_->NowTicks());
-  RtpTimestamp rtp_timestamp = 100;
+  RtpTimeTicks rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(100));
   int delay_ms = 100;
   scoped_ptr<FrameEvent> playout_event(new FrameEvent());
   playout_event->timestamp = now;
@@ -236,12 +237,12 @@ TEST_F(EncodingEventSubscriberTest, FrameEventDelay) {
 
   ASSERT_EQ(1u, frame_events_.size());
 
-  RtpTimestamp relative_rtp_timestamp = rtp_timestamp - first_rtp_timestamp_;
   FrameEventList::iterator it = frame_events_.begin();
 
   linked_ptr<AggregatedFrameEvent> event = *it;
 
-  EXPECT_EQ(relative_rtp_timestamp, event->relative_rtp_timestamp());
+  EXPECT_EQ((rtp_timestamp - first_rtp_timestamp_).lower_32_bits(),
+            event->relative_rtp_timestamp());
 
   ASSERT_EQ(1, event->event_type_size());
   EXPECT_EQ(media::cast::proto::FRAME_PLAYOUT, event->event_type(0));
@@ -256,7 +257,7 @@ TEST_F(EncodingEventSubscriberTest, FrameEventDelay) {
 TEST_F(EncodingEventSubscriberTest, FrameEventSize) {
   Init(VIDEO_EVENT);
   base::TimeTicks now(testing_clock_->NowTicks());
-  RtpTimestamp rtp_timestamp = 100;
+  RtpTimeTicks rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(100));
   int size = 123;
   bool key_frame = true;
   int target_bitrate = 1024;
@@ -279,12 +280,12 @@ TEST_F(EncodingEventSubscriberTest, FrameEventSize) {
 
   ASSERT_EQ(1u, frame_events_.size());
 
-  RtpTimestamp relative_rtp_timestamp = rtp_timestamp - first_rtp_timestamp_;
   FrameEventList::iterator it = frame_events_.begin();
 
   linked_ptr<AggregatedFrameEvent> event = *it;
 
-  EXPECT_EQ(relative_rtp_timestamp, event->relative_rtp_timestamp());
+  EXPECT_EQ((rtp_timestamp - first_rtp_timestamp_).lower_32_bits(),
+            event->relative_rtp_timestamp());
 
   ASSERT_EQ(1, event->event_type_size());
   EXPECT_EQ(media::cast::proto::FRAME_ENCODED, event->event_type(0));
@@ -302,8 +303,8 @@ TEST_F(EncodingEventSubscriberTest, FrameEventSize) {
 
 TEST_F(EncodingEventSubscriberTest, MultipleFrameEvents) {
   Init(AUDIO_EVENT);
-  RtpTimestamp rtp_timestamp1 = 100;
-  RtpTimestamp rtp_timestamp2 = 200;
+  RtpTimeTicks rtp_timestamp1 = RtpTimeTicks().Expand(UINT32_C(100));

[Irfan, 2015/12/09 21:24:28]

Should we add an explicit constructor so we can do RtpTimeTicks(100u) instead of
RtpTimeTicks().Expand(UINT32_C(100)) here and else where ?

[miu, 2015/12/10 00:38:36]

No.  I explicitly want to avoid this since it would lead to people writing code
that does a bunch of time math and THEN construct the RtpTimeTicks.  This is
modeled after the way base::TimeTicks works (for the same reason).

In the test code, it looks a little ugly to create RtpTimeTicks values, but
that's okay given it would also look ugly in non-test code; and a code reviewer
would then be able to easily detect and point out that non-test code shouldn't
be doing this.

+  RtpTimeTicks rtp_timestamp2 = rtp_timestamp1.Expand(UINT32_C(200));
   base::TimeTicks now1(testing_clock_->NowTicks());
   scoped_ptr<FrameEvent> playout_event(new FrameEvent());
   playout_event->timestamp = now1;
@@ -341,12 +342,12 @@ TEST_F(EncodingEventSubscriberTest, MultipleFrameEvents) {
 
   ASSERT_EQ(2u, frame_events_.size());
 
-  RtpTimestamp relative_rtp_timestamp = rtp_timestamp1 - first_rtp_timestamp_;
   FrameEventList::iterator it = frame_events_.begin();
 
   linked_ptr<AggregatedFrameEvent> event = *it;
 
-  EXPECT_EQ(relative_rtp_timestamp, event->relative_rtp_timestamp());
+  EXPECT_EQ((rtp_timestamp1 - first_rtp_timestamp_).lower_32_bits(),
+            event->relative_rtp_timestamp());
 
   ASSERT_EQ(2, event->event_type_size());
   EXPECT_EQ(media::cast::proto::FRAME_PLAYOUT, event->event_type(0));
@@ -358,12 +359,12 @@ TEST_F(EncodingEventSubscriberTest, MultipleFrameEvents) {
 
   EXPECT_FALSE(event->has_key_frame());
 
-  relative_rtp_timestamp = rtp_timestamp2 - first_rtp_timestamp_;
   ++it;
 
   event = *it;
 
-  EXPECT_EQ(relative_rtp_timestamp, event->relative_rtp_timestamp());
+  EXPECT_EQ((rtp_timestamp2 - first_rtp_timestamp_).lower_32_bits(),
+            event->relative_rtp_timestamp());
 
   ASSERT_EQ(1, event->event_type_size());
   EXPECT_EQ(media::cast::proto::FRAME_ENCODED, event->event_type(0));
@@ -379,7 +380,7 @@ TEST_F(EncodingEventSubscriberTest, MultipleFrameEvents) {
 TEST_F(EncodingEventSubscriberTest, PacketEvent) {
   Init(AUDIO_EVENT);
   base::TimeTicks now(testing_clock_->NowTicks());
-  RtpTimestamp rtp_timestamp = 100;
+  RtpTimeTicks rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(100));
   int packet_id = 2;
   int size = 100;
   scoped_ptr<PacketEvent> receive_event(new PacketEvent());
@@ -397,12 +398,12 @@ TEST_F(EncodingEventSubscriberTest, PacketEvent) {
 
   ASSERT_EQ(1u, packet_events_.size());
 
-  RtpTimestamp relative_rtp_timestamp = rtp_timestamp - first_rtp_timestamp_;
   PacketEventList::iterator it = packet_events_.begin();
 
   linked_ptr<AggregatedPacketEvent> event = *it;
 
-  EXPECT_EQ(relative_rtp_timestamp, event->relative_rtp_timestamp());
+  EXPECT_EQ((rtp_timestamp - first_rtp_timestamp_).lower_32_bits(),
+            event->relative_rtp_timestamp());
 
   ASSERT_EQ(1, event->base_packet_event_size());
   const BasePacketEvent& base_event = event->base_packet_event(0);
@@ -421,7 +422,7 @@ TEST_F(EncodingEventSubscriberTest, PacketEvent) {
 TEST_F(EncodingEventSubscriberTest, MultiplePacketEventsForPacket) {
   Init(VIDEO_EVENT);
   base::TimeTicks now1(testing_clock_->NowTicks());
-  RtpTimestamp rtp_timestamp = 100;
+  RtpTimeTicks rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(100));
   int packet_id = 2;
   int size = 100;
   scoped_ptr<PacketEvent> send_event(new PacketEvent());
@@ -452,12 +453,12 @@ TEST_F(EncodingEventSubscriberTest, MultiplePacketEventsForPacket) {
 
   ASSERT_EQ(1u, packet_events_.size());
 
-  RtpTimestamp relative_rtp_timestamp = rtp_timestamp - first_rtp_timestamp_;
   PacketEventList::iterator it = packet_events_.begin();
 
   linked_ptr<AggregatedPacketEvent> event = *it;
 
-  EXPECT_EQ(relative_rtp_timestamp, event->relative_rtp_timestamp());
+  EXPECT_EQ((rtp_timestamp - first_rtp_timestamp_).lower_32_bits(),
+            event->relative_rtp_timestamp());
 
   ASSERT_EQ(1, event->base_packet_event_size());
   const BasePacketEvent& base_event = event->base_packet_event(0);
@@ -475,7 +476,7 @@ TEST_F(EncodingEventSubscriberTest, MultiplePacketEventsForPacket) {
 TEST_F(EncodingEventSubscriberTest, MultiplePacketEventsForFrame) {
   Init(VIDEO_EVENT);
   base::TimeTicks now1(testing_clock_->NowTicks());
-  RtpTimestamp rtp_timestamp = 100;
+  RtpTimeTicks rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(100));
   int packet_id_1 = 2;
   int packet_id_2 = 3;
   int size = 100;
@@ -507,12 +508,12 @@ TEST_F(EncodingEventSubscriberTest, MultiplePacketEventsForFrame) {
 
   ASSERT_EQ(1u, packet_events_.size());
 
-  RtpTimestamp relative_rtp_timestamp = rtp_timestamp - first_rtp_timestamp_;
   PacketEventList::iterator it = packet_events_.begin();
 
   linked_ptr<AggregatedPacketEvent> event = *it;
 
-  EXPECT_EQ(relative_rtp_timestamp, event->relative_rtp_timestamp());
+  EXPECT_EQ((rtp_timestamp - first_rtp_timestamp_).lower_32_bits(),
+            event->relative_rtp_timestamp());
 
   ASSERT_EQ(2, event->base_packet_event_size());
   const BasePacketEvent& base_event = event->base_packet_event(0);
@@ -535,8 +536,8 @@ TEST_F(EncodingEventSubscriberTest, MultiplePacketEventsForFrame) {
 TEST_F(EncodingEventSubscriberTest, MultiplePacketEvents) {
   Init(VIDEO_EVENT);
   base::TimeTicks now1(testing_clock_->NowTicks());
-  RtpTimestamp rtp_timestamp_1 = 100;
-  RtpTimestamp rtp_timestamp_2 = 200;
+  RtpTimeTicks rtp_timestamp_1 = RtpTimeTicks().Expand(UINT32_C(100));
+  RtpTimeTicks rtp_timestamp_2 = rtp_timestamp_1.Expand(UINT32_C(200));
   int packet_id_1 = 2;
   int packet_id_2 = 3;
   int size = 100;
@@ -568,12 +569,12 @@ TEST_F(EncodingEventSubscriberTest, MultiplePacketEvents) {
 
   ASSERT_EQ(2u, packet_events_.size());
 
-  RtpTimestamp relative_rtp_timestamp = rtp_timestamp_1 - first_rtp_timestamp_;
   PacketEventList::iterator it = packet_events_.begin();
 
   linked_ptr<AggregatedPacketEvent> event = *it;
 
-  EXPECT_EQ(relative_rtp_timestamp, event->relative_rtp_timestamp());
+  EXPECT_EQ((rtp_timestamp_1 - first_rtp_timestamp_).lower_32_bits(),
+            event->relative_rtp_timestamp());
 
   ASSERT_EQ(1, event->base_packet_event_size());
   const BasePacketEvent& base_event = event->base_packet_event(0);
@@ -584,12 +585,12 @@ TEST_F(EncodingEventSubscriberTest, MultiplePacketEvents) {
   ASSERT_EQ(1, base_event.event_timestamp_ms_size());
   EXPECT_EQ(InMilliseconds(now1), base_event.event_timestamp_ms(0));
 
-  relative_rtp_timestamp = rtp_timestamp_2 - first_rtp_timestamp_;
   ++it;
   ASSERT_TRUE(it != packet_events_.end());
 
   event = *it;
-  EXPECT_EQ(relative_rtp_timestamp, event->relative_rtp_timestamp());
+  EXPECT_EQ((rtp_timestamp_2 - first_rtp_timestamp_).lower_32_bits(),
+            event->relative_rtp_timestamp());
 
   ASSERT_EQ(1, event->base_packet_event_size());
   const BasePacketEvent& base_event_2 = event->base_packet_event(0);
@@ -601,9 +602,9 @@ TEST_F(EncodingEventSubscriberTest, MultiplePacketEvents) {
   EXPECT_EQ(InMilliseconds(now2), base_event_2.event_timestamp_ms(0));
 }
 
-TEST_F(EncodingEventSubscriberTest, FirstRtpTimestamp) {
+TEST_F(EncodingEventSubscriberTest, FirstRtpTimeTicks) {
   Init(VIDEO_EVENT);
-  RtpTimestamp rtp_timestamp = 12345;
+  RtpTimeTicks rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(12345));
   base::TimeTicks now(testing_clock_->NowTicks());
 
   scoped_ptr<FrameEvent> capture_begin_event(new FrameEvent());
@@ -617,7 +618,8 @@ TEST_F(EncodingEventSubscriberTest, FirstRtpTimestamp) {
   capture_end_event->timestamp = now;
   capture_end_event->type = FRAME_CAPTURE_END;
   capture_end_event->media_type = VIDEO_EVENT;
-  capture_end_event->rtp_timestamp = rtp_timestamp + 30;
+  capture_end_event->rtp_timestamp =
+      rtp_timestamp + RtpTimeDelta::FromTicks(30);
   capture_end_event->width = 1280;
   capture_end_event->height = 720;
   cast_environment_->logger()->DispatchFrameEvent(capture_end_event.Pass());
@@ -635,7 +637,7 @@ TEST_F(EncodingEventSubscriberTest, FirstRtpTimestamp) {
   EXPECT_EQ(1280, (*it)->width());
   EXPECT_EQ(720, (*it)->height());
 
-  rtp_timestamp = 67890;
+  rtp_timestamp = rtp_timestamp.Expand(UINT32_C(67890));
 
   capture_begin_event.reset(new FrameEvent());
   capture_begin_event->timestamp = now;
@@ -649,9 +651,9 @@ TEST_F(EncodingEventSubscriberTest, FirstRtpTimestamp) {
   EXPECT_EQ(rtp_timestamp, first_rtp_timestamp_);
 }
 
-TEST_F(EncodingEventSubscriberTest, RelativeRtpTimestampWrapAround) {
+TEST_F(EncodingEventSubscriberTest, RelativeRtpTimeTicksWrapAround) {
   Init(VIDEO_EVENT);
-  RtpTimestamp rtp_timestamp = 0xffffffff - 20;
+  RtpTimeTicks rtp_timestamp = RtpTimeTicks() - RtpTimeDelta::FromTicks(20);
   base::TimeTicks now(testing_clock_->NowTicks());
 
   scoped_ptr<FrameEvent> capture_begin_event(new FrameEvent());
@@ -661,12 +663,13 @@ TEST_F(EncodingEventSubscriberTest, RelativeRtpTimestampWrapAround) {
   capture_begin_event->rtp_timestamp = rtp_timestamp;
   cast_environment_->logger()->DispatchFrameEvent(capture_begin_event.Pass());
 
-  // RtpTimestamp has now wrapped around.
+  // RtpTimeTicks has now wrapped around.
   scoped_ptr<FrameEvent> capture_end_event(new FrameEvent());
   capture_end_event->timestamp = now;
   capture_end_event->type = FRAME_CAPTURE_END;
   capture_end_event->media_type = VIDEO_EVENT;
-  capture_end_event->rtp_timestamp = rtp_timestamp + 30;
+  capture_end_event->rtp_timestamp =
+      rtp_timestamp + RtpTimeDelta::FromTicks(30);
   capture_end_event->width = 1280;
   capture_end_event->height = 720;
   cast_environment_->logger()->DispatchFrameEvent(capture_end_event.Pass());
@@ -686,7 +689,7 @@ TEST_F(EncodingEventSubscriberTest, RelativeRtpTimestampWrapAround) {
 
 TEST_F(EncodingEventSubscriberTest, MaxEventsPerProto) {
   Init(VIDEO_EVENT);
-  RtpTimestamp rtp_timestamp = 100;
+  RtpTimeTicks rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(100));
   for (int i = 0; i < kMaxEventsPerProto + 1; i++) {
     scoped_ptr<FrameEvent> ack_event(new FrameEvent());
     ack_event->timestamp = testing_clock_->NowTicks();