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

Unified Diff: media/cast/logging/simple_event_subscriber_unittest.cc

Issue 1515433002: Replace uses of raw uint32's with a type-checked RtpTimeTicks data type. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Speculative workaround fix for win8_chromium_ng compile error. Created 5 years 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 side-by-side diff with in-line comments
Download patch
Index: media/cast/logging/simple_event_subscriber_unittest.cc
diff --git a/media/cast/logging/simple_event_subscriber_unittest.cc b/media/cast/logging/simple_event_subscriber_unittest.cc
index f1f5f14087b6d6cfc5e36ead52abd158b59b7f25..d0b91cd964b8df3675d1edee3124e7903a450681 100644
--- a/media/cast/logging/simple_event_subscriber_unittest.cc
+++ b/media/cast/logging/simple_event_subscriber_unittest.cc
@@ -47,7 +47,7 @@ TEST_F(SimpleEventSubscriberTest, GetAndResetEvents) {
encode_event->timestamp = testing_clock_->NowTicks();
encode_event->type = FRAME_ENCODED;
encode_event->media_type = AUDIO_EVENT;
- encode_event->rtp_timestamp = 100u;
+ encode_event->rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(100));
encode_event->frame_id = 0u;
encode_event->size = 1234;
encode_event->key_frame = true;
@@ -60,7 +60,7 @@ TEST_F(SimpleEventSubscriberTest, GetAndResetEvents) {
playout_event->timestamp = testing_clock_->NowTicks();
playout_event->type = FRAME_PLAYOUT;
playout_event->media_type = AUDIO_EVENT;
- playout_event->rtp_timestamp = 100u;
+ playout_event->rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(100));
playout_event->frame_id = 0u;
playout_event->delay_delta = base::TimeDelta::FromMilliseconds(100);
cast_environment_->logger()->DispatchFrameEvent(std::move(playout_event));
@@ -69,7 +69,7 @@ TEST_F(SimpleEventSubscriberTest, GetAndResetEvents) {
decode_event->timestamp = testing_clock_->NowTicks();
decode_event->type = FRAME_DECODED;
decode_event->media_type = AUDIO_EVENT;
- decode_event->rtp_timestamp = 200u;
+ decode_event->rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(200));
decode_event->frame_id = 0u;
cast_environment_->logger()->DispatchFrameEvent(std::move(decode_event));
@@ -78,7 +78,7 @@ TEST_F(SimpleEventSubscriberTest, GetAndResetEvents) {
receive_event->timestamp = testing_clock_->NowTicks();
receive_event->type = PACKET_RECEIVED;
receive_event->media_type = AUDIO_EVENT;
- receive_event->rtp_timestamp = 200u;
+ receive_event->rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(200));
receive_event->frame_id = 0u;
receive_event->packet_id = 1u;
receive_event->max_packet_id = 5u;
@@ -89,7 +89,7 @@ TEST_F(SimpleEventSubscriberTest, GetAndResetEvents) {
receive_event->timestamp = testing_clock_->NowTicks();
receive_event->type = PACKET_RECEIVED;
receive_event->media_type = VIDEO_EVENT;
- receive_event->rtp_timestamp = 200u;
+ receive_event->rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(200));
receive_event->frame_id = 0u;
receive_event->packet_id = 1u;
receive_event->max_packet_id = 10u;
« no previous file with comments | « media/cast/logging/receiver_time_offset_estimator_impl_unittest.cc ('k') | media/cast/logging/stats_event_subscriber.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698