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

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

Issue 181493009: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 6 years, 9 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/common/vp9_entropy.c ('k') | source/libvpx/vp9/common/vp9_filter.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 447 matching lines...) Expand 10 before | Expand all | Expand 10 after
458 if (cm->frame_type == KEY_FRAME || 458 if (cm->frame_type == KEY_FRAME ||
459 cm->error_resilient_mode || cm->reset_frame_context == 3) { 459 cm->error_resilient_mode || cm->reset_frame_context == 3) {
460 // Reset all frame contexts. 460 // Reset all frame contexts.
461 for (i = 0; i < FRAME_CONTEXTS; ++i) 461 for (i = 0; i < FRAME_CONTEXTS; ++i)
462 cm->frame_contexts[i] = cm->fc; 462 cm->frame_contexts[i] = cm->fc;
463 } else if (cm->reset_frame_context == 2) { 463 } else if (cm->reset_frame_context == 2) {
464 // Reset only the frame context specified in the frame header. 464 // Reset only the frame context specified in the frame header.
465 cm->frame_contexts[cm->frame_context_idx] = cm->fc; 465 cm->frame_contexts[cm->frame_context_idx] = cm->fc;
466 } 466 }
467 467
468 vpx_memset(cm->prev_mip, 0, 468 if (frame_is_intra_only(cm))
469 cm->mode_info_stride * (cm->mi_rows + 1) * sizeof(MODE_INFO)); 469 vpx_memset(cm->prev_mip, 0,
470 cm->mode_info_stride * (cm->mi_rows + 1) * sizeof(MODE_INFO));
471
470 vpx_memset(cm->mip, 0, 472 vpx_memset(cm->mip, 0,
471 cm->mode_info_stride * (cm->mi_rows + 1) * sizeof(MODE_INFO)); 473 cm->mode_info_stride * (cm->mi_rows + 1) * sizeof(MODE_INFO));
472 474
473 vp9_zero(cm->ref_frame_sign_bias); 475 vp9_zero(cm->ref_frame_sign_bias);
474 476
475 cm->frame_context_idx = 0; 477 cm->frame_context_idx = 0;
476 } 478 }
OLDNEW
« no previous file with comments | « source/libvpx/vp9/common/vp9_entropy.c ('k') | source/libvpx/vp9/common/vp9_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698