From a43cfae9c2ead7b9b14882101f2264a785f17f41 Mon Sep 17 00:00:00 2001 From: "wez@chromium.org" Date: Sat, 19 Oct 2013 22:14:54 +0000 Subject: 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 --- remoting/client/rectangle_update_decoder.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'remoting/client/rectangle_update_decoder.cc') 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; } -- cgit v1.1