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

Side by Side 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: 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 unified diff | Download patch
OLDNEW
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/ref_counted.h" 5 #include "base/memory/ref_counted.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "base/test/simple_test_tick_clock.h" 7 #include "base/test/simple_test_tick_clock.h"
8 #include "base/time/tick_clock.h" 8 #include "base/time/tick_clock.h"
9 #include "media/cast/cast_environment.h" 9 #include "media/cast/cast_environment.h"
10 #include "media/cast/logging/logging_defines.h" 10 #include "media/cast/logging/logging_defines.h"
(...skipping 26 matching lines...) Expand all
37 scoped_refptr<CastEnvironment> cast_environment_; 37 scoped_refptr<CastEnvironment> cast_environment_;
38 SimpleEventSubscriber event_subscriber_; 38 SimpleEventSubscriber event_subscriber_;
39 }; 39 };
40 40
41 TEST_F(SimpleEventSubscriberTest, GetAndResetEvents) { 41 TEST_F(SimpleEventSubscriberTest, GetAndResetEvents) {
42 // Log some frame events. 42 // Log some frame events.
43 scoped_ptr<FrameEvent> encode_event(new FrameEvent()); 43 scoped_ptr<FrameEvent> encode_event(new FrameEvent());
44 encode_event->timestamp = testing_clock_->NowTicks(); 44 encode_event->timestamp = testing_clock_->NowTicks();
45 encode_event->type = FRAME_ENCODED; 45 encode_event->type = FRAME_ENCODED;
46 encode_event->media_type = AUDIO_EVENT; 46 encode_event->media_type = AUDIO_EVENT;
47 encode_event->rtp_timestamp = 100u; 47 encode_event->rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(100));
Irfan 2015/12/09 21:24:28 Would Expand(100u) work here and elsewhere ?
miu 2015/12/10 00:38:36 Yes, but the interpretation of 100u would be diffe
48 encode_event->frame_id = 0u; 48 encode_event->frame_id = 0u;
49 encode_event->size = 1234; 49 encode_event->size = 1234;
50 encode_event->key_frame = true; 50 encode_event->key_frame = true;
51 encode_event->target_bitrate = 128u; 51 encode_event->target_bitrate = 128u;
52 encode_event->encoder_cpu_utilization = 0.01; 52 encode_event->encoder_cpu_utilization = 0.01;
53 encode_event->idealized_bitrate_utilization = 0.02; 53 encode_event->idealized_bitrate_utilization = 0.02;
54 cast_environment_->logger()->DispatchFrameEvent(encode_event.Pass()); 54 cast_environment_->logger()->DispatchFrameEvent(encode_event.Pass());
55 55
56 scoped_ptr<FrameEvent> playout_event(new FrameEvent()); 56 scoped_ptr<FrameEvent> playout_event(new FrameEvent());
57 playout_event->timestamp = testing_clock_->NowTicks(); 57 playout_event->timestamp = testing_clock_->NowTicks();
58 playout_event->type = FRAME_PLAYOUT; 58 playout_event->type = FRAME_PLAYOUT;
59 playout_event->media_type = AUDIO_EVENT; 59 playout_event->media_type = AUDIO_EVENT;
60 playout_event->rtp_timestamp = 100u; 60 playout_event->rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(100));
61 playout_event->frame_id = 0u; 61 playout_event->frame_id = 0u;
62 playout_event->delay_delta = base::TimeDelta::FromMilliseconds(100); 62 playout_event->delay_delta = base::TimeDelta::FromMilliseconds(100);
63 cast_environment_->logger()->DispatchFrameEvent(playout_event.Pass()); 63 cast_environment_->logger()->DispatchFrameEvent(playout_event.Pass());
64 64
65 scoped_ptr<FrameEvent> decode_event(new FrameEvent()); 65 scoped_ptr<FrameEvent> decode_event(new FrameEvent());
66 decode_event->timestamp = testing_clock_->NowTicks(); 66 decode_event->timestamp = testing_clock_->NowTicks();
67 decode_event->type = FRAME_DECODED; 67 decode_event->type = FRAME_DECODED;
68 decode_event->media_type = AUDIO_EVENT; 68 decode_event->media_type = AUDIO_EVENT;
69 decode_event->rtp_timestamp = 200u; 69 decode_event->rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(200));
70 decode_event->frame_id = 0u; 70 decode_event->frame_id = 0u;
71 cast_environment_->logger()->DispatchFrameEvent(decode_event.Pass()); 71 cast_environment_->logger()->DispatchFrameEvent(decode_event.Pass());
72 72
73 // Log some packet events. 73 // Log some packet events.
74 scoped_ptr<PacketEvent> receive_event(new PacketEvent()); 74 scoped_ptr<PacketEvent> receive_event(new PacketEvent());
75 receive_event->timestamp = testing_clock_->NowTicks(); 75 receive_event->timestamp = testing_clock_->NowTicks();
76 receive_event->type = PACKET_RECEIVED; 76 receive_event->type = PACKET_RECEIVED;
77 receive_event->media_type = AUDIO_EVENT; 77 receive_event->media_type = AUDIO_EVENT;
78 receive_event->rtp_timestamp = 200u; 78 receive_event->rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(200));
79 receive_event->frame_id = 0u; 79 receive_event->frame_id = 0u;
80 receive_event->packet_id = 1u; 80 receive_event->packet_id = 1u;
81 receive_event->max_packet_id = 5u; 81 receive_event->max_packet_id = 5u;
82 receive_event->size = 100u; 82 receive_event->size = 100u;
83 cast_environment_->logger()->DispatchPacketEvent(receive_event.Pass()); 83 cast_environment_->logger()->DispatchPacketEvent(receive_event.Pass());
84 84
85 receive_event.reset(new PacketEvent()); 85 receive_event.reset(new PacketEvent());
86 receive_event->timestamp = testing_clock_->NowTicks(); 86 receive_event->timestamp = testing_clock_->NowTicks();
87 receive_event->type = PACKET_RECEIVED; 87 receive_event->type = PACKET_RECEIVED;
88 receive_event->media_type = VIDEO_EVENT; 88 receive_event->media_type = VIDEO_EVENT;
89 receive_event->rtp_timestamp = 200u; 89 receive_event->rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(200));
90 receive_event->frame_id = 0u; 90 receive_event->frame_id = 0u;
91 receive_event->packet_id = 1u; 91 receive_event->packet_id = 1u;
92 receive_event->max_packet_id = 10u; 92 receive_event->max_packet_id = 10u;
93 receive_event->size = 1024u; 93 receive_event->size = 1024u;
94 cast_environment_->logger()->DispatchPacketEvent(receive_event.Pass()); 94 cast_environment_->logger()->DispatchPacketEvent(receive_event.Pass());
95 95
96 std::vector<FrameEvent> frame_events; 96 std::vector<FrameEvent> frame_events;
97 event_subscriber_.GetFrameEventsAndReset(&frame_events); 97 event_subscriber_.GetFrameEventsAndReset(&frame_events);
98 EXPECT_EQ(3u, frame_events.size()); 98 EXPECT_EQ(3u, frame_events.size());
99 99
100 std::vector<PacketEvent> packet_events; 100 std::vector<PacketEvent> packet_events;
101 event_subscriber_.GetPacketEventsAndReset(&packet_events); 101 event_subscriber_.GetPacketEventsAndReset(&packet_events);
102 EXPECT_EQ(2u, packet_events.size()); 102 EXPECT_EQ(2u, packet_events.size());
103 103
104 // Calling this function again should result in empty vector because no events 104 // Calling this function again should result in empty vector because no events
105 // were logged since last call. 105 // were logged since last call.
106 event_subscriber_.GetFrameEventsAndReset(&frame_events); 106 event_subscriber_.GetFrameEventsAndReset(&frame_events);
107 event_subscriber_.GetPacketEventsAndReset(&packet_events); 107 event_subscriber_.GetPacketEventsAndReset(&packet_events);
108 EXPECT_TRUE(frame_events.empty()); 108 EXPECT_TRUE(frame_events.empty());
109 EXPECT_TRUE(packet_events.empty()); 109 EXPECT_TRUE(packet_events.empty());
110 } 110 }
111 111
112 } // namespace cast 112 } // namespace cast
113 } // namespace media 113 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698