source/libvpx/vp9/encoder/vp9_encodemv.c - Issue 23530058: libvpx: Pull from upstream

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: source/libvpx/vp9/encoder/vp9_encodemv.c

Issue 23530058: libvpx: Pull from upstream (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libvpx/

Patch Set: Created 7 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:

Index: source/libvpx/vp9/encoder/vp9_encodemv.c

===================================================================

--- source/libvpx/vp9/encoder/vp9_encodemv.c (revision 223100)

+++ source/libvpx/vp9/encoder/vp9_encodemv.c (working copy)

@@ -155,7 +155,6 @@

unsigned int (*branch_ct_class0_hp)[2],

unsigned int (*branch_ct_hp)[2]) {

int i, j, k;

- vp9_counts_process(nmv_count, usehp);

vp9_tree_probs_from_distribution(vp9_mv_joint_tree,

prob->joints,

branch_ct_joint,

@@ -317,7 +316,7 @@

void vp9_update_nmv_count(VP9_COMP *cpi, MACROBLOCK *x,

int_mv *best_ref_mv, int_mv *second_best_ref_mv) {

- MODE_INFO *mi = x->e_mbd.mode_info_context;

+ MODE_INFO *mi = x->e_mbd.mi_8x8[0];

MB_MODE_INFO *const mbmi = &mi->mbmi;

MV diff;

const int num_4x4_blocks_wide = num_4x4_blocks_wide_lookup[mbmi->sb_type];

@@ -334,7 +333,7 @@

diff.col = mi->bmi[i].as_mv[0].as_mv.col - best_ref_mv->as_mv.col;

vp9_inc_mv(&diff, &cpi->NMVcount);

- if (x->e_mbd.mode_info_context->mbmi.ref_frame[1] > INTRA_FRAME) {

+ if (mi->mbmi.ref_frame[1] > INTRA_FRAME) {

diff.row = mi->bmi[i].as_mv[1].as_mv.row -

second_best_ref_mv->as_mv.row;

diff.col = mi->bmi[i].as_mv[1].as_mv.col -

« no previous file with comments | « source/libvpx/vp9/encoder/vp9_encodemb.c ('k') | source/libvpx/vp9/encoder/vp9_firstpass.c » ('j') | no next file with comments »