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 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 | 10 |
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
209 last_image_->planes[2] + uv_offset, | 209 last_image_->planes[2] + uv_offset, |
210 image_buffer, | 210 image_buffer, |
211 source_rect.width(), | 211 source_rect.width(), |
212 source_rect.height(), | 212 source_rect.height(), |
213 clip_area.width(), | 213 clip_area.width(), |
214 clip_area.height(), | 214 clip_area.height(), |
215 last_image_->stride[0], | 215 last_image_->stride[0], |
216 last_image_->stride[1], | 216 last_image_->stride[1], |
217 image_stride, | 217 image_stride, |
218 media::YV12, | 218 media::YV12, |
| 219 media::MPEG, |
219 media::ROTATE_0, | 220 media::ROTATE_0, |
220 media::FILTER_BILINEAR); | 221 media::FILTER_BILINEAR); |
221 | 222 |
222 output_region->AddRect(clip_area); | 223 output_region->AddRect(clip_area); |
223 updated_region_.Subtract(source_rect); | 224 updated_region_.Subtract(source_rect); |
224 return; | 225 return; |
225 } | 226 } |
226 | 227 |
227 for (webrtc::DesktopRegion::Iterator i(updated_region_); | 228 for (webrtc::DesktopRegion::Iterator i(updated_region_); |
228 !i.IsAtEnd(); i.Advance()) { | 229 !i.IsAtEnd(); i.Advance()) { |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
300 webrtc::DesktopRegion difference = *new_desktop_shape; | 301 webrtc::DesktopRegion difference = *new_desktop_shape; |
301 difference.Subtract(desktop_shape_); | 302 difference.Subtract(desktop_shape_); |
302 updated_region_.AddRegion(difference); | 303 updated_region_.AddRegion(difference); |
303 updated_region_.IntersectWith(*new_desktop_shape); | 304 updated_region_.IntersectWith(*new_desktop_shape); |
304 | 305 |
305 // Set the new desktop shape region. | 306 // Set the new desktop shape region. |
306 desktop_shape_.Swap(new_desktop_shape); | 307 desktop_shape_.Swap(new_desktop_shape); |
307 } | 308 } |
308 | 309 |
309 } // namespace remoting | 310 } // namespace remoting |
OLD | NEW |