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

Side by Side Diff: remoting/host/client_session.cc

Issue 28183002: Add VP9 encode support to the remoting host. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 6 years, 10 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « remoting/codec/video_encoder_vpx_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
422 } 422 }
423 423
424 // TODO(sergeyu): Move this to SessionManager? 424 // TODO(sergeyu): Move this to SessionManager?
425 // static 425 // static
426 scoped_ptr<VideoEncoder> ClientSession::CreateVideoEncoder( 426 scoped_ptr<VideoEncoder> ClientSession::CreateVideoEncoder(
427 const protocol::SessionConfig& config) { 427 const protocol::SessionConfig& config) {
428 const protocol::ChannelConfig& video_config = config.video_config(); 428 const protocol::ChannelConfig& video_config = config.video_config();
429 429
430 if (video_config.codec == protocol::ChannelConfig::CODEC_VP8) { 430 if (video_config.codec == protocol::ChannelConfig::CODEC_VP8) {
431 return remoting::VideoEncoderVpx::CreateForVP8().PassAs<VideoEncoder>(); 431 return remoting::VideoEncoderVpx::CreateForVP8().PassAs<VideoEncoder>();
432 } else if (video_config.codec == protocol::ChannelConfig::CODEC_VP9) {
433 return remoting::VideoEncoderVpx::CreateForVP9().PassAs<VideoEncoder>();
432 } 434 }
433 435
434 NOTREACHED(); 436 NOTREACHED();
435 return scoped_ptr<VideoEncoder>(); 437 return scoped_ptr<VideoEncoder>();
436 } 438 }
437 439
438 // static 440 // static
439 scoped_ptr<AudioEncoder> ClientSession::CreateAudioEncoder( 441 scoped_ptr<AudioEncoder> ClientSession::CreateAudioEncoder(
440 const protocol::SessionConfig& config) { 442 const protocol::SessionConfig& config) {
441 const protocol::ChannelConfig& audio_config = config.audio_config(); 443 const protocol::ChannelConfig& audio_config = config.audio_config();
442 444
443 if (audio_config.codec == protocol::ChannelConfig::CODEC_VERBATIM) { 445 if (audio_config.codec == protocol::ChannelConfig::CODEC_VERBATIM) {
444 return scoped_ptr<AudioEncoder>(new AudioEncoderVerbatim()); 446 return scoped_ptr<AudioEncoder>(new AudioEncoderVerbatim());
445 } else if (audio_config.codec == protocol::ChannelConfig::CODEC_OPUS) { 447 } else if (audio_config.codec == protocol::ChannelConfig::CODEC_OPUS) {
446 return scoped_ptr<AudioEncoder>(new AudioEncoderOpus()); 448 return scoped_ptr<AudioEncoder>(new AudioEncoderOpus());
447 } 449 }
448 450
449 NOTREACHED(); 451 NOTREACHED();
450 return scoped_ptr<AudioEncoder>(); 452 return scoped_ptr<AudioEncoder>();
451 } 453 }
452 454
453 } // namespace remoting 455 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/codec/video_encoder_vpx_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698