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

Side by Side Diff: webrtc/modules/video_coding/codecs/vp9/screenshare_layers_unittest.cc

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) 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 10
11 #include <limits> 11 #include <limits>
12 #include <memory>
12 13
13 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
14 #include "vpx/vp8cx.h" 15 #include "vpx/vp8cx.h"
15 #include "webrtc/base/logging.h" 16 #include "webrtc/base/logging.h"
16 #include "webrtc/modules/video_coding/codecs/vp9/screenshare_layers.h" 17 #include "webrtc/modules/video_coding/codecs/vp9/screenshare_layers.h"
17 #include "webrtc/modules/video_coding/codecs/vp9/vp9_impl.h" 18 #include "webrtc/modules/video_coding/codecs/vp9/vp9_impl.h"
18 #include "webrtc/system_wrappers/include/clock.h" 19 #include "webrtc/system_wrappers/include/clock.h"
19 20
20 namespace webrtc { 21 namespace webrtc {
21 22
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 uint32_t frame_timestamp_ = 75 uint32_t frame_timestamp_ =
75 clock_.TimeInMilliseconds() * (kTickFrequency / 1000); 76 clock_.TimeInMilliseconds() * (kTickFrequency / 1000);
76 Settings actual = 77 Settings actual =
77 layers_->GetSuperFrameSettings(frame_timestamp_, expected_.is_keyframe); 78 layers_->GetSuperFrameSettings(frame_timestamp_, expected_.is_keyframe);
78 EqualRefs(actual); 79 EqualRefs(actual);
79 EqualStartStopKeyframe(actual); 80 EqualStartStopKeyframe(actual);
80 } 81 }
81 82
82 Settings expected_; 83 Settings expected_;
83 SimulatedClock clock_; 84 SimulatedClock clock_;
84 rtc::scoped_ptr<ScreenshareLayersVP9> layers_; 85 std::unique_ptr<ScreenshareLayersVP9> layers_;
85 }; 86 };
86 87
87 TEST_F(ScreenshareLayerTestVP9, NoRefsOnKeyFrame) { 88 TEST_F(ScreenshareLayerTestVP9, NoRefsOnKeyFrame) {
88 const int kNumLayers = kMaxVp9NumberOfSpatialLayers; 89 const int kNumLayers = kMaxVp9NumberOfSpatialLayers;
89 InitScreenshareLayers(kNumLayers); 90 InitScreenshareLayers(kNumLayers);
90 expected_.start_layer = 0; 91 expected_.start_layer = 0;
91 expected_.stop_layer = kNumLayers - 1; 92 expected_.stop_layer = kNumLayers - 1;
92 93
93 for (int l = 0; l < kNumLayers; ++l) { 94 for (int l = 0; l < kNumLayers; ++l) {
94 expected_.layer[l].upd_buf = l; 95 expected_.layer[l].upd_buf = l;
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 EqualToExpected(); 315 EqualToExpected();
315 AddKilobitsToLayer(200, 0); 316 AddKilobitsToLayer(200, 0);
316 317
317 // Wrap 318 // Wrap
318 expected_.start_layer = 1; 319 expected_.start_layer = 1;
319 AdvanceTime(1); 320 AdvanceTime(1);
320 EqualToExpected(); 321 EqualToExpected();
321 } 322 }
322 323
323 } // namespace webrtc 324 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_coding/codecs/vp8/vp8_sequence_coder.cc ('k') | webrtc/modules/video_coding/codecs/vp9/vp9_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698