| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "remoting/host/client_session.h" | 5 #include "remoting/host/client_session.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/message_loop/message_loop_proxy.h" | 9 #include "base/message_loop/message_loop_proxy.h" |
| 10 #include "remoting/base/capabilities.h" | 10 #include "remoting/base/capabilities.h" |
| (...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 443 | 443 |
| 444 // TODO(sergeyu): Move this to SessionManager? | 444 // TODO(sergeyu): Move this to SessionManager? |
| 445 // static | 445 // static |
| 446 scoped_ptr<VideoEncoder> ClientSession::CreateVideoEncoder( | 446 scoped_ptr<VideoEncoder> ClientSession::CreateVideoEncoder( |
| 447 const protocol::SessionConfig& config) { | 447 const protocol::SessionConfig& config) { |
| 448 const protocol::ChannelConfig& video_config = config.video_config(); | 448 const protocol::ChannelConfig& video_config = config.video_config(); |
| 449 | 449 |
| 450 if (video_config.codec == protocol::ChannelConfig::CODEC_VP8) { | 450 if (video_config.codec == protocol::ChannelConfig::CODEC_VP8) { |
| 451 return remoting::VideoEncoderVpx::CreateForVP8().PassAs<VideoEncoder>(); | 451 return remoting::VideoEncoderVpx::CreateForVP8().PassAs<VideoEncoder>(); |
| 452 } else if (video_config.codec == protocol::ChannelConfig::CODEC_VP9) { | 452 } else if (video_config.codec == protocol::ChannelConfig::CODEC_VP9) { |
| 453 return remoting::VideoEncoderVpx::CreateForVP9().PassAs<VideoEncoder>(); | 453 return remoting::VideoEncoderVpx::CreateForVP9I420().PassAs<VideoEncoder>(); |
| 454 } | 454 } |
| 455 | 455 |
| 456 NOTREACHED(); | 456 NOTREACHED(); |
| 457 return scoped_ptr<VideoEncoder>(); | 457 return scoped_ptr<VideoEncoder>(); |
| 458 } | 458 } |
| 459 | 459 |
| 460 // static | 460 // static |
| 461 scoped_ptr<AudioEncoder> ClientSession::CreateAudioEncoder( | 461 scoped_ptr<AudioEncoder> ClientSession::CreateAudioEncoder( |
| 462 const protocol::SessionConfig& config) { | 462 const protocol::SessionConfig& config) { |
| 463 const protocol::ChannelConfig& audio_config = config.audio_config(); | 463 const protocol::ChannelConfig& audio_config = config.audio_config(); |
| 464 | 464 |
| 465 if (audio_config.codec == protocol::ChannelConfig::CODEC_VERBATIM) { | 465 if (audio_config.codec == protocol::ChannelConfig::CODEC_VERBATIM) { |
| 466 return scoped_ptr<AudioEncoder>(new AudioEncoderVerbatim()); | 466 return scoped_ptr<AudioEncoder>(new AudioEncoderVerbatim()); |
| 467 } else if (audio_config.codec == protocol::ChannelConfig::CODEC_OPUS) { | 467 } else if (audio_config.codec == protocol::ChannelConfig::CODEC_OPUS) { |
| 468 return scoped_ptr<AudioEncoder>(new AudioEncoderOpus()); | 468 return scoped_ptr<AudioEncoder>(new AudioEncoderOpus()); |
| 469 } | 469 } |
| 470 | 470 |
| 471 NOTREACHED(); | 471 NOTREACHED(); |
| 472 return scoped_ptr<AudioEncoder>(); | 472 return scoped_ptr<AudioEncoder>(); |
| 473 } | 473 } |
| 474 | 474 |
| 475 } // namespace remoting | 475 } // namespace remoting |
| OLD | NEW |