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

Unified Diff: remoting/protocol/webrtc_connection_to_host.h

Issue 2371323007: Add audio support in WebrtcConnectionToHost, audio unittest (Closed)
Patch Set: more reliable test Created 4 years, 2 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_audio_sink_adapter.cc ('k') | remoting/protocol/webrtc_connection_to_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_host.h
diff --git a/remoting/protocol/webrtc_connection_to_host.h b/remoting/protocol/webrtc_connection_to_host.h
index 06a22d9bea39251da6c563fd7e2d205769db6883..d803b94f52543a195f84624dc2fd2fe8f93d605a 100644
--- a/remoting/protocol/webrtc_connection_to_host.h
+++ b/remoting/protocol/webrtc_connection_to_host.h
@@ -24,6 +24,7 @@ class ClientControlDispatcher;
class ClientEventDispatcher;
class SessionConfig;
class WebrtcVideoRendererAdapter;
+class WebrtcAudioSinkAdapter;
class WebrtcConnectionToHost : public ConnectionToHost,
public Session::EventHandler,
@@ -39,7 +40,7 @@ class WebrtcConnectionToHost : public ConnectionToHost,
void set_video_renderer(VideoRenderer* video_renderer) override;
void InitializeAudio(
scoped_refptr<base::SingleThreadTaskRunner> audio_decode_task_runner,
- base::WeakPtr<AudioStub> audio_stub) override;
+ base::WeakPtr<AudioStub> audio_consumer) override;
void Connect(std::unique_ptr<Session> session,
scoped_refptr<TransportContext> transport_context,
HostEventCallback* event_callback) override;
@@ -83,9 +84,12 @@ class WebrtcConnectionToHost : public ConnectionToHost,
HostEventCallback* event_callback_ = nullptr;
+ scoped_refptr<base::SingleThreadTaskRunner> audio_decode_task_runner_;
+
// Stub for incoming messages.
ClientStub* client_stub_ = nullptr;
VideoRenderer* video_renderer_ = nullptr;
+ base::WeakPtr<AudioStub> audio_consumer_;
ClipboardStub* clipboard_stub_ = nullptr;
std::unique_ptr<Session> session_;
@@ -97,12 +101,12 @@ class WebrtcConnectionToHost : public ConnectionToHost,
InputFilter event_forwarder_;
std::unique_ptr<WebrtcVideoRendererAdapter> video_adapter_;
+ std::unique_ptr<WebrtcAudioSinkAdapter> audio_adapter_;
// Internal state of the connection.
State state_ = INITIALIZING;
ErrorCode error_ = OK;
- private:
DISALLOW_COPY_AND_ASSIGN(WebrtcConnectionToHost);
};
« no previous file with comments | « remoting/protocol/webrtc_audio_sink_adapter.cc ('k') | remoting/protocol/webrtc_connection_to_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698