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

Side by Side Diff: source/libvpx/vp9/encoder/vp9_mbgraph.c

Issue 390713002: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: libvpx: Pull from upstream Created 6 years, 5 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/vp9/encoder/vp9_encoder.c ('k') | source/libvpx/vp9/encoder/vp9_mcomp.h » ('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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 ref_mv, dst_mv); 49 ref_mv, dst_mv);
50 50
51 // Try sub-pixel MC 51 // Try sub-pixel MC
52 // if (bestsme > error_thresh && bestsme < INT_MAX) 52 // if (bestsme > error_thresh && bestsme < INT_MAX)
53 { 53 {
54 int distortion; 54 int distortion;
55 unsigned int sse; 55 unsigned int sse;
56 cpi->find_fractional_mv_step( 56 cpi->find_fractional_mv_step(
57 x, dst_mv, ref_mv, cpi->common.allow_high_precision_mv, x->errorperbit, 57 x, dst_mv, ref_mv, cpi->common.allow_high_precision_mv, x->errorperbit,
58 &v_fn_ptr, 0, mv_sf->subpel_iters_per_step, NULL, NULL, &distortion, 58 &v_fn_ptr, 0, mv_sf->subpel_iters_per_step, NULL, NULL, &distortion,
59 &sse); 59 &sse, NULL, 0, 0);
60 } 60 }
61 61
62 xd->mi[0]->mbmi.mode = NEWMV; 62 xd->mi[0]->mbmi.mode = NEWMV;
63 xd->mi[0]->mbmi.mv[0].as_mv = *dst_mv; 63 xd->mi[0]->mbmi.mv[0].as_mv = *dst_mv;
64 64
65 vp9_build_inter_predictors_sby(xd, mb_row, mb_col, BLOCK_16X16); 65 vp9_build_inter_predictors_sby(xd, mb_row, mb_col, BLOCK_16X16);
66 66
67 /* restore UMV window */ 67 /* restore UMV window */
68 x->mv_col_min = tmp_col_min; 68 x->mv_col_min = tmp_col_min;
69 x->mv_col_max = tmp_col_max; 69 x->mv_col_max = tmp_col_max;
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 assert(q_cur != NULL); 399 assert(q_cur != NULL);
400 400
401 update_mbgraph_frame_stats(cpi, frame_stats, &q_cur->img, 401 update_mbgraph_frame_stats(cpi, frame_stats, &q_cur->img,
402 golden_ref, cpi->Source); 402 golden_ref, cpi->Source);
403 } 403 }
404 404
405 vp9_clear_system_state(); 405 vp9_clear_system_state();
406 406
407 separate_arf_mbs(cpi); 407 separate_arf_mbs(cpi);
408 } 408 }
OLDNEW
« no previous file with comments | « source/libvpx/vp9/encoder/vp9_encoder.c ('k') | source/libvpx/vp9/encoder/vp9_mcomp.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698