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

Unified Diff: content/renderer/media/webrtc/peer_connection_dependency_factory.cc

Issue 1995553002: Remove WebRtc audio source references for local audio tracks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert unintentional change 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/webrtc/peer_connection_dependency_factory.cc
diff --git a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
index 2c7bb074127a115c10a96ffa9b455f81d904a0b0..76888542d541a9f9822318f4247ea3107da0788c 100644
--- a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
+++ b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
@@ -181,6 +181,8 @@ void PeerConnectionDependencyFactory::CreatePeerConnectionFactory() {
jingle_glue::JingleThreadWrapper::EnsureForCurrentMessageLoop();
jingle_glue::JingleThreadWrapper::current()->set_send_allowed(true);
+ EnsureWebRtcAudioDeviceImpl();
+
CHECK(chrome_signaling_thread_.Start());
CHECK(chrome_worker_thread_.Start());
@@ -232,8 +234,6 @@ void PeerConnectionDependencyFactory::InitializeSignalingThread(
jingle_glue::JingleThreadWrapper::current()->set_send_allowed(true);
signaling_thread_ = jingle_glue::JingleThreadWrapper::current();
- EnsureWebRtcAudioDeviceImpl();
-
socket_factory_.reset(
new IpcPacketSocketFactory(p2p_socket_dispatcher_.get()));
@@ -423,14 +423,6 @@ PeerConnectionDependencyFactory::CreateLocalMediaStream(
return GetPcFactory()->CreateLocalMediaStream(label).get();
}
-scoped_refptr<webrtc::AudioSourceInterface>
-PeerConnectionDependencyFactory::CreateLocalAudioSource(
- const cricket::AudioOptions& options) {
- scoped_refptr<webrtc::AudioSourceInterface> source =
- GetPcFactory()->CreateAudioSource(options).get();
- return source;
-}
-
scoped_refptr<webrtc::VideoTrackInterface>
PeerConnectionDependencyFactory::CreateLocalVideoTrack(
const std::string& id,
@@ -481,6 +473,8 @@ void PeerConnectionDependencyFactory::StopRtcEventLog() {
WebRtcAudioDeviceImpl*
PeerConnectionDependencyFactory::GetWebRtcAudioDevice() {
+ DCHECK(CalledOnValidThread());
+ EnsureWebRtcAudioDeviceImpl();
return audio_device_.get();
}
@@ -590,6 +584,7 @@ PeerConnectionDependencyFactory::GetWebRtcSignalingThread() const {
}
void PeerConnectionDependencyFactory::EnsureWebRtcAudioDeviceImpl() {
+ DCHECK(CalledOnValidThread());
if (audio_device_.get())
return;

Powered by Google App Engine
This is Rietveld 408576698