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

Side by Side Diff: source/libvpx/vp8/encoder/pickinter.c

Issue 812033011: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 5 years, 11 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
« no previous file with comments | « source/libvpx/vp8/encoder/onyx_if.c ('k') | source/libvpx/vp8/encoder/rdopt.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 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 int error_per_bit, 173 int error_per_bit,
174 const vp8_variance_fn_ptr_t *vfp, 174 const vp8_variance_fn_ptr_t *vfp,
175 int *mvcost[2], int *distortion, 175 int *mvcost[2], int *distortion,
176 unsigned int *sse) 176 unsigned int *sse)
177 { 177 {
178 (void) b; 178 (void) b;
179 (void) d; 179 (void) d;
180 (void) ref_mv; 180 (void) ref_mv;
181 (void) error_per_bit; 181 (void) error_per_bit;
182 (void) vfp; 182 (void) vfp;
183 (void) mb;
183 (void) mvcost; 184 (void) mvcost;
184 (void) distortion; 185 (void) distortion;
185 (void) sse; 186 (void) sse;
186 bestmv->as_mv.row <<= 3; 187 bestmv->as_mv.row <<= 3;
187 bestmv->as_mv.col <<= 3; 188 bestmv->as_mv.col <<= 3;
188 return 0; 189 return 0;
189 } 190 }
190 191
191 192
192 int vp8_get_inter_mbpred_error(MACROBLOCK *mb, 193 int vp8_get_inter_mbpred_error(MACROBLOCK *mb,
(...skipping 1374 matching lines...) Expand 10 before | Expand all | Expand 10 after
1567 error4x4 = pick_intra4x4mby_modes(x, &rate, 1568 error4x4 = pick_intra4x4mby_modes(x, &rate,
1568 &best_sse); 1569 &best_sse);
1569 if (error4x4 < error16x16) 1570 if (error4x4 < error16x16)
1570 { 1571 {
1571 xd->mode_info_context->mbmi.mode = B_PRED; 1572 xd->mode_info_context->mbmi.mode = B_PRED;
1572 best_rate = rate; 1573 best_rate = rate;
1573 } 1574 }
1574 1575
1575 *rate_ = best_rate; 1576 *rate_ = best_rate;
1576 } 1577 }
OLDNEW
« no previous file with comments | « source/libvpx/vp8/encoder/onyx_if.c ('k') | source/libvpx/vp8/encoder/rdopt.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698