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

Side by Side Diff: media/cast/sender/video_sender_unittest.cc

Issue 506683002: Remove implicit conversions from scoped_refptr to T* in media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
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 <stdint.h> 5 #include <stdint.h>
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 virtual int64 GetBytesSent() OVERRIDE { 83 virtual int64 GetBytesSent() OVERRIDE {
84 return 0; 84 return 0;
85 } 85 }
86 86
87 int number_of_rtp_packets() const { return number_of_rtp_packets_; } 87 int number_of_rtp_packets() const { return number_of_rtp_packets_; }
88 88
89 int number_of_rtcp_packets() const { return number_of_rtcp_packets_; } 89 int number_of_rtcp_packets() const { return number_of_rtcp_packets_; }
90 90
91 void SetPause(bool paused) { 91 void SetPause(bool paused) {
92 paused_ = paused; 92 paused_ = paused;
93 if (!paused && stored_packet_) { 93 if (!paused && stored_packet_.get()) {
94 SendPacket(stored_packet_, callback_); 94 SendPacket(stored_packet_, callback_);
95 callback_.Run(); 95 callback_.Run();
96 } 96 }
97 } 97 }
98 98
99 private: 99 private:
100 int number_of_rtp_packets_; 100 int number_of_rtp_packets_;
101 int number_of_rtcp_packets_; 101 int number_of_rtcp_packets_;
102 bool paused_; 102 bool paused_;
103 base::Closure callback_; 103 base::Closure callback_;
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 transport_sender_.get())); 196 transport_sender_.get()));
197 } 197 }
198 ASSERT_EQ(STATUS_VIDEO_INITIALIZED, video_sender_->InitializationResult()); 198 ASSERT_EQ(STATUS_VIDEO_INITIALIZED, video_sender_->InitializationResult());
199 } 199 }
200 200
201 scoped_refptr<media::VideoFrame> GetNewVideoFrame() { 201 scoped_refptr<media::VideoFrame> GetNewVideoFrame() {
202 gfx::Size size(kWidth, kHeight); 202 gfx::Size size(kWidth, kHeight);
203 scoped_refptr<media::VideoFrame> video_frame = 203 scoped_refptr<media::VideoFrame> video_frame =
204 media::VideoFrame::CreateFrame( 204 media::VideoFrame::CreateFrame(
205 VideoFrame::I420, size, gfx::Rect(size), size, base::TimeDelta()); 205 VideoFrame::I420, size, gfx::Rect(size), size, base::TimeDelta());
206 PopulateVideoFrame(video_frame, last_pixel_value_++); 206 PopulateVideoFrame(video_frame.get(), last_pixel_value_++);
207 return video_frame; 207 return video_frame;
208 } 208 }
209 209
210 scoped_refptr<media::VideoFrame> GetLargeNewVideoFrame() { 210 scoped_refptr<media::VideoFrame> GetLargeNewVideoFrame() {
211 gfx::Size size(kWidth, kHeight); 211 gfx::Size size(kWidth, kHeight);
212 scoped_refptr<media::VideoFrame> video_frame = 212 scoped_refptr<media::VideoFrame> video_frame =
213 media::VideoFrame::CreateFrame( 213 media::VideoFrame::CreateFrame(
214 VideoFrame::I420, size, gfx::Rect(size), size, base::TimeDelta()); 214 VideoFrame::I420, size, gfx::Rect(size), size, base::TimeDelta());
215 PopulateVideoFrameWithNoise(video_frame); 215 PopulateVideoFrameWithNoise(video_frame.get());
216 return video_frame; 216 return video_frame;
217 } 217 }
218 218
219 void RunTasks(int during_ms) { 219 void RunTasks(int during_ms) {
220 task_runner_->Sleep(base::TimeDelta::FromMilliseconds(during_ms)); 220 task_runner_->Sleep(base::TimeDelta::FromMilliseconds(during_ms));
221 } 221 }
222 222
223 base::SimpleTestTickClock* testing_clock_; // Owned by CastEnvironment. 223 base::SimpleTestTickClock* testing_clock_; // Owned by CastEnvironment.
224 TestPacketSender transport_; 224 TestPacketSender transport_;
225 scoped_ptr<CastTransportSenderImpl> transport_sender_; 225 scoped_ptr<CastTransportSenderImpl> transport_sender_;
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 cast_feedback.ack_frame_id = 0; 501 cast_feedback.ack_frame_id = 0;
502 video_sender_->OnReceivedCastFeedback(cast_feedback); 502 video_sender_->OnReceivedCastFeedback(cast_feedback);
503 503
504 transport_.SetPause(false); 504 transport_.SetPause(false);
505 RunTasks(33); 505 RunTasks(33);
506 EXPECT_EQ(0, transport_.number_of_rtp_packets()); 506 EXPECT_EQ(0, transport_.number_of_rtp_packets());
507 } 507 }
508 508
509 } // namespace cast 509 } // namespace cast
510 } // namespace media 510 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698