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

Issue 1302353004: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master

Patch Set: Created 5 years, 4 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/mr_dissim.c

diff --git a/source/libvpx/vp8/encoder/mr_dissim.c b/source/libvpx/vp8/encoder/mr_dissim.c

index 8d96445f53ce71c90be48660df20579fc069b81d..7d05d932436d92a4b73eab6b8189553133b78c6b 100644

--- a/source/libvpx/vp8/encoder/mr_dissim.c

+++ b/source/libvpx/vp8/encoder/mr_dissim.c

@@ -192,11 +192,13 @@ void vp8_cal_dissimilarity(VP8_COMP *cpi)

}

- mmvx = MAX(abs(min_mvx - here->mbmi.mv.as_mv.row),

- abs(max_mvx - here->mbmi.mv.as_mv.row));

- mmvy = MAX(abs(min_mvy - here->mbmi.mv.as_mv.col),

- abs(max_mvy - here->mbmi.mv.as_mv.col));

- dissim = MAX(mmvx, mmvy);

+ mmvx = VPXMAX(

+ abs(min_mvx - here->mbmi.mv.as_mv.row),

+ abs(max_mvx - here->mbmi.mv.as_mv.row));

+ mmvy = VPXMAX(

+ abs(min_mvy - here->mbmi.mv.as_mv.col),

+ abs(max_mvy - here->mbmi.mv.as_mv.col));

+ dissim = VPXMAX(mmvx, mmvy);

}