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

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

Issue 290613006: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 6 years, 7 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 1159 matching lines...) Expand 10 before | Expand all | Expand 10 after
1170 { 1170 {
1171 if (x->best_sse_inter_mode == DC_PRED) 1171 if (x->best_sse_inter_mode == DC_PRED)
1172 { 1172 {
1173 /* No best MV found. */ 1173 /* No best MV found. */
1174 x->best_sse_inter_mode = best_mbmode.mode; 1174 x->best_sse_inter_mode = best_mbmode.mode;
1175 x->best_sse_mv = best_mbmode.mv; 1175 x->best_sse_mv = best_mbmode.mv;
1176 x->need_to_clamp_best_mvs = best_mbmode.need_to_clamp_mvs; 1176 x->need_to_clamp_best_mvs = best_mbmode.need_to_clamp_mvs;
1177 x->best_reference_frame = best_mbmode.ref_frame; 1177 x->best_reference_frame = best_mbmode.ref_frame;
1178 best_sse = best_rd_sse; 1178 best_sse = best_rd_sse;
1179 } 1179 }
1180 x->increase_denoising = 0;
1180 vp8_denoiser_denoise_mb(&cpi->denoiser, x, best_sse, zero_mv_sse, 1181 vp8_denoiser_denoise_mb(&cpi->denoiser, x, best_sse, zero_mv_sse,
1181 recon_yoffset, recon_uvoffset); 1182 recon_yoffset, recon_uvoffset);
1182 1183
1183 1184
1184 /* Reevaluate ZEROMV after denoising. */ 1185 /* Reevaluate ZEROMV after denoising. */
1185 if (best_mbmode.ref_frame == INTRA_FRAME && 1186 if (best_mbmode.ref_frame == INTRA_FRAME &&
1186 x->best_zeromv_reference_frame != INTRA_FRAME) 1187 x->best_zeromv_reference_frame != INTRA_FRAME)
1187 { 1188 {
1188 int this_rd = 0; 1189 int this_rd = 0;
1189 int this_ref_frame = x->best_zeromv_reference_frame; 1190 int this_ref_frame = x->best_zeromv_reference_frame;
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
1288 error4x4 = pick_intra4x4mby_modes(x, &rate, 1289 error4x4 = pick_intra4x4mby_modes(x, &rate,
1289 &best_sse); 1290 &best_sse);
1290 if (error4x4 < error16x16) 1291 if (error4x4 < error16x16)
1291 { 1292 {
1292 xd->mode_info_context->mbmi.mode = B_PRED; 1293 xd->mode_info_context->mbmi.mode = B_PRED;
1293 best_rate = rate; 1294 best_rate = rate;
1294 } 1295 }
1295 1296
1296 *rate_ = best_rate; 1297 *rate_ = best_rate;
1297 } 1298 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698