OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/base/decoder_vp8.h" | 5 #include "remoting/base/decoder_vp8.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "media/base/media.h" | 8 #include "media/base/media.h" |
9 #include "media/base/yuv_convert.h" | 9 #include "media/base/yuv_convert.h" |
10 #include "remoting/base/util.h" | 10 #include "remoting/base/util.h" |
11 | 11 |
12 extern "C" { | 12 extern "C" { |
13 #define VPX_CODEC_DISABLE_COMPAT 1 | 13 #define VPX_CODEC_DISABLE_COMPAT 1 |
14 #include "third_party/libvpx/libvpx.h" | 14 #include "third_party/libvpx/libvpx.h" |
15 } | 15 } |
16 | 16 |
17 namespace remoting { | 17 namespace remoting { |
18 | 18 |
19 DecoderVp8::DecoderVp8() | 19 DecoderVp8::DecoderVp8() |
20 : state_(kUninitialized), | 20 : state_(kUninitialized), |
21 codec_(NULL), | 21 codec_(NULL), |
22 last_image_(NULL), | 22 last_image_(NULL), |
| 23 clip_rect_(SkIRect::MakeEmpty()), |
23 horizontal_scale_ratio_(1.0), | 24 horizontal_scale_ratio_(1.0), |
24 vertical_scale_ratio_(1.0) { | 25 vertical_scale_ratio_(1.0) { |
25 } | 26 } |
26 | 27 |
27 DecoderVp8::~DecoderVp8() { | 28 DecoderVp8::~DecoderVp8() { |
28 if (codec_) { | 29 if (codec_) { |
29 vpx_codec_err_t ret = vpx_codec_destroy(codec_); | 30 vpx_codec_err_t ret = vpx_codec_destroy(codec_); |
30 CHECK(ret == VPX_CODEC_OK) << "Failed to destroy codec"; | 31 CHECK(ret == VPX_CODEC_OK) << "Failed to destroy codec"; |
31 } | 32 } |
32 delete codec_; | 33 delete codec_; |
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
226 dest_rect, | 227 dest_rect, |
227 scaled_rect, | 228 scaled_rect, |
228 last_image_->stride[0], | 229 last_image_->stride[0], |
229 last_image_->stride[1], | 230 last_image_->stride[1], |
230 stride); | 231 stride); |
231 output_rects->push_back(scaled_rect); | 232 output_rects->push_back(scaled_rect); |
232 } | 233 } |
233 } | 234 } |
234 | 235 |
235 } // namespace remoting | 236 } // namespace remoting |
OLD | NEW |