diff options
| author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-19 22:14:54 +0000 |
|---|---|---|
| committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-19 22:14:54 +0000 |
| commit | a43cfae9c2ead7b9b14882101f2264a785f17f41 (patch) | |
| tree | 0c715d27bef0304b2a7122ca622238673a34cb1e /remoting/host/client_session.cc | |
| parent | ffd8afd8391366b1a0bdcc849d973dc1e5fee6d9 (diff) | |
| download | chromium_src-a43cfae9c2ead7b9b14882101f2264a785f17f41.zip chromium_src-a43cfae9c2ead7b9b14882101f2264a785f17f41.tar.gz chromium_src-a43cfae9c2ead7b9b14882101f2264a785f17f41.tar.bz2 | |
Move VideoDecoderVp8 to VideoDecoderVpx base that will support VP8/9.
BUG=260879
Review URL: https://codereview.chromium.org/26888009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229624 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/client_session.cc')
| -rw-r--r-- | remoting/host/client_session.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/remoting/host/client_session.cc b/remoting/host/client_session.cc index 67f4a95..1a5e36b 100644 --- a/remoting/host/client_session.cc +++ b/remoting/host/client_session.cc @@ -13,7 +13,7 @@ #include "remoting/codec/audio_encoder_verbatim.h" #include "remoting/codec/video_encoder.h" #include "remoting/codec/video_encoder_verbatim.h" -#include "remoting/codec/video_encoder_vp8.h" +#include "remoting/codec/video_encoder_vpx.h" #include "remoting/host/audio_capturer.h" #include "remoting/host/audio_scheduler.h" #include "remoting/host/desktop_environment.h" @@ -427,7 +427,7 @@ scoped_ptr<VideoEncoder> ClientSession::CreateVideoEncoder( const protocol::ChannelConfig& video_config = config.video_config(); if (video_config.codec == protocol::ChannelConfig::CODEC_VP8) { - return scoped_ptr<VideoEncoder>(new remoting::VideoEncoderVp8()); + return remoting::VideoEncoderVpx::CreateForVP8().PassAs<VideoEncoder>(); } NOTREACHED(); |