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

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: Speculative workaround fix for win8_chromium_ng compile error. Created 4 years, 11 months 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
« no previous file with comments | « media/cast/net/rtcp/receiver_rtcp_event_subscriber.cc ('k') | media/cast/net/rtcp/rtcp.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "media/cast/net/rtcp/receiver_rtcp_event_subscriber.h" 5 #include "media/cast/net/rtcp/receiver_rtcp_event_subscriber.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 new ReceiverRtcpEventSubscriber(kMaxEventEntries, type)); 52 new ReceiverRtcpEventSubscriber(kMaxEventEntries, type));
53 cast_environment_->logger()->Subscribe(event_subscriber_.get()); 53 cast_environment_->logger()->Subscribe(event_subscriber_.get());
54 } 54 }
55 55
56 void InsertEvents() { 56 void InsertEvents() {
57 // Video events 57 // Video events
58 scoped_ptr<FrameEvent> playout_event(new FrameEvent()); 58 scoped_ptr<FrameEvent> playout_event(new FrameEvent());
59 playout_event->timestamp = testing_clock_->NowTicks(); 59 playout_event->timestamp = testing_clock_->NowTicks();
60 playout_event->type = FRAME_PLAYOUT; 60 playout_event->type = FRAME_PLAYOUT;
61 playout_event->media_type = VIDEO_EVENT; 61 playout_event->media_type = VIDEO_EVENT;
62 playout_event->rtp_timestamp = 100u; 62 playout_event->rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(100));
63 playout_event->frame_id = 2u; 63 playout_event->frame_id = 2u;
64 playout_event->delay_delta = base::TimeDelta::FromMilliseconds(kDelayMs); 64 playout_event->delay_delta = base::TimeDelta::FromMilliseconds(kDelayMs);
65 cast_environment_->logger()->DispatchFrameEvent(std::move(playout_event)); 65 cast_environment_->logger()->DispatchFrameEvent(std::move(playout_event));
66 66
67 scoped_ptr<FrameEvent> decode_event(new FrameEvent()); 67 scoped_ptr<FrameEvent> decode_event(new FrameEvent());
68 decode_event->timestamp = testing_clock_->NowTicks(); 68 decode_event->timestamp = testing_clock_->NowTicks();
69 decode_event->type = FRAME_DECODED; 69 decode_event->type = FRAME_DECODED;
70 decode_event->media_type = VIDEO_EVENT; 70 decode_event->media_type = VIDEO_EVENT;
71 decode_event->rtp_timestamp = 200u; 71 decode_event->rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(200));
72 decode_event->frame_id = 1u; 72 decode_event->frame_id = 1u;
73 cast_environment_->logger()->DispatchFrameEvent(std::move(decode_event)); 73 cast_environment_->logger()->DispatchFrameEvent(std::move(decode_event));
74 74
75 scoped_ptr<PacketEvent> receive_event(new PacketEvent()); 75 scoped_ptr<PacketEvent> receive_event(new PacketEvent());
76 receive_event->timestamp = testing_clock_->NowTicks(); 76 receive_event->timestamp = testing_clock_->NowTicks();
77 receive_event->type = PACKET_RECEIVED; 77 receive_event->type = PACKET_RECEIVED;
78 receive_event->media_type = VIDEO_EVENT; 78 receive_event->media_type = VIDEO_EVENT;
79 receive_event->rtp_timestamp = 200u; 79 receive_event->rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(200));
80 receive_event->frame_id = 2u; 80 receive_event->frame_id = 2u;
81 receive_event->packet_id = 1u; 81 receive_event->packet_id = 1u;
82 receive_event->max_packet_id = 10u; 82 receive_event->max_packet_id = 10u;
83 receive_event->size = 1024u; 83 receive_event->size = 1024u;
84 cast_environment_->logger()->DispatchPacketEvent(std::move(receive_event)); 84 cast_environment_->logger()->DispatchPacketEvent(std::move(receive_event));
85 85
86 // Audio events 86 // Audio events
87 playout_event.reset(new FrameEvent()); 87 playout_event.reset(new FrameEvent());
88 playout_event->timestamp = testing_clock_->NowTicks(); 88 playout_event->timestamp = testing_clock_->NowTicks();
89 playout_event->type = FRAME_PLAYOUT; 89 playout_event->type = FRAME_PLAYOUT;
90 playout_event->media_type = AUDIO_EVENT; 90 playout_event->media_type = AUDIO_EVENT;
91 playout_event->rtp_timestamp = 300u; 91 playout_event->rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(300));
92 playout_event->frame_id = 4u; 92 playout_event->frame_id = 4u;
93 playout_event->delay_delta = base::TimeDelta::FromMilliseconds(kDelayMs); 93 playout_event->delay_delta = base::TimeDelta::FromMilliseconds(kDelayMs);
94 cast_environment_->logger()->DispatchFrameEvent(std::move(playout_event)); 94 cast_environment_->logger()->DispatchFrameEvent(std::move(playout_event));
95 95
96 decode_event.reset(new FrameEvent()); 96 decode_event.reset(new FrameEvent());
97 decode_event->timestamp = testing_clock_->NowTicks(); 97 decode_event->timestamp = testing_clock_->NowTicks();
98 decode_event->type = FRAME_DECODED; 98 decode_event->type = FRAME_DECODED;
99 decode_event->media_type = AUDIO_EVENT; 99 decode_event->media_type = AUDIO_EVENT;
100 decode_event->rtp_timestamp = 400u; 100 decode_event->rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(400));
101 decode_event->frame_id = 3u; 101 decode_event->frame_id = 3u;
102 cast_environment_->logger()->DispatchFrameEvent(std::move(decode_event)); 102 cast_environment_->logger()->DispatchFrameEvent(std::move(decode_event));
103 103
104 receive_event.reset(new PacketEvent()); 104 receive_event.reset(new PacketEvent());
105 receive_event->timestamp = testing_clock_->NowTicks(); 105 receive_event->timestamp = testing_clock_->NowTicks();
106 receive_event->type = PACKET_RECEIVED; 106 receive_event->type = PACKET_RECEIVED;
107 receive_event->media_type = AUDIO_EVENT; 107 receive_event->media_type = AUDIO_EVENT;
108 receive_event->rtp_timestamp = 400u; 108 receive_event->rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(400));
109 receive_event->frame_id = 5u; 109 receive_event->frame_id = 5u;
110 receive_event->packet_id = 1u; 110 receive_event->packet_id = 1u;
111 receive_event->max_packet_id = 10u; 111 receive_event->max_packet_id = 10u;
112 receive_event->size = 128u; 112 receive_event->size = 128u;
113 cast_environment_->logger()->DispatchPacketEvent(std::move(receive_event)); 113 cast_environment_->logger()->DispatchPacketEvent(std::move(receive_event));
114 114
115 // Unrelated events 115 // Unrelated events
116 scoped_ptr<FrameEvent> encode_event(new FrameEvent()); 116 scoped_ptr<FrameEvent> encode_event(new FrameEvent());
117 encode_event->timestamp = testing_clock_->NowTicks(); 117 encode_event->timestamp = testing_clock_->NowTicks();
118 encode_event->type = FRAME_ENCODED; 118 encode_event->type = FRAME_ENCODED;
119 encode_event->media_type = VIDEO_EVENT; 119 encode_event->media_type = VIDEO_EVENT;
120 encode_event->rtp_timestamp = 100u; 120 encode_event->rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(100));
121 encode_event->frame_id = 1u; 121 encode_event->frame_id = 1u;
122 cast_environment_->logger()->DispatchFrameEvent(std::move(encode_event)); 122 cast_environment_->logger()->DispatchFrameEvent(std::move(encode_event));
123 123
124 encode_event.reset(new FrameEvent()); 124 encode_event.reset(new FrameEvent());
125 encode_event->timestamp = testing_clock_->NowTicks(); 125 encode_event->timestamp = testing_clock_->NowTicks();
126 encode_event->type = FRAME_ENCODED; 126 encode_event->type = FRAME_ENCODED;
127 encode_event->media_type = AUDIO_EVENT; 127 encode_event->media_type = AUDIO_EVENT;
128 encode_event->rtp_timestamp = 100u; 128 encode_event->rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(100));
129 encode_event->frame_id = 1u; 129 encode_event->frame_id = 1u;
130 cast_environment_->logger()->DispatchFrameEvent(std::move(encode_event)); 130 cast_environment_->logger()->DispatchFrameEvent(std::move(encode_event));
131 } 131 }
132 132
133 base::SimpleTestTickClock* testing_clock_; // Owned by CastEnvironment. 133 base::SimpleTestTickClock* testing_clock_; // Owned by CastEnvironment.
134 scoped_refptr<test::FakeSingleThreadTaskRunner> task_runner_; 134 scoped_refptr<test::FakeSingleThreadTaskRunner> task_runner_;
135 scoped_refptr<CastEnvironment> cast_environment_; 135 scoped_refptr<CastEnvironment> cast_environment_;
136 scoped_ptr<ReceiverRtcpEventSubscriber> event_subscriber_; 136 scoped_ptr<ReceiverRtcpEventSubscriber> event_subscriber_;
137 }; 137 };
138 138
(...skipping 16 matching lines...) Expand all
155 } 155 }
156 156
157 TEST_F(ReceiverRtcpEventSubscriberTest, DropEventsWhenSizeExceeded) { 157 TEST_F(ReceiverRtcpEventSubscriberTest, DropEventsWhenSizeExceeded) {
158 Init(VIDEO_EVENT); 158 Init(VIDEO_EVENT);
159 159
160 for (uint32_t i = 1u; i <= 10u; ++i) { 160 for (uint32_t i = 1u; i <= 10u; ++i) {
161 scoped_ptr<FrameEvent> decode_event(new FrameEvent()); 161 scoped_ptr<FrameEvent> decode_event(new FrameEvent());
162 decode_event->timestamp = testing_clock_->NowTicks(); 162 decode_event->timestamp = testing_clock_->NowTicks();
163 decode_event->type = FRAME_DECODED; 163 decode_event->type = FRAME_DECODED;
164 decode_event->media_type = VIDEO_EVENT; 164 decode_event->media_type = VIDEO_EVENT;
165 decode_event->rtp_timestamp = i * 10; 165 decode_event->rtp_timestamp = RtpTimeTicks().Expand(i * 10);
166 decode_event->frame_id = i; 166 decode_event->frame_id = i;
167 cast_environment_->logger()->DispatchFrameEvent(std::move(decode_event)); 167 cast_environment_->logger()->DispatchFrameEvent(std::move(decode_event));
168 } 168 }
169 169
170 ReceiverRtcpEventSubscriber::RtcpEvents rtcp_events; 170 ReceiverRtcpEventSubscriber::RtcpEvents rtcp_events;
171 event_subscriber_->GetRtcpEventsWithRedundancy(&rtcp_events); 171 event_subscriber_->GetRtcpEventsWithRedundancy(&rtcp_events);
172 EXPECT_EQ(10u, rtcp_events.size()); 172 EXPECT_EQ(10u, rtcp_events.size());
173 } 173 }
174 174
175 } // namespace cast 175 } // namespace cast
176 } // namespace media 176 } // namespace media
OLDNEW
« no previous file with comments | « media/cast/net/rtcp/receiver_rtcp_event_subscriber.cc ('k') | media/cast/net/rtcp/rtcp.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698