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/client/rectangle_update_decoder.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/client/rectangle_update_decoder.cc')
| -rw-r--r-- | remoting/client/rectangle_update_decoder.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/remoting/client/rectangle_update_decoder.cc b/remoting/client/rectangle_update_decoder.cc index 3ff2be1..53541b7 100644 --- a/remoting/client/rectangle_update_decoder.cc +++ b/remoting/client/rectangle_update_decoder.cc @@ -11,10 +11,10 @@ #include "base/logging.h" #include "base/single_thread_task_runner.h" #include "remoting/base/util.h" +#include "remoting/client/frame_consumer.h" #include "remoting/codec/video_decoder.h" #include "remoting/codec/video_decoder_verbatim.h" -#include "remoting/codec/video_decoder_vp8.h" -#include "remoting/client/frame_consumer.h" +#include "remoting/codec/video_decoder_vpx.h" #include "remoting/protocol/session_config.h" #include "third_party/libyuv/include/libyuv/convert_argb.h" #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h" @@ -101,7 +101,7 @@ void RectangleUpdateDecoder::Initialize(const SessionConfig& config) { if (codec == ChannelConfig::CODEC_VERBATIM) { decoder_.reset(new VideoDecoderVerbatim()); } else if (codec == ChannelConfig::CODEC_VP8) { - decoder_.reset(new VideoDecoderVp8()); + decoder_ = VideoDecoderVpx::CreateForVP8(); } else { NOTREACHED() << "Invalid Encoding found: " << codec; } |