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

Side by Side Diff: source/libvpx/vpx_scale/generic/yv12config.c

Issue 478033002: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved. 2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 * vpx_img_set_rect(). */ 74 * vpx_img_set_rect(). */
75 if (border & 0x1f) 75 if (border & 0x1f)
76 return -3; 76 return -3;
77 77
78 ybf->y_crop_width = width; 78 ybf->y_crop_width = width;
79 ybf->y_crop_height = height; 79 ybf->y_crop_height = height;
80 ybf->y_width = aligned_width; 80 ybf->y_width = aligned_width;
81 ybf->y_height = aligned_height; 81 ybf->y_height = aligned_height;
82 ybf->y_stride = y_stride; 82 ybf->y_stride = y_stride;
83 83
84 ybf->uv_crop_width = (width + 1) / 2;
85 ybf->uv_crop_height = (height + 1) / 2;
84 ybf->uv_width = uv_width; 86 ybf->uv_width = uv_width;
85 ybf->uv_height = uv_height; 87 ybf->uv_height = uv_height;
86 ybf->uv_stride = uv_stride; 88 ybf->uv_stride = uv_stride;
87 89
88 ybf->alpha_width = 0; 90 ybf->alpha_width = 0;
89 ybf->alpha_height = 0; 91 ybf->alpha_height = 0;
90 ybf->alpha_stride = 0; 92 ybf->alpha_stride = 0;
91 93
92 ybf->border = border; 94 ybf->border = border;
93 ybf->frame_size = frame_size; 95 ybf->frame_size = frame_size;
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 int width, int height, 254 int width, int height,
253 int ss_x, int ss_y, int border) { 255 int ss_x, int ss_y, int border) {
254 if (ybf) { 256 if (ybf) {
255 vp9_free_frame_buffer(ybf); 257 vp9_free_frame_buffer(ybf);
256 return vp9_realloc_frame_buffer(ybf, width, height, ss_x, ss_y, border, 258 return vp9_realloc_frame_buffer(ybf, width, height, ss_x, ss_y, border,
257 NULL, NULL, NULL); 259 NULL, NULL, NULL);
258 } 260 }
259 return -2; 261 return -2;
260 } 262 }
261 #endif 263 #endif
OLDNEW
« no previous file with comments | « source/libvpx/vpx_scale/arm/neon/yv12extend_arm.c ('k') | source/libvpx/vpx_scale/generic/yv12extend.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698