source/libvpx/vp8/encoder/pickinter.c - Issue 13849011: 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/vp8/encoder/pickinter.c

Issue 13849011: libvpx: Pull from upstream (Closed) Base URL: https://src.chromium.org/chrome/trunk/deps/third_party/libvpx/

Patch Set: Created 7 years, 8 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/vp8/encoder/pickinter.c

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

--- source/libvpx/vp8/encoder/pickinter.c (revision 195011)

+++ source/libvpx/vp8/encoder/pickinter.c (working copy)

@@ -594,6 +594,7 @@

unsigned int zero_mv_sse = INT_MAX, best_sse = INT_MAX;

#endif

+ int sf_improved_mv_pred = cpi->sf.improved_mv_pred;

int_mv mvp;

int near_sadidx[8] = {0, 1, 2, 3, 4, 5, 6, 7};

@@ -882,7 +883,7 @@

last frame motion info is not stored, then we can not

use improved_mv_pred. */

if (cpi->oxcf.mr_encoder_id && !parent_ref_valid)

- cpi->sf.improved_mv_pred = 0;

+ sf_improved_mv_pred = 0;

if (parent_ref_valid && parent_ref_frame)

{

@@ -899,7 +900,7 @@

}else

#endif

{

- if(cpi->sf.improved_mv_pred)

+ if(sf_improved_mv_pred)

{

if(!saddone)

{

« no previous file with comments | « source/libvpx/vp8/encoder/onyx_if.c ('k') | source/libvpx/vp8/encoder/tokenize.h » ('j') | no next file with comments »