OLD | NEW |
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 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "remoting/base/util.h" | 11 #include "remoting/base/util.h" |
12 #include "remoting/proto/video.pb.h" | 12 #include "remoting/proto/video.pb.h" |
13 #include "third_party/libyuv/include/libyuv/convert_argb.h" | 13 #include "third_party/libyuv/include/libyuv/convert_argb.h" |
14 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h" | 14 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h" |
15 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" | 15 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" |
16 #include "third_party/webrtc/modules/desktop_capture/desktop_region.h" | 16 #include "third_party/webrtc/modules/desktop_capture/desktop_region.h" |
17 | 17 |
18 extern "C" { | 18 extern "C" { |
19 #define VPX_CODEC_DISABLE_COMPAT 1 | 19 #define VPX_CODEC_DISABLE_COMPAT 1 |
20 #include "third_party/libvpx_new/source/libvpx/vpx/vp8dx.h" | 20 #include "third_party/libvpx/source/libvpx/vpx/vp8dx.h" |
21 #include "third_party/libvpx_new/source/libvpx/vpx/vpx_decoder.h" | 21 #include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h" |
22 } | 22 } |
23 | 23 |
24 namespace remoting { | 24 namespace remoting { |
25 | 25 |
26 namespace { | 26 namespace { |
27 | 27 |
28 void RenderRect(vpx_image_t* image, | 28 void RenderRect(vpx_image_t* image, |
29 webrtc::DesktopRect rect, | 29 webrtc::DesktopRect rect, |
30 webrtc::DesktopFrame* frame) { | 30 webrtc::DesktopFrame* frame) { |
31 switch (image->fmt) { | 31 switch (image->fmt) { |
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
145 | 145 |
146 vpx_codec_dec_cfg config; | 146 vpx_codec_dec_cfg config; |
147 config.w = 0; | 147 config.w = 0; |
148 config.h = 0; | 148 config.h = 0; |
149 config.threads = 2; | 149 config.threads = 2; |
150 vpx_codec_err_t ret = vpx_codec_dec_init(codec_.get(), codec, &config, 0); | 150 vpx_codec_err_t ret = vpx_codec_dec_init(codec_.get(), codec, &config, 0); |
151 CHECK_EQ(VPX_CODEC_OK, ret); | 151 CHECK_EQ(VPX_CODEC_OK, ret); |
152 } | 152 } |
153 | 153 |
154 } // namespace remoting | 154 } // namespace remoting |
OLD | NEW |