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

Side by Side Diff: remoting/codec/video_decoder_vpx.cc

Issue 1323333002: Copy libvpx from DEPS to src (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update include order and rebase Created 5 years, 3 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
« no previous file with comments | « remoting/codec/scoped_vpx_codec.cc ('k') | remoting/codec/video_encoder_vpx.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/codec/video_decoder_vpx.h" 5 #include "remoting/codec/video_decoder_vpx.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "remoting/base/util.h" 10 #include "remoting/base/util.h"
11 #include "remoting/proto/video.pb.h" 11 #include "remoting/proto/video.pb.h"
12 #include "third_party/libyuv/include/libyuv/convert_argb.h" 12 #include "third_party/libyuv/include/libyuv/convert_argb.h"
13 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h" 13 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
14 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" 14 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
15 #include "third_party/webrtc/modules/desktop_capture/desktop_region.h" 15 #include "third_party/webrtc/modules/desktop_capture/desktop_region.h"
16 16
17 extern "C" { 17 extern "C" {
18 #define VPX_CODEC_DISABLE_COMPAT 1 18 #define VPX_CODEC_DISABLE_COMPAT 1
19 #include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h" 19 #include "third_party/libvpx_new/source/libvpx/vpx/vp8dx.h"
20 #include "third_party/libvpx/source/libvpx/vpx/vp8dx.h" 20 #include "third_party/libvpx_new/source/libvpx/vpx/vpx_decoder.h"
21 } 21 }
22 22
23 namespace remoting { 23 namespace remoting {
24 24
25 namespace { 25 namespace {
26 26
27 void RenderRect(vpx_image_t* image, 27 void RenderRect(vpx_image_t* image,
28 webrtc::DesktopRect rect, 28 webrtc::DesktopRect rect,
29 webrtc::DesktopFrame* frame) { 29 webrtc::DesktopFrame* frame) {
30 switch (image->fmt) { 30 switch (image->fmt) {
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 144
145 vpx_codec_dec_cfg config; 145 vpx_codec_dec_cfg config;
146 config.w = 0; 146 config.w = 0;
147 config.h = 0; 147 config.h = 0;
148 config.threads = 2; 148 config.threads = 2;
149 vpx_codec_err_t ret = vpx_codec_dec_init(codec_.get(), codec, &config, 0); 149 vpx_codec_err_t ret = vpx_codec_dec_init(codec_.get(), codec, &config, 0);
150 CHECK_EQ(VPX_CODEC_OK, ret); 150 CHECK_EQ(VPX_CODEC_OK, ret);
151 } 151 }
152 152
153 } // namespace remoting 153 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/codec/scoped_vpx_codec.cc ('k') | remoting/codec/video_encoder_vpx.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698