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

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

Issue 623263003: replace OVERRIDE and FINAL with override and final in media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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/sender/video_encoder_impl.h ('k') | media/cast/sender/video_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 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 <vector> 5 #include <vector>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "media/base/video_frame.h" 10 #include "media/base/video_frame.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 video_config_ = GetDefaultVideoSenderConfig(); 79 video_config_ = GetDefaultVideoSenderConfig();
80 video_config_.codec = CODEC_VIDEO_VP8; 80 video_config_.codec = CODEC_VIDEO_VP8;
81 gfx::Size size(video_config_.width, video_config_.height); 81 gfx::Size size(video_config_.width, video_config_.height);
82 video_frame_ = media::VideoFrame::CreateFrame( 82 video_frame_ = media::VideoFrame::CreateFrame(
83 VideoFrame::I420, size, gfx::Rect(size), size, base::TimeDelta()); 83 VideoFrame::I420, size, gfx::Rect(size), size, base::TimeDelta());
84 PopulateVideoFrame(video_frame_.get(), 123); 84 PopulateVideoFrame(video_frame_.get(), 123);
85 } 85 }
86 86
87 virtual ~VideoEncoderImplTest() {} 87 virtual ~VideoEncoderImplTest() {}
88 88
89 virtual void SetUp() OVERRIDE { 89 virtual void SetUp() override {
90 testing_clock_ = new base::SimpleTestTickClock(); 90 testing_clock_ = new base::SimpleTestTickClock();
91 testing_clock_->Advance(base::TimeTicks::Now() - base::TimeTicks()); 91 testing_clock_->Advance(base::TimeTicks::Now() - base::TimeTicks());
92 task_runner_ = new test::FakeSingleThreadTaskRunner(testing_clock_); 92 task_runner_ = new test::FakeSingleThreadTaskRunner(testing_clock_);
93 cast_environment_ = 93 cast_environment_ =
94 new CastEnvironment(scoped_ptr<base::TickClock>(testing_clock_).Pass(), 94 new CastEnvironment(scoped_ptr<base::TickClock>(testing_clock_).Pass(),
95 task_runner_, 95 task_runner_,
96 task_runner_, 96 task_runner_,
97 task_runner_); 97 task_runner_);
98 } 98 }
99 99
100 virtual void TearDown() OVERRIDE { 100 virtual void TearDown() override {
101 video_encoder_.reset(); 101 video_encoder_.reset();
102 task_runner_->RunTasks(); 102 task_runner_->RunTasks();
103 } 103 }
104 104
105 void CreateEncoder() { 105 void CreateEncoder() {
106 test_video_encoder_callback_ = new TestVideoEncoderCallback( 106 test_video_encoder_callback_ = new TestVideoEncoderCallback(
107 video_config_.max_number_of_video_buffers_used != 1); 107 video_config_.max_number_of_video_buffers_used != 1);
108 video_encoder_.reset(new VideoEncoderImpl( 108 video_encoder_.reset(new VideoEncoderImpl(
109 cast_environment_, video_config_, 109 cast_environment_, video_config_,
110 0 /* useless arg to be removed in later change */)); 110 0 /* useless arg to be removed in later change */));
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 EXPECT_TRUE(video_encoder_->EncodeVideoFrame( 191 EXPECT_TRUE(video_encoder_->EncodeVideoFrame(
192 video_frame_, testing_clock_->NowTicks(), frame_encoded_callback)); 192 video_frame_, testing_clock_->NowTicks(), frame_encoded_callback));
193 task_runner_->RunTasks(); 193 task_runner_->RunTasks();
194 } 194 }
195 195
196 EXPECT_EQ(10, test_video_encoder_callback_->count_frames_delivered()); 196 EXPECT_EQ(10, test_video_encoder_callback_->count_frames_delivered());
197 } 197 }
198 198
199 } // namespace cast 199 } // namespace cast
200 } // namespace media 200 } // namespace media
OLDNEW
« no previous file with comments | « media/cast/sender/video_encoder_impl.h ('k') | media/cast/sender/video_sender.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698