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

Unified Diff: remoting/protocol/webrtc_connection_to_client.cc

Issue 2254673002: Remove dependency on AudioStub in ConnectionToClient (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: win Created 4 years, 3 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
« no previous file with comments | « remoting/protocol/webrtc_connection_to_client.h ('k') | remoting/test/it2me_standalone_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/webrtc_connection_to_client.cc
diff --git a/remoting/protocol/webrtc_connection_to_client.cc b/remoting/protocol/webrtc_connection_to_client.cc
index 92430d6d0d0df94171d73760c6e6ed3cd79ca07d..bb7fa3cb74deed6172060cbb355e135ea6f6d07c 100644
--- a/remoting/protocol/webrtc_connection_to_client.cc
+++ b/remoting/protocol/webrtc_connection_to_client.cc
@@ -12,7 +12,8 @@
#include "net/base/io_buffer.h"
#include "remoting/codec/video_encoder.h"
#include "remoting/codec/webrtc_video_encoder_vpx.h"
-#include "remoting/protocol/audio_writer.h"
+#include "remoting/protocol/audio_source.h"
+#include "remoting/protocol/audio_stream.h"
#include "remoting/protocol/clipboard_stub.h"
#include "remoting/protocol/host_control_dispatcher.h"
#include "remoting/protocol/host_event_dispatcher.h"
@@ -89,8 +90,9 @@ std::unique_ptr<VideoStream> WebrtcConnectionToClient::StartVideoStream(
return std::move(stream);
}
-AudioStub* WebrtcConnectionToClient::audio_stub() {
- DCHECK(thread_checker_.CalledOnValidThread());
+std::unique_ptr<AudioStream> WebrtcConnectionToClient::StartAudioStream(
+ std::unique_ptr<AudioSource> audio_source) {
+ NOTIMPLEMENTED();
return nullptr;
}
@@ -139,7 +141,7 @@ void WebrtcConnectionToClient::OnSessionStateChange(Session::State state) {
// OnConnectionAuthenticated() call above may result in the connection
// being torn down.
if (self)
- event_handler_->CreateVideoStreams(this);
+ event_handler_->CreateMediaStreams(this);
break;
}
« no previous file with comments | « remoting/protocol/webrtc_connection_to_client.h ('k') | remoting/test/it2me_standalone_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698