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

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: Fixed nits 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
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/cast/cast_defines.h" 10 #include "media/cast/cast_defines.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 94
95 virtual ~VideoEncoderTest() {} 95 virtual ~VideoEncoderTest() {}
96 96
97 virtual void SetUp() { 97 virtual void SetUp() {
98 task_runner_ = new test::FakeTaskRunner(&testing_clock_); 98 task_runner_ = new test::FakeTaskRunner(&testing_clock_);
99 cast_environment_ = new CastEnvironment(&testing_clock_, task_runner_, 99 cast_environment_ = new CastEnvironment(&testing_clock_, task_runner_,
100 task_runner_, task_runner_, task_runner_, task_runner_); 100 task_runner_, task_runner_, task_runner_, task_runner_);
101 } 101 }
102 102
103 void Configure(uint8 max_unacked_frames) { 103 void Configure(uint8 max_unacked_frames) {
104 video_encoder_= new VideoEncoder(cast_environment_, video_config_, 104 video_encoder_.reset(new VideoEncoder(cast_environment_, video_config_,
105 max_unacked_frames); 105 max_unacked_frames));
106 video_encoder_controller_ = video_encoder_.get(); 106 video_encoder_controller_ = video_encoder_.get();
107 } 107 }
108 108
109 base::SimpleTestTickClock testing_clock_; 109 base::SimpleTestTickClock testing_clock_;
110 std::vector<uint8> pixels_; 110 std::vector<uint8> pixels_;
111 scoped_refptr<TestVideoEncoderCallback> test_video_encoder_callback_; 111 scoped_refptr<TestVideoEncoderCallback> test_video_encoder_callback_;
112 VideoSenderConfig video_config_; 112 VideoSenderConfig video_config_;
113 scoped_refptr<test::FakeTaskRunner> task_runner_; 113 scoped_refptr<test::FakeTaskRunner> task_runner_;
114 scoped_refptr<VideoEncoder> video_encoder_; 114 scoped_ptr<VideoEncoder> video_encoder_;
115 VideoEncoderController* video_encoder_controller_; 115 VideoEncoderController* video_encoder_controller_;
116 I420VideoFrame video_frame_; 116 I420VideoFrame video_frame_;
117 117
118 scoped_refptr<CastEnvironment> cast_environment_; 118 scoped_refptr<CastEnvironment> cast_environment_;
119 }; 119 };
120 120
121 TEST_F(VideoEncoderTest, EncodePattern30fpsRunningOutOfAck) { 121 TEST_F(VideoEncoderTest, EncodePattern30fpsRunningOutOfAck) {
122 Configure(3); 122 Configure(3);
123 123
124 VideoEncoder::FrameEncodedCallback frame_encoded_callback = 124 VideoEncoder::FrameEncodedCallback frame_encoded_callback =
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 for (int i = 5; i < 17; ++i) { 248 for (int i = 5; i < 17; ++i) {
249 test_video_encoder_callback_->SetExpectedResult(false, i, 4, capture_time); 249 test_video_encoder_callback_->SetExpectedResult(false, i, 4, capture_time);
250 EXPECT_TRUE(video_encoder_->EncodeVideoFrame(&video_frame_, capture_time, 250 EXPECT_TRUE(video_encoder_->EncodeVideoFrame(&video_frame_, capture_time,
251 frame_encoded_callback, base::Bind(ReleaseFrame, &video_frame_))); 251 frame_encoded_callback, base::Bind(ReleaseFrame, &video_frame_)));
252 task_runner_->RunTasks(); 252 task_runner_->RunTasks();
253 } 253 }
254 } 254 }
255 255
256 } // namespace cast 256 } // namespace cast
257 } // namespace media 257 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698