Chromium Code Reviews| 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..6d4756d4536955d8a098c7131405c60f6bd0eb40 100644 |
| --- a/remoting/protocol/webrtc_connection_to_client.cc |
| +++ b/remoting/protocol/webrtc_connection_to_client.cc |
| @@ -11,7 +11,6 @@ |
| #include "jingle/glue/thread_wrapper.h" |
| #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/clipboard_stub.h" |
| #include "remoting/protocol/host_control_dispatcher.h" |
| @@ -79,11 +78,9 @@ void WebrtcConnectionToClient::OnInputEventReceived(int64_t timestamp) { |
| std::unique_ptr<VideoStream> WebrtcConnectionToClient::StartVideoStream( |
| std::unique_ptr<webrtc::DesktopCapturer> desktop_capturer) { |
| // TODO(isheriff): make this codec independent |
|
Irfan
2016/09/12 21:34:24
comment goes away ?
Sergey Ulanov
2016/09/12 22:50:02
Moved to WebrtcVideoStream::Start().
|
| - std::unique_ptr<VideoEncoder> video_encoder = |
| - WebrtcVideoEncoderVpx::CreateForVP8(); |
| std::unique_ptr<WebrtcVideoStream> stream(new WebrtcVideoStream()); |
| if (!stream->Start(std::move(desktop_capturer), transport_.get(), |
| - video_encode_task_runner_, std::move(video_encoder))) { |
| + video_encode_task_runner_)) { |
| return nullptr; |
| } |
| return std::move(stream); |