81134d019d
In order to do that, the signaling thread is also changed to wrap the current thread unless an external signaling thread thread is specified in the call to CreatePeerConnectionFactory. This cleans up the PeerConnectionFactory and makes sure a user of the API will always access the factory on the signaling thread. Note that both Chrome and the Android implementation use an external signaling thread. R=tommi@webrtc.org Review URL: https://webrtc-codereview.appspot.com/35429004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@8039 4adac7df-926f-26a2-2b94-8c16560cd09d
256 lines
9.5 KiB
C++
256 lines
9.5 KiB
C++
/*
|
|
* libjingle
|
|
* Copyright 2004--2011, Google Inc.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright notice,
|
|
* this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
* this list of conditions and the following disclaimer in the documentation
|
|
* and/or other materials provided with the distribution.
|
|
* 3. The name of the author may not be used to endorse or promote products
|
|
* derived from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
|
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
|
* EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
|
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
|
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
|
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
|
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include "talk/app/webrtc/peerconnectionfactory.h"
|
|
|
|
#include "talk/app/webrtc/audiotrack.h"
|
|
#include "talk/app/webrtc/localaudiosource.h"
|
|
#include "talk/app/webrtc/mediastreamproxy.h"
|
|
#include "talk/app/webrtc/mediastreamtrackproxy.h"
|
|
#include "talk/app/webrtc/peerconnection.h"
|
|
#include "talk/app/webrtc/peerconnectionfactoryproxy.h"
|
|
#include "talk/app/webrtc/peerconnectionproxy.h"
|
|
#include "talk/app/webrtc/portallocatorfactory.h"
|
|
#include "talk/app/webrtc/videosource.h"
|
|
#include "talk/app/webrtc/videosourceproxy.h"
|
|
#include "talk/app/webrtc/videotrack.h"
|
|
#include "talk/media/devices/dummydevicemanager.h"
|
|
#include "talk/media/webrtc/webrtcmediaengine.h"
|
|
#include "talk/media/webrtc/webrtcvideodecoderfactory.h"
|
|
#include "talk/media/webrtc/webrtcvideoencoderfactory.h"
|
|
#include "webrtc/base/bind.h"
|
|
#include "webrtc/modules/audio_device/include/audio_device.h"
|
|
|
|
namespace webrtc {
|
|
|
|
rtc::scoped_refptr<PeerConnectionFactoryInterface>
|
|
CreatePeerConnectionFactory() {
|
|
rtc::scoped_refptr<PeerConnectionFactory> pc_factory(
|
|
new rtc::RefCountedObject<PeerConnectionFactory>());
|
|
|
|
|
|
// Call Initialize synchronously but make sure its executed on
|
|
// |signaling_thread|.
|
|
MethodCall0<PeerConnectionFactory, bool> call(
|
|
pc_factory.get(),
|
|
&PeerConnectionFactory::Initialize);
|
|
bool result = call.Marshal(pc_factory->signaling_thread());
|
|
|
|
if (!result) {
|
|
return NULL;
|
|
}
|
|
return PeerConnectionFactoryProxy::Create(pc_factory->signaling_thread(),
|
|
pc_factory);
|
|
}
|
|
|
|
rtc::scoped_refptr<PeerConnectionFactoryInterface>
|
|
CreatePeerConnectionFactory(
|
|
rtc::Thread* worker_thread,
|
|
rtc::Thread* signaling_thread,
|
|
AudioDeviceModule* default_adm,
|
|
cricket::WebRtcVideoEncoderFactory* encoder_factory,
|
|
cricket::WebRtcVideoDecoderFactory* decoder_factory) {
|
|
rtc::scoped_refptr<PeerConnectionFactory> pc_factory(
|
|
new rtc::RefCountedObject<PeerConnectionFactory>(worker_thread,
|
|
signaling_thread,
|
|
default_adm,
|
|
encoder_factory,
|
|
decoder_factory));
|
|
|
|
// Call Initialize synchronously but make sure its executed on
|
|
// |signaling_thread|.
|
|
MethodCall0<PeerConnectionFactory, bool> call(
|
|
pc_factory.get(),
|
|
&PeerConnectionFactory::Initialize);
|
|
bool result = call.Marshal(signaling_thread);
|
|
|
|
if (!result) {
|
|
return NULL;
|
|
}
|
|
return PeerConnectionFactoryProxy::Create(signaling_thread, pc_factory);
|
|
}
|
|
|
|
PeerConnectionFactory::PeerConnectionFactory()
|
|
: owns_ptrs_(true),
|
|
wraps_current_thread_(false),
|
|
signaling_thread_(rtc::ThreadManager::Instance()->CurrentThread()),
|
|
worker_thread_(new rtc::Thread) {
|
|
if (!signaling_thread_) {
|
|
signaling_thread_ = rtc::ThreadManager::Instance()->WrapCurrentThread();
|
|
wraps_current_thread_ = true;
|
|
}
|
|
worker_thread_->Start();
|
|
}
|
|
|
|
PeerConnectionFactory::PeerConnectionFactory(
|
|
rtc::Thread* worker_thread,
|
|
rtc::Thread* signaling_thread,
|
|
AudioDeviceModule* default_adm,
|
|
cricket::WebRtcVideoEncoderFactory* video_encoder_factory,
|
|
cricket::WebRtcVideoDecoderFactory* video_decoder_factory)
|
|
: owns_ptrs_(false),
|
|
wraps_current_thread_(false),
|
|
signaling_thread_(signaling_thread),
|
|
worker_thread_(worker_thread),
|
|
default_adm_(default_adm),
|
|
video_encoder_factory_(video_encoder_factory),
|
|
video_decoder_factory_(video_decoder_factory) {
|
|
ASSERT(worker_thread != NULL);
|
|
ASSERT(signaling_thread != NULL);
|
|
// TODO: Currently there is no way creating an external adm in
|
|
// libjingle source tree. So we can 't currently assert if this is NULL.
|
|
// ASSERT(default_adm != NULL);
|
|
}
|
|
|
|
PeerConnectionFactory::~PeerConnectionFactory() {
|
|
DCHECK(signaling_thread_->IsCurrent());
|
|
channel_manager_.reset(NULL);
|
|
allocator_factory_ = NULL;
|
|
if (owns_ptrs_) {
|
|
if (wraps_current_thread_)
|
|
rtc::ThreadManager::Instance()->UnwrapCurrentThread();
|
|
delete worker_thread_;
|
|
}
|
|
}
|
|
|
|
bool PeerConnectionFactory::Initialize() {
|
|
DCHECK(signaling_thread_->IsCurrent());
|
|
rtc::InitRandom(rtc::Time());
|
|
|
|
allocator_factory_ = PortAllocatorFactory::Create(worker_thread_);
|
|
if (!allocator_factory_)
|
|
return false;
|
|
|
|
cricket::DummyDeviceManager* device_manager(
|
|
new cricket::DummyDeviceManager());
|
|
// TODO: Need to make sure only one VoE is created inside
|
|
// WebRtcMediaEngine.
|
|
cricket::MediaEngineInterface* media_engine(
|
|
cricket::WebRtcMediaEngineFactory::Create(default_adm_.get(),
|
|
NULL, // No secondary adm.
|
|
video_encoder_factory_.get(),
|
|
video_decoder_factory_.get()));
|
|
|
|
channel_manager_.reset(new cricket::ChannelManager(
|
|
media_engine, device_manager, worker_thread_));
|
|
channel_manager_->SetVideoRtxEnabled(true);
|
|
if (!channel_manager_->Init()) {
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
rtc::scoped_refptr<AudioSourceInterface>
|
|
PeerConnectionFactory::CreateAudioSource(
|
|
const MediaConstraintsInterface* constraints) {
|
|
DCHECK(signaling_thread_->IsCurrent());
|
|
rtc::scoped_refptr<LocalAudioSource> source(
|
|
LocalAudioSource::Create(options_, constraints));
|
|
return source;
|
|
}
|
|
|
|
rtc::scoped_refptr<VideoSourceInterface>
|
|
PeerConnectionFactory::CreateVideoSource(
|
|
cricket::VideoCapturer* capturer,
|
|
const MediaConstraintsInterface* constraints) {
|
|
DCHECK(signaling_thread_->IsCurrent());
|
|
rtc::scoped_refptr<VideoSource> source(
|
|
VideoSource::Create(channel_manager_.get(), capturer, constraints));
|
|
return VideoSourceProxy::Create(signaling_thread_, source);
|
|
}
|
|
|
|
bool PeerConnectionFactory::StartAecDump(rtc::PlatformFile file) {
|
|
DCHECK(signaling_thread_->IsCurrent());
|
|
return channel_manager_->StartAecDump(file);
|
|
}
|
|
|
|
rtc::scoped_refptr<PeerConnectionInterface>
|
|
PeerConnectionFactory::CreatePeerConnection(
|
|
const PeerConnectionInterface::RTCConfiguration& configuration,
|
|
const MediaConstraintsInterface* constraints,
|
|
PortAllocatorFactoryInterface* allocator_factory,
|
|
DTLSIdentityServiceInterface* dtls_identity_service,
|
|
PeerConnectionObserver* observer) {
|
|
DCHECK(signaling_thread_->IsCurrent());
|
|
DCHECK(allocator_factory || allocator_factory_);
|
|
rtc::scoped_refptr<PeerConnection> pc(
|
|
new rtc::RefCountedObject<PeerConnection>(this));
|
|
if (!pc->Initialize(
|
|
configuration,
|
|
constraints,
|
|
allocator_factory ? allocator_factory : allocator_factory_.get(),
|
|
dtls_identity_service,
|
|
observer)) {
|
|
return NULL;
|
|
}
|
|
return PeerConnectionProxy::Create(signaling_thread(), pc);
|
|
}
|
|
|
|
rtc::scoped_refptr<MediaStreamInterface>
|
|
PeerConnectionFactory::CreateLocalMediaStream(const std::string& label) {
|
|
DCHECK(signaling_thread_->IsCurrent());
|
|
return MediaStreamProxy::Create(signaling_thread_,
|
|
MediaStream::Create(label));
|
|
}
|
|
|
|
rtc::scoped_refptr<VideoTrackInterface>
|
|
PeerConnectionFactory::CreateVideoTrack(
|
|
const std::string& id,
|
|
VideoSourceInterface* source) {
|
|
DCHECK(signaling_thread_->IsCurrent());
|
|
rtc::scoped_refptr<VideoTrackInterface> track(
|
|
VideoTrack::Create(id, source));
|
|
return VideoTrackProxy::Create(signaling_thread_, track);
|
|
}
|
|
|
|
rtc::scoped_refptr<AudioTrackInterface>
|
|
PeerConnectionFactory::CreateAudioTrack(const std::string& id,
|
|
AudioSourceInterface* source) {
|
|
DCHECK(signaling_thread_->IsCurrent());
|
|
rtc::scoped_refptr<AudioTrackInterface> track(
|
|
AudioTrack::Create(id, source));
|
|
return AudioTrackProxy::Create(signaling_thread_, track);
|
|
}
|
|
|
|
cricket::ChannelManager* PeerConnectionFactory::channel_manager() {
|
|
DCHECK(signaling_thread_->IsCurrent());
|
|
return channel_manager_.get();
|
|
}
|
|
|
|
rtc::Thread* PeerConnectionFactory::signaling_thread() {
|
|
// This method can be called on a different thread when the factory is
|
|
// created in CreatePeerConnectionFactory().
|
|
return signaling_thread_;
|
|
}
|
|
|
|
rtc::Thread* PeerConnectionFactory::worker_thread() {
|
|
DCHECK(signaling_thread_->IsCurrent());
|
|
return worker_thread_;
|
|
}
|
|
|
|
} // namespace webrtc
|