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

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

Issue 69603002: Incorporating logging into Cast (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Adding scoped_ptr include Created 7 years, 1 month 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/video_sender/video_sender.cc ('k') | no next file » | 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 <vector> 5 #include <vector>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/test/simple_test_tick_clock.h" 9 #include "base/test/simple_test_tick_clock.h"
10 #include "media/cast/cast_environment.h" 10 #include "media/cast/cast_environment.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 video_config, &mock_video_encoder_controller_, &mock_transport_)); 81 video_config, &mock_video_encoder_controller_, &mock_transport_));
82 } else { 82 } else {
83 video_sender_.reset(new PeerVideoSender(cast_environment_, video_config, 83 video_sender_.reset(new PeerVideoSender(cast_environment_, video_config,
84 NULL, &mock_transport_)); 84 NULL, &mock_transport_));
85 } 85 }
86 } 86 }
87 87
88 virtual void SetUp() { 88 virtual void SetUp() {
89 task_runner_ = new test::FakeTaskRunner(&testing_clock_); 89 task_runner_ = new test::FakeTaskRunner(&testing_clock_);
90 cast_environment_ = new CastEnvironment(&testing_clock_, task_runner_, 90 cast_environment_ = new CastEnvironment(&testing_clock_, task_runner_,
91 task_runner_, task_runner_, task_runner_, task_runner_); 91 task_runner_, task_runner_, task_runner_, task_runner_,
92 GetDefaultCastLoggingConfig());
92 } 93 }
93 94
94 I420VideoFrame* AllocateNewVideoFrame() { 95 I420VideoFrame* AllocateNewVideoFrame() {
95 I420VideoFrame* video_frame = new I420VideoFrame(); 96 I420VideoFrame* video_frame = new I420VideoFrame();
96 video_frame->width = 320; 97 video_frame->width = 320;
97 video_frame->height = 240; 98 video_frame->height = 240;
98 99
99 video_frame->y_plane.stride = video_frame->width; 100 video_frame->y_plane.stride = video_frame->width;
100 video_frame->y_plane.length = video_frame->width; 101 video_frame->y_plane.length = video_frame->width;
101 video_frame->y_plane.data = 102 video_frame->y_plane.data =
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 base::TimeDelta::FromMilliseconds(1 + kDefaultRtpMaxDelayMs); 214 base::TimeDelta::FromMilliseconds(1 + kDefaultRtpMaxDelayMs);
214 215
215 // Make sure that we do a re-send. 216 // Make sure that we do a re-send.
216 testing_clock_.Advance(max_resend_timeout); 217 testing_clock_.Advance(max_resend_timeout);
217 task_runner_->RunTasks(); 218 task_runner_->RunTasks();
218 } 219 }
219 220
220 } // namespace cast 221 } // namespace cast
221 } // namespace media 222 } // namespace media
222 223
OLDNEW
« no previous file with comments | « media/cast/video_sender/video_sender.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698