zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed VideoSource dependency to ChannelManager.

Browse Source 
Instead VideoSource directly access the cricket::VideoCapturer via the worker_thread.

Document: https://docs.google.com/a/google.com/document/d/1mEIw_0uDzyHjL3l8a82WKp6AvgR8Tlwn9JGvhbUjVpY/edit?usp=sharing

BUG=webrtc:5426
R=nisse@webrtc.org, pthatcher@webrtc.org

Review URL: https://codereview.webrtc.org/1759473003 .

Cr-Commit-Position: refs/heads/master@{#11852}
This commit is contained in:
Per
2016-03-03 09:22:28 +01:00
parent a2abdf2fbe
commit 0f13ec1265
6 changed files with 63 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
webrtc/api/videosource_unittest.cc
View File

@ -19,7 +19,6 @@
#include "webrtc/media/base/fakevideocapturer.h"
#include "webrtc/media/base/fakevideorenderer.h"
#include "webrtc/media/engine/webrtcvideoframe.h"
#include "webrtc/pc/channelmanager.h"
using webrtc::FakeConstraints;
using webrtc::VideoSource;
@ -111,9 +110,7 @@ class StateObserver : public ObserverInterface {
class VideoSourceTest : public testing::Test {
protected:
VideoSourceTest()
: channel_manager_(new cricket::ChannelManager(
new cricket::FakeMediaEngine(), rtc::Thread::Current())) {
VideoSourceTest() {
InitCapturer(false);
}
void InitCapturer(bool is_screencast) {
@ -124,10 +121,6 @@ class VideoSourceTest : public testing::Test {
void InitScreencast() { InitCapturer(true); }
void SetUp() {
ASSERT_TRUE(channel_manager_->Init());
}
void CreateVideoSource() {
CreateVideoSource(NULL);
}
@ -136,7 +129,7 @@ class VideoSourceTest : public testing::Test {
const webrtc::MediaConstraintsInterface* constraints) {
// VideoSource take ownership of |capturer_|
source_ =
VideoSource::Create(channel_manager_.get(), capturer_cleanup_.release(),
VideoSource::Create(rtc::Thread::Current(), capturer_cleanup_.release(),
constraints, false);
ASSERT_TRUE(source_.get() != NULL);
@ -150,7 +143,6 @@ class VideoSourceTest : public testing::Test {
rtc::scoped_ptr<TestVideoCapturer> capturer_cleanup_;
TestVideoCapturer* capturer_;
cricket::FakeVideoRenderer renderer_;
rtc::scoped_ptr<cricket::ChannelManager> channel_manager_;
rtc::scoped_ptr<StateObserver> state_observer_;
rtc::scoped_refptr<VideoSource> source_;
};
@ -200,7 +192,7 @@ TEST_F(VideoSourceTest, StopRestart) {
// Test start stop with a remote VideoSource - the video source that has a
// RemoteVideoCapturer and takes video frames from FrameInput.
TEST_F(VideoSourceTest, StartStopRemote) {
source_ = VideoSource::Create(channel_manager_.get(),
source_ = VideoSource::Create(rtc::Thread::Current(),
new webrtc::RemoteVideoCapturer(), NULL, true);
ASSERT_TRUE(source_.get() != NULL);