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

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

Issue 74133002: Cast: Removed unnecessary ref counters. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge TOT 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
« no previous file with comments | « media/cast/video_sender/video_encoder.cc ('k') | media/cast/video_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 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/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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 virtual ~VideoEncoderTest() {} 85 virtual ~VideoEncoderTest() {}
86 86
87 virtual void SetUp() { 87 virtual void SetUp() {
88 task_runner_ = new test::FakeTaskRunner(&testing_clock_); 88 task_runner_ = new test::FakeTaskRunner(&testing_clock_);
89 cast_environment_ = new CastEnvironment(&testing_clock_, task_runner_, 89 cast_environment_ = new CastEnvironment(&testing_clock_, task_runner_,
90 task_runner_, task_runner_, task_runner_, task_runner_, 90 task_runner_, task_runner_, task_runner_, task_runner_,
91 GetDefaultCastLoggingConfig()); 91 GetDefaultCastLoggingConfig());
92 } 92 }
93 93
94 void Configure(uint8 max_unacked_frames) { 94 void Configure(uint8 max_unacked_frames) {
95 video_encoder_= new VideoEncoder(cast_environment_, video_config_, 95 video_encoder_.reset(new VideoEncoder(cast_environment_, video_config_,
96 max_unacked_frames); 96 max_unacked_frames));
97 video_encoder_controller_ = video_encoder_.get(); 97 video_encoder_controller_ = video_encoder_.get();
98 } 98 }
99 99
100 base::SimpleTestTickClock testing_clock_; 100 base::SimpleTestTickClock testing_clock_;
101 scoped_refptr<TestVideoEncoderCallback> test_video_encoder_callback_; 101 scoped_refptr<TestVideoEncoderCallback> test_video_encoder_callback_;
102 VideoSenderConfig video_config_; 102 VideoSenderConfig video_config_;
103 scoped_refptr<test::FakeTaskRunner> task_runner_; 103 scoped_refptr<test::FakeTaskRunner> task_runner_;
104 scoped_refptr<VideoEncoder> video_encoder_; 104 scoped_ptr<VideoEncoder> video_encoder_;
105 VideoEncoderController* video_encoder_controller_; 105 VideoEncoderController* video_encoder_controller_;
106 scoped_refptr<media::VideoFrame> video_frame_; 106 scoped_refptr<media::VideoFrame> video_frame_;
107 107
108 scoped_refptr<CastEnvironment> cast_environment_; 108 scoped_refptr<CastEnvironment> cast_environment_;
109 }; 109 };
110 110
111 TEST_F(VideoEncoderTest, EncodePattern30fpsRunningOutOfAck) { 111 TEST_F(VideoEncoderTest, EncodePattern30fpsRunningOutOfAck) {
112 Configure(3); 112 Configure(3);
113 113
114 VideoEncoder::FrameEncodedCallback frame_encoded_callback = 114 VideoEncoder::FrameEncodedCallback frame_encoded_callback =
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 for (int i = 5; i < 17; ++i) { 238 for (int i = 5; i < 17; ++i) {
239 test_video_encoder_callback_->SetExpectedResult(false, i, 4, capture_time); 239 test_video_encoder_callback_->SetExpectedResult(false, i, 4, capture_time);
240 EXPECT_TRUE(video_encoder_->EncodeVideoFrame(video_frame_, capture_time, 240 EXPECT_TRUE(video_encoder_->EncodeVideoFrame(video_frame_, capture_time,
241 frame_encoded_callback, base::Bind(base::DoNothing))); 241 frame_encoded_callback, base::Bind(base::DoNothing)));
242 task_runner_->RunTasks(); 242 task_runner_->RunTasks();
243 } 243 }
244 } 244 }
245 245
246 } // namespace cast 246 } // namespace cast
247 } // namespace media 247 } // namespace media
OLDNEW
« no previous file with comments | « media/cast/video_sender/video_encoder.cc ('k') | media/cast/video_sender/video_sender.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698