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

Side by Side Diff: webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h

Issue 1721353002: Replace scoped_ptr with unique_ptr in webrtc/modules/video_coding/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 10 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 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 10
11 #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_UNITTEST_H_ 11 #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_UNITTEST_H_
12 #define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_UNITTEST_H_ 12 #define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_UNITTEST_H_
13 13
14 #include <algorithm> 14 #include <algorithm>
15 #include <memory>
15 #include <vector> 16 #include <vector>
16 17
17 #include "webrtc/base/checks.h" 18 #include "webrtc/base/checks.h"
18 #include "webrtc/base/scoped_ptr.h"
19 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" 19 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
20 #include "webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h" 20 #include "webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h"
21 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" 21 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
22 #include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" 22 #include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h"
23 #include "webrtc/video_frame.h" 23 #include "webrtc/video_frame.h"
24 24
25 #include "gtest/gtest.h" 25 #include "gtest/gtest.h"
26 26
27 using ::testing::_; 27 using ::testing::_;
28 using ::testing::AllOf; 28 using ::testing::AllOf;
(...skipping 908 matching lines...) Expand 10 before | Expand all | Expand 10 after
937 it != configured_bitrate.end(); ++it) { 937 it != configured_bitrate.end(); ++it) {
938 if (stream == 0) { 938 if (stream == 0) {
939 EXPECT_EQ(min_bitrate, *it); 939 EXPECT_EQ(min_bitrate, *it);
940 } else { 940 } else {
941 EXPECT_EQ(0u, *it); 941 EXPECT_EQ(0u, *it);
942 } 942 }
943 ++stream; 943 ++stream;
944 } 944 }
945 } 945 }
946 946
947 rtc::scoped_ptr<VP8Encoder> encoder_; 947 std::unique_ptr<VP8Encoder> encoder_;
948 MockEncodedImageCallback encoder_callback_; 948 MockEncodedImageCallback encoder_callback_;
949 rtc::scoped_ptr<VP8Decoder> decoder_; 949 std::unique_ptr<VP8Decoder> decoder_;
950 MockDecodedImageCallback decoder_callback_; 950 MockDecodedImageCallback decoder_callback_;
951 VideoCodec settings_; 951 VideoCodec settings_;
952 VideoFrame input_frame_; 952 VideoFrame input_frame_;
953 }; 953 };
954 954
955 } // namespace testing 955 } // namespace testing
956 } // namespace webrtc 956 } // namespace webrtc
957 957
958 #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_UNITTEST_H_ 958 #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_UNITTEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698