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

Side by Side Diff: media/cast/net/rtcp/receiver_rtcp_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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 new ReceiverRtcpEventSubscriber(kMaxEventEntries, type)); 47 new ReceiverRtcpEventSubscriber(kMaxEventEntries, type));
48 cast_environment_->logger()->Subscribe(event_subscriber_.get()); 48 cast_environment_->logger()->Subscribe(event_subscriber_.get());
49 } 49 }
50 50
51 void InsertEvents() { 51 void InsertEvents() {
52 // Video events 52 // Video events
53 scoped_ptr<FrameEvent> playout_event(new FrameEvent()); 53 scoped_ptr<FrameEvent> playout_event(new FrameEvent());
54 playout_event->timestamp = testing_clock_->NowTicks(); 54 playout_event->timestamp = testing_clock_->NowTicks();
55 playout_event->type = FRAME_PLAYOUT; 55 playout_event->type = FRAME_PLAYOUT;
56 playout_event->media_type = VIDEO_EVENT; 56 playout_event->media_type = VIDEO_EVENT;
57 playout_event->rtp_timestamp = 100u; 57 playout_event->rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(100));
58 playout_event->frame_id = 2u; 58 playout_event->frame_id = 2u;
59 playout_event->delay_delta = base::TimeDelta::FromMilliseconds(kDelayMs); 59 playout_event->delay_delta = base::TimeDelta::FromMilliseconds(kDelayMs);
60 cast_environment_->logger()->DispatchFrameEvent(playout_event.Pass()); 60 cast_environment_->logger()->DispatchFrameEvent(playout_event.Pass());
61 61
62 scoped_ptr<FrameEvent> decode_event(new FrameEvent()); 62 scoped_ptr<FrameEvent> decode_event(new FrameEvent());
63 decode_event->timestamp = testing_clock_->NowTicks(); 63 decode_event->timestamp = testing_clock_->NowTicks();
64 decode_event->type = FRAME_DECODED; 64 decode_event->type = FRAME_DECODED;
65 decode_event->media_type = VIDEO_EVENT; 65 decode_event->media_type = VIDEO_EVENT;
66 decode_event->rtp_timestamp = 200u; 66 decode_event->rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(200));
67 decode_event->frame_id = 1u; 67 decode_event->frame_id = 1u;
68 cast_environment_->logger()->DispatchFrameEvent(decode_event.Pass()); 68 cast_environment_->logger()->DispatchFrameEvent(decode_event.Pass());
69 69
70 scoped_ptr<PacketEvent> receive_event(new PacketEvent()); 70 scoped_ptr<PacketEvent> receive_event(new PacketEvent());
71 receive_event->timestamp = testing_clock_->NowTicks(); 71 receive_event->timestamp = testing_clock_->NowTicks();
72 receive_event->type = PACKET_RECEIVED; 72 receive_event->type = PACKET_RECEIVED;
73 receive_event->media_type = VIDEO_EVENT; 73 receive_event->media_type = VIDEO_EVENT;
74 receive_event->rtp_timestamp = 200u; 74 receive_event->rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(200));
75 receive_event->frame_id = 2u; 75 receive_event->frame_id = 2u;
76 receive_event->packet_id = 1u; 76 receive_event->packet_id = 1u;
77 receive_event->max_packet_id = 10u; 77 receive_event->max_packet_id = 10u;
78 receive_event->size = 1024u; 78 receive_event->size = 1024u;
79 cast_environment_->logger()->DispatchPacketEvent(receive_event.Pass()); 79 cast_environment_->logger()->DispatchPacketEvent(receive_event.Pass());
80 80
81 // Audio events 81 // Audio events
82 playout_event.reset(new FrameEvent()); 82 playout_event.reset(new FrameEvent());
83 playout_event->timestamp = testing_clock_->NowTicks(); 83 playout_event->timestamp = testing_clock_->NowTicks();
84 playout_event->type = FRAME_PLAYOUT; 84 playout_event->type = FRAME_PLAYOUT;
85 playout_event->media_type = AUDIO_EVENT; 85 playout_event->media_type = AUDIO_EVENT;
86 playout_event->rtp_timestamp = 300u; 86 playout_event->rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(300));
87 playout_event->frame_id = 4u; 87 playout_event->frame_id = 4u;
88 playout_event->delay_delta = base::TimeDelta::FromMilliseconds(kDelayMs); 88 playout_event->delay_delta = base::TimeDelta::FromMilliseconds(kDelayMs);
89 cast_environment_->logger()->DispatchFrameEvent(playout_event.Pass()); 89 cast_environment_->logger()->DispatchFrameEvent(playout_event.Pass());
90 90
91 decode_event.reset(new FrameEvent()); 91 decode_event.reset(new FrameEvent());
92 decode_event->timestamp = testing_clock_->NowTicks(); 92 decode_event->timestamp = testing_clock_->NowTicks();
93 decode_event->type = FRAME_DECODED; 93 decode_event->type = FRAME_DECODED;
94 decode_event->media_type = AUDIO_EVENT; 94 decode_event->media_type = AUDIO_EVENT;
95 decode_event->rtp_timestamp = 400u; 95 decode_event->rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(400));
96 decode_event->frame_id = 3u; 96 decode_event->frame_id = 3u;
97 cast_environment_->logger()->DispatchFrameEvent(decode_event.Pass()); 97 cast_environment_->logger()->DispatchFrameEvent(decode_event.Pass());
98 98
99 receive_event.reset(new PacketEvent()); 99 receive_event.reset(new PacketEvent());
100 receive_event->timestamp = testing_clock_->NowTicks(); 100 receive_event->timestamp = testing_clock_->NowTicks();
101 receive_event->type = PACKET_RECEIVED; 101 receive_event->type = PACKET_RECEIVED;
102 receive_event->media_type = AUDIO_EVENT; 102 receive_event->media_type = AUDIO_EVENT;
103 receive_event->rtp_timestamp = 400u; 103 receive_event->rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(400));
104 receive_event->frame_id = 5u; 104 receive_event->frame_id = 5u;
105 receive_event->packet_id = 1u; 105 receive_event->packet_id = 1u;
106 receive_event->max_packet_id = 10u; 106 receive_event->max_packet_id = 10u;
107 receive_event->size = 128u; 107 receive_event->size = 128u;
108 cast_environment_->logger()->DispatchPacketEvent(receive_event.Pass()); 108 cast_environment_->logger()->DispatchPacketEvent(receive_event.Pass());
109 109
110 // Unrelated events 110 // Unrelated events
111 scoped_ptr<FrameEvent> encode_event(new FrameEvent()); 111 scoped_ptr<FrameEvent> encode_event(new FrameEvent());
112 encode_event->timestamp = testing_clock_->NowTicks(); 112 encode_event->timestamp = testing_clock_->NowTicks();
113 encode_event->type = FRAME_ENCODED; 113 encode_event->type = FRAME_ENCODED;
114 encode_event->media_type = VIDEO_EVENT; 114 encode_event->media_type = VIDEO_EVENT;
115 encode_event->rtp_timestamp = 100u; 115 encode_event->rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(100));
116 encode_event->frame_id = 1u; 116 encode_event->frame_id = 1u;
117 cast_environment_->logger()->DispatchFrameEvent(encode_event.Pass()); 117 cast_environment_->logger()->DispatchFrameEvent(encode_event.Pass());
118 118
119 encode_event.reset(new FrameEvent()); 119 encode_event.reset(new FrameEvent());
120 encode_event->timestamp = testing_clock_->NowTicks(); 120 encode_event->timestamp = testing_clock_->NowTicks();
121 encode_event->type = FRAME_ENCODED; 121 encode_event->type = FRAME_ENCODED;
122 encode_event->media_type = AUDIO_EVENT; 122 encode_event->media_type = AUDIO_EVENT;
123 encode_event->rtp_timestamp = 100u; 123 encode_event->rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(100));
124 encode_event->frame_id = 1u; 124 encode_event->frame_id = 1u;
125 cast_environment_->logger()->DispatchFrameEvent(encode_event.Pass()); 125 cast_environment_->logger()->DispatchFrameEvent(encode_event.Pass());
126 } 126 }
127 127
128 base::SimpleTestTickClock* testing_clock_; // Owned by CastEnvironment. 128 base::SimpleTestTickClock* testing_clock_; // Owned by CastEnvironment.
129 scoped_refptr<test::FakeSingleThreadTaskRunner> task_runner_; 129 scoped_refptr<test::FakeSingleThreadTaskRunner> task_runner_;
130 scoped_refptr<CastEnvironment> cast_environment_; 130 scoped_refptr<CastEnvironment> cast_environment_;
131 scoped_ptr<ReceiverRtcpEventSubscriber> event_subscriber_; 131 scoped_ptr<ReceiverRtcpEventSubscriber> event_subscriber_;
132 }; 132 };
133 133
(...skipping 16 matching lines...) Expand all
150 } 150 }
151 151
152 TEST_F(ReceiverRtcpEventSubscriberTest, DropEventsWhenSizeExceeded) { 152 TEST_F(ReceiverRtcpEventSubscriberTest, DropEventsWhenSizeExceeded) {
153 Init(VIDEO_EVENT); 153 Init(VIDEO_EVENT);
154 154
155 for (uint32 i = 1u; i <= 10u; ++i) { 155 for (uint32 i = 1u; i <= 10u; ++i) {
156 scoped_ptr<FrameEvent> decode_event(new FrameEvent()); 156 scoped_ptr<FrameEvent> decode_event(new FrameEvent());
157 decode_event->timestamp = testing_clock_->NowTicks(); 157 decode_event->timestamp = testing_clock_->NowTicks();
158 decode_event->type = FRAME_DECODED; 158 decode_event->type = FRAME_DECODED;
159 decode_event->media_type = VIDEO_EVENT; 159 decode_event->media_type = VIDEO_EVENT;
160 decode_event->rtp_timestamp = i * 10; 160 decode_event->rtp_timestamp = RtpTimeTicks().Expand(i * 10);
161 decode_event->frame_id = i; 161 decode_event->frame_id = i;
162 cast_environment_->logger()->DispatchFrameEvent(decode_event.Pass()); 162 cast_environment_->logger()->DispatchFrameEvent(decode_event.Pass());
163 } 163 }
164 164
165 ReceiverRtcpEventSubscriber::RtcpEvents rtcp_events; 165 ReceiverRtcpEventSubscriber::RtcpEvents rtcp_events;
166 event_subscriber_->GetRtcpEventsWithRedundancy(&rtcp_events); 166 event_subscriber_->GetRtcpEventsWithRedundancy(&rtcp_events);
167 EXPECT_EQ(10u, rtcp_events.size()); 167 EXPECT_EQ(10u, rtcp_events.size());
168 } 168 }
169 169
170 } // namespace cast 170 } // namespace cast
171 } // namespace media 171 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698