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

Side by Side Diff: webrtc/api/videotrack_unittest.cc

Issue 1930463002: Replace scoped_ptr with unique_ptr in webrtc/api/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 7 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/api/videocapturertracksource_unittest.cc ('k') | webrtc/api/webrtcsdp.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 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 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 <memory>
11 #include <string> 12 #include <string>
12 13
13 #include "webrtc/api/test/fakevideotrackrenderer.h" 14 #include "webrtc/api/test/fakevideotrackrenderer.h"
14 #include "webrtc/api/videocapturertracksource.h" 15 #include "webrtc/api/videocapturertracksource.h"
15 #include "webrtc/api/videotrack.h" 16 #include "webrtc/api/videotrack.h"
16 #include "webrtc/base/gunit.h" 17 #include "webrtc/base/gunit.h"
17 #include "webrtc/base/scoped_ptr.h"
18 #include "webrtc/media/base/fakevideocapturer.h" 18 #include "webrtc/media/base/fakevideocapturer.h"
19 #include "webrtc/media/base/fakemediaengine.h" 19 #include "webrtc/media/base/fakemediaengine.h"
20 #include "webrtc/media/engine/webrtcvideoframe.h" 20 #include "webrtc/media/engine/webrtcvideoframe.h"
21 21
22 using webrtc::FakeVideoTrackRenderer; 22 using webrtc::FakeVideoTrackRenderer;
23 using webrtc::MediaSourceInterface; 23 using webrtc::MediaSourceInterface;
24 using webrtc::MediaStreamTrackInterface; 24 using webrtc::MediaStreamTrackInterface;
25 using webrtc::VideoTrackSource; 25 using webrtc::VideoTrackSource;
26 using webrtc::VideoTrack; 26 using webrtc::VideoTrack;
27 using webrtc::VideoTrackInterface; 27 using webrtc::VideoTrackInterface;
(...skipping 20 matching lines...) Expand all
48 TEST_F(VideoTrackTest, SourceStateChangeTrackState) { 48 TEST_F(VideoTrackTest, SourceStateChangeTrackState) {
49 EXPECT_EQ(MediaStreamTrackInterface::kLive, video_track_->state()); 49 EXPECT_EQ(MediaStreamTrackInterface::kLive, video_track_->state());
50 video_track_source_->SetState(MediaSourceInterface::kEnded); 50 video_track_source_->SetState(MediaSourceInterface::kEnded);
51 EXPECT_EQ(MediaStreamTrackInterface::kEnded, video_track_->state()); 51 EXPECT_EQ(MediaStreamTrackInterface::kEnded, video_track_->state());
52 } 52 }
53 53
54 // Test adding renderers to a video track and render to them by providing 54 // Test adding renderers to a video track and render to them by providing
55 // frames to the source. 55 // frames to the source.
56 TEST_F(VideoTrackTest, RenderVideo) { 56 TEST_F(VideoTrackTest, RenderVideo) {
57 // FakeVideoTrackRenderer register itself to |video_track_| 57 // FakeVideoTrackRenderer register itself to |video_track_|
58 rtc::scoped_ptr<FakeVideoTrackRenderer> renderer_1( 58 std::unique_ptr<FakeVideoTrackRenderer> renderer_1(
59 new FakeVideoTrackRenderer(video_track_.get())); 59 new FakeVideoTrackRenderer(video_track_.get()));
60 60
61 capturer_.CaptureFrame(); 61 capturer_.CaptureFrame();
62 EXPECT_EQ(1, renderer_1->num_rendered_frames()); 62 EXPECT_EQ(1, renderer_1->num_rendered_frames());
63 63
64 // FakeVideoTrackRenderer register itself to |video_track_| 64 // FakeVideoTrackRenderer register itself to |video_track_|
65 rtc::scoped_ptr<FakeVideoTrackRenderer> renderer_2( 65 std::unique_ptr<FakeVideoTrackRenderer> renderer_2(
66 new FakeVideoTrackRenderer(video_track_.get())); 66 new FakeVideoTrackRenderer(video_track_.get()));
67 capturer_.CaptureFrame(); 67 capturer_.CaptureFrame();
68 EXPECT_EQ(2, renderer_1->num_rendered_frames()); 68 EXPECT_EQ(2, renderer_1->num_rendered_frames());
69 EXPECT_EQ(1, renderer_2->num_rendered_frames()); 69 EXPECT_EQ(1, renderer_2->num_rendered_frames());
70 70
71 renderer_1.reset(nullptr); 71 renderer_1.reset(nullptr);
72 capturer_.CaptureFrame(); 72 capturer_.CaptureFrame();
73 EXPECT_EQ(2, renderer_2->num_rendered_frames()); 73 EXPECT_EQ(2, renderer_2->num_rendered_frames());
74 } 74 }
75 75
76 // Test that disabling the track results in blacked out frames. 76 // Test that disabling the track results in blacked out frames.
77 TEST_F(VideoTrackTest, DisableTrackBlackout) { 77 TEST_F(VideoTrackTest, DisableTrackBlackout) {
78 rtc::scoped_ptr<FakeVideoTrackRenderer> renderer( 78 std::unique_ptr<FakeVideoTrackRenderer> renderer(
79 new FakeVideoTrackRenderer(video_track_.get())); 79 new FakeVideoTrackRenderer(video_track_.get()));
80 80
81 capturer_.CaptureFrame(); 81 capturer_.CaptureFrame();
82 EXPECT_EQ(1, renderer->num_rendered_frames()); 82 EXPECT_EQ(1, renderer->num_rendered_frames());
83 EXPECT_FALSE(renderer->black_frame()); 83 EXPECT_FALSE(renderer->black_frame());
84 84
85 video_track_->set_enabled(false); 85 video_track_->set_enabled(false);
86 capturer_.CaptureFrame(); 86 capturer_.CaptureFrame();
87 EXPECT_EQ(2, renderer->num_rendered_frames()); 87 EXPECT_EQ(2, renderer->num_rendered_frames());
88 EXPECT_TRUE(renderer->black_frame()); 88 EXPECT_TRUE(renderer->black_frame());
89 89
90 video_track_->set_enabled(true); 90 video_track_->set_enabled(true);
91 capturer_.CaptureFrame(); 91 capturer_.CaptureFrame();
92 EXPECT_EQ(3, renderer->num_rendered_frames()); 92 EXPECT_EQ(3, renderer->num_rendered_frames());
93 EXPECT_FALSE(renderer->black_frame()); 93 EXPECT_FALSE(renderer->black_frame());
94 } 94 }
OLDNEW
« no previous file with comments | « webrtc/api/videocapturertracksource_unittest.cc ('k') | webrtc/api/webrtcsdp.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698