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

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

Issue 2979493003: Revert: Change VideoTrack implementation to invoke VideoTrackSourceInterface::AddOrUpdateSink on wt (Closed)
Patch Set: Created 3 years, 5 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/pc/videotrack.cc ('k') | no next file » | 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
(...skipping 13 matching lines...) Expand all
24 using webrtc::VideoTrackSource; 24 using webrtc::VideoTrackSource;
25 using webrtc::VideoTrack; 25 using webrtc::VideoTrack;
26 using webrtc::VideoTrackInterface; 26 using webrtc::VideoTrackInterface;
27 27
28 class VideoTrackTest : public testing::Test { 28 class VideoTrackTest : public testing::Test {
29 public: 29 public:
30 VideoTrackTest() { 30 VideoTrackTest() {
31 static const char kVideoTrackId[] = "track_id"; 31 static const char kVideoTrackId[] = "track_id";
32 video_track_source_ = new rtc::RefCountedObject<VideoTrackSource>( 32 video_track_source_ = new rtc::RefCountedObject<VideoTrackSource>(
33 &capturer_, true /* remote */); 33 &capturer_, true /* remote */);
34 video_track_ = VideoTrack::Create(kVideoTrackId, video_track_source_, 34 video_track_ = VideoTrack::Create(kVideoTrackId, video_track_source_);
35 rtc::Thread::Current());
36 capturer_.Start( 35 capturer_.Start(
37 cricket::VideoFormat(640, 480, cricket::VideoFormat::FpsToInterval(30), 36 cricket::VideoFormat(640, 480, cricket::VideoFormat::FpsToInterval(30),
38 cricket::FOURCC_I420)); 37 cricket::FOURCC_I420));
39 } 38 }
40 39
41 protected: 40 protected:
42 cricket::FakeVideoCapturer capturer_; 41 cricket::FakeVideoCapturer capturer_;
43 rtc::scoped_refptr<VideoTrackSource> video_track_source_; 42 rtc::scoped_refptr<VideoTrackSource> video_track_source_;
44 rtc::scoped_refptr<VideoTrackInterface> video_track_; 43 rtc::scoped_refptr<VideoTrackInterface> video_track_;
45 }; 44 };
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 video_track_->set_enabled(false); 84 video_track_->set_enabled(false);
86 capturer_.CaptureFrame(); 85 capturer_.CaptureFrame();
87 EXPECT_EQ(2, renderer->num_rendered_frames()); 86 EXPECT_EQ(2, renderer->num_rendered_frames());
88 EXPECT_TRUE(renderer->black_frame()); 87 EXPECT_TRUE(renderer->black_frame());
89 88
90 video_track_->set_enabled(true); 89 video_track_->set_enabled(true);
91 capturer_.CaptureFrame(); 90 capturer_.CaptureFrame();
92 EXPECT_EQ(3, renderer->num_rendered_frames()); 91 EXPECT_EQ(3, renderer->num_rendered_frames());
93 EXPECT_FALSE(renderer->black_frame()); 92 EXPECT_FALSE(renderer->black_frame());
94 } 93 }
OLDNEW
« no previous file with comments | « webrtc/pc/videotrack.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698