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

Side by Side Diff: webrtc/video/video_quality_test.h

Issue 1751903002: Replace scoped_ptr with unique_ptr in webrtc/video/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 9 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 | « webrtc/video/video_capture_input_unittest.cc ('k') | webrtc/video/video_quality_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 #ifndef WEBRTC_VIDEO_VIDEO_QUALITY_TEST_H_ 10 #ifndef WEBRTC_VIDEO_VIDEO_QUALITY_TEST_H_
11 #define WEBRTC_VIDEO_VIDEO_QUALITY_TEST_H_ 11 #define WEBRTC_VIDEO_VIDEO_QUALITY_TEST_H_
12 12
13 #include <memory>
13 #include <string> 14 #include <string>
14 #include <vector> 15 #include <vector>
15 16
16 #include "webrtc/test/call_test.h" 17 #include "webrtc/test/call_test.h"
17 #include "webrtc/test/frame_generator.h" 18 #include "webrtc/test/frame_generator.h"
18 #include "webrtc/test/testsupport/trace_to_stderr.h" 19 #include "webrtc/test/testsupport/trace_to_stderr.h"
19 20
20 namespace webrtc { 21 namespace webrtc {
21 22
22 class VideoQualityTest : public test::CallTest { 23 class VideoQualityTest : public test::CallTest {
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 // Helper static methods. 97 // Helper static methods.
97 static VideoStream DefaultVideoStream(const Params& params); 98 static VideoStream DefaultVideoStream(const Params& params);
98 static std::vector<int> ParseCSV(const std::string& str); 99 static std::vector<int> ParseCSV(const std::string& str);
99 100
100 // Helper methods for setting up the call. 101 // Helper methods for setting up the call.
101 void CreateCapturer(VideoCaptureInput* input); 102 void CreateCapturer(VideoCaptureInput* input);
102 void SetupCommon(Transport* send_transport, Transport* recv_transport); 103 void SetupCommon(Transport* send_transport, Transport* recv_transport);
103 void SetupScreenshare(); 104 void SetupScreenshare();
104 105
105 // We need a more general capturer than the FrameGeneratorCapturer. 106 // We need a more general capturer than the FrameGeneratorCapturer.
106 rtc::scoped_ptr<test::VideoCapturer> capturer_; 107 std::unique_ptr<test::VideoCapturer> capturer_;
107 rtc::scoped_ptr<test::TraceToStderr> trace_to_stderr_; 108 std::unique_ptr<test::TraceToStderr> trace_to_stderr_;
108 rtc::scoped_ptr<test::FrameGenerator> frame_generator_; 109 std::unique_ptr<test::FrameGenerator> frame_generator_;
109 rtc::scoped_ptr<VideoEncoder> encoder_; 110 std::unique_ptr<VideoEncoder> encoder_;
110 VideoCodecUnion codec_settings_; 111 VideoCodecUnion codec_settings_;
111 Clock* const clock_; 112 Clock* const clock_;
112 113
113 Params params_; 114 Params params_;
114 }; 115 };
115 116
116 } // namespace webrtc 117 } // namespace webrtc
117 118
118 #endif // WEBRTC_VIDEO_VIDEO_QUALITY_TEST_H_ 119 #endif // WEBRTC_VIDEO_VIDEO_QUALITY_TEST_H_
OLDNEW
« no previous file with comments | « webrtc/video/video_capture_input_unittest.cc ('k') | webrtc/video/video_quality_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698