OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_vp8.h" | 5 #include "remoting/codec/video_decoder_vp8.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 "media/base/media.h" | 10 #include "media/base/media.h" |
11 #include "media/base/yuv_convert.h" | 11 #include "media/base/yuv_convert.h" |
12 #include "remoting/base/util.h" | 12 #include "remoting/base/util.h" |
13 | 13 |
14 extern "C" { | 14 extern "C" { |
15 #define VPX_CODEC_DISABLE_COMPAT 1 | 15 #define VPX_CODEC_DISABLE_COMPAT 1 |
16 #include "third_party/libvpx/libvpx.h" | 16 #include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h" |
| 17 #include "third_party/libvpx/source/libvpx/vpx/vp8dx.h" |
17 } | 18 } |
18 | 19 |
19 namespace remoting { | 20 namespace remoting { |
20 | 21 |
21 VideoDecoderVp8::VideoDecoderVp8() | 22 VideoDecoderVp8::VideoDecoderVp8() |
22 : state_(kUninitialized), | 23 : state_(kUninitialized), |
23 codec_(NULL), | 24 codec_(NULL), |
24 last_image_(NULL), | 25 last_image_(NULL), |
25 screen_size_(SkISize::Make(0, 0)) { | 26 screen_size_(SkISize::Make(0, 0)) { |
26 } | 27 } |
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
203 rect); | 204 rect); |
204 | 205 |
205 output_region->op(rect, SkRegion::kUnion_Op); | 206 output_region->op(rect, SkRegion::kUnion_Op); |
206 } | 207 } |
207 | 208 |
208 updated_region_.op(ScaleRect(clip_area, view_size, screen_size_), | 209 updated_region_.op(ScaleRect(clip_area, view_size, screen_size_), |
209 SkRegion::kDifference_Op); | 210 SkRegion::kDifference_Op); |
210 } | 211 } |
211 | 212 |
212 } // namespace remoting | 213 } // namespace remoting |
OLD | NEW |