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

Side by Side Diff: source/libvpx/vp9/common/vp9_reconinter.c

Issue 1302353004: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: Created 5 years, 3 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
« no previous file with comments | « source/libvpx/vp9/common/vp9_reconinter.h ('k') | source/libvpx/vp9/common/vp9_reconintra.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 break; 146 break;
147 case 3: 147 case 3:
148 res = mi_mv_pred_q4(mi, ref); 148 res = mi_mv_pred_q4(mi, ref);
149 break; 149 break;
150 default: 150 default:
151 assert(ss_idx <= 3 && ss_idx >= 0); 151 assert(ss_idx <= 3 && ss_idx >= 0);
152 } 152 }
153 return res; 153 return res;
154 } 154 }
155 155
156 void build_inter_predictors(MACROBLOCKD *xd, int plane, int block, 156 static void build_inter_predictors(MACROBLOCKD *xd, int plane, int block,
157 int bw, int bh, 157 int bw, int bh,
158 int x, int y, int w, int h, 158 int x, int y, int w, int h,
159 int mi_x, int mi_y) { 159 int mi_x, int mi_y) {
160 struct macroblockd_plane *const pd = &xd->plane[plane]; 160 struct macroblockd_plane *const pd = &xd->plane[plane];
161 const MODE_INFO *mi = xd->mi[0]; 161 const MODE_INFO *mi = xd->mi[0];
162 const int is_compound = has_second_ref(&mi->mbmi); 162 const int is_compound = has_second_ref(&mi->mbmi);
163 const InterpKernel *kernel = vp9_filter_kernels[mi->mbmi.interp_filter]; 163 const InterpKernel *kernel = vp9_filter_kernels[mi->mbmi.interp_filter];
164 int ref; 164 int ref;
165 165
166 for (ref = 0; ref < 1 + is_compound; ++ref) { 166 for (ref = 0; ref < 1 + is_compound; ++ref) {
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 src->v_buffer}; 294 src->v_buffer};
295 const int strides[MAX_MB_PLANE] = { src->y_stride, src->uv_stride, 295 const int strides[MAX_MB_PLANE] = { src->y_stride, src->uv_stride,
296 src->uv_stride}; 296 src->uv_stride};
297 for (i = 0; i < MAX_MB_PLANE; ++i) { 297 for (i = 0; i < MAX_MB_PLANE; ++i) {
298 struct macroblockd_plane *const pd = &xd->plane[i]; 298 struct macroblockd_plane *const pd = &xd->plane[i];
299 setup_pred_plane(&pd->pre[idx], buffers[i], strides[i], mi_row, mi_col, 299 setup_pred_plane(&pd->pre[idx], buffers[i], strides[i], mi_row, mi_col,
300 sf, pd->subsampling_x, pd->subsampling_y); 300 sf, pd->subsampling_x, pd->subsampling_y);
301 } 301 }
302 } 302 }
303 } 303 }
OLDNEW
« no previous file with comments | « source/libvpx/vp9/common/vp9_reconinter.h ('k') | source/libvpx/vp9/common/vp9_reconintra.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698