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

Side by Side Diff: media/cast/rtcp/rtcp_receiver_unittest.cc

Issue 145443005: Fixes for memory and threading issues in cast (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix compile Created 6 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 | Annotate | Revision Log
« no previous file with comments | « media/cast/cast_environment.cc ('k') | media/cast/rtcp/rtcp_sender.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/scoped_ptr.h" 5 #include "base/memory/scoped_ptr.h"
6 #include "base/test/simple_test_tick_clock.h" 6 #include "base/test/simple_test_tick_clock.h"
7 #include "media/cast/cast_environment.h" 7 #include "media/cast/cast_environment.h"
8 #include "media/cast/rtcp/mock_rtcp_receiver_feedback.h" 8 #include "media/cast/rtcp/mock_rtcp_receiver_feedback.h"
9 #include "media/cast/rtcp/mock_rtcp_sender_feedback.h" 9 #include "media/cast/rtcp/mock_rtcp_sender_feedback.h"
10 #include "media/cast/rtcp/rtcp_receiver.h" 10 #include "media/cast/rtcp/rtcp_receiver.h"
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 transport::RtcpSenderLogMessage expected_sender_log_; 146 transport::RtcpSenderLogMessage expected_sender_log_;
147 bool called_on_received_sender_log_; 147 bool called_on_received_sender_log_;
148 bool called_on_received_receiver_log_; 148 bool called_on_received_receiver_log_;
149 }; 149 };
150 150
151 } // namespace 151 } // namespace
152 152
153 class RtcpReceiverTest : public ::testing::Test { 153 class RtcpReceiverTest : public ::testing::Test {
154 protected: 154 protected:
155 RtcpReceiverTest() 155 RtcpReceiverTest()
156 : task_runner_(new test::FakeTaskRunner(&testing_clock_)), 156 : testing_clock_(new base::SimpleTestTickClock()),
157 cast_environment_(new CastEnvironment(&testing_clock_, task_runner_, 157 task_runner_(new test::FakeTaskRunner(testing_clock_)),
158 cast_environment_(new CastEnvironment(
159 scoped_ptr<base::TickClock>(testing_clock_).Pass(), task_runner_,
158 task_runner_, task_runner_, task_runner_, task_runner_, 160 task_runner_, task_runner_, task_runner_, task_runner_,
159 task_runner_, GetDefaultCastReceiverLoggingConfig())), 161 task_runner_, GetDefaultCastReceiverLoggingConfig())),
160 rtcp_receiver_(new RtcpReceiver(cast_environment_, 162 rtcp_receiver_(new RtcpReceiver(cast_environment_,
161 &mock_sender_feedback_, 163 &mock_sender_feedback_,
162 &mock_receiver_feedback_, 164 &mock_receiver_feedback_,
163 &mock_rtt_feedback_, 165 &mock_rtt_feedback_,
164 kSourceSsrc)) { 166 kSourceSsrc)) {
165 } 167 }
166 168
167 virtual ~RtcpReceiverTest() {} 169 virtual ~RtcpReceiverTest() {}
(...skipping 26 matching lines...) Expand all
194 expected_receiver_reference_report_.ntp_seconds = kNtpHigh; 196 expected_receiver_reference_report_.ntp_seconds = kNtpHigh;
195 expected_receiver_reference_report_.ntp_fraction = kNtpLow; 197 expected_receiver_reference_report_.ntp_fraction = kNtpLow;
196 } 198 }
197 199
198 // Injects an RTCP packet into the receiver. 200 // Injects an RTCP packet into the receiver.
199 void InjectRtcpPacket(const uint8* packet, uint16 length) { 201 void InjectRtcpPacket(const uint8* packet, uint16 length) {
200 RtcpParser rtcp_parser(packet, length); 202 RtcpParser rtcp_parser(packet, length);
201 rtcp_receiver_->IncomingRtcpPacket(&rtcp_parser); 203 rtcp_receiver_->IncomingRtcpPacket(&rtcp_parser);
202 } 204 }
203 205
204 base::SimpleTestTickClock testing_clock_; 206 base::SimpleTestTickClock* testing_clock_; // Owned by CastEnvironment.
205 scoped_refptr<test::FakeTaskRunner> task_runner_; 207 scoped_refptr<test::FakeTaskRunner> task_runner_;
206 scoped_refptr<CastEnvironment> cast_environment_; 208 scoped_refptr<CastEnvironment> cast_environment_;
207 MockRtcpReceiverFeedback mock_receiver_feedback_; 209 MockRtcpReceiverFeedback mock_receiver_feedback_;
208 MockRtcpRttFeedback mock_rtt_feedback_; 210 MockRtcpRttFeedback mock_rtt_feedback_;
209 MockRtcpSenderFeedback mock_sender_feedback_; 211 MockRtcpSenderFeedback mock_sender_feedback_;
210 scoped_ptr<RtcpReceiver> rtcp_receiver_; 212 scoped_ptr<RtcpReceiver> rtcp_receiver_;
211 transport::RtcpSenderInfo expected_sender_info_; 213 transport::RtcpSenderInfo expected_sender_info_;
212 transport::RtcpReportBlock expected_report_block_; 214 transport::RtcpReportBlock expected_report_block_;
213 RtcpReceiverReferenceTimeReport expected_receiver_reference_report_; 215 RtcpReceiverReferenceTimeReport expected_receiver_reference_report_;
214 }; 216 };
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 Times(1); 580 Times(1);
579 581
580 RtcpParser rtcp_parser(p.Packet(), p.Length()); 582 RtcpParser rtcp_parser(p.Packet(), p.Length());
581 rtcp_receiver.IncomingRtcpPacket(&rtcp_parser); 583 rtcp_receiver.IncomingRtcpPacket(&rtcp_parser);
582 584
583 EXPECT_TRUE(cast_log_verification.OnReceivedReceiverLogCalled()); 585 EXPECT_TRUE(cast_log_verification.OnReceivedReceiverLogCalled());
584 } 586 }
585 587
586 } // namespace cast 588 } // namespace cast
587 } // namespace media 589 } // namespace media
OLDNEW
« no previous file with comments | « media/cast/cast_environment.cc ('k') | media/cast/rtcp/rtcp_sender.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698