source/libvpx/vp8/encoder/mcomp.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/mcomp.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/mcomp.c

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

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

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

@@ -18,7 +18,7 @@

#include <math.h>

#include "vp8/common/findnearmv.h"

-#ifdef ENTROPY_STATS

+#ifdef VP8_ENTROPY_STATS

static int mv_ref_ct [31] [4] [2];

static int mv_mode_cts [4] [2];

#endif

@@ -1912,7 +1912,7 @@

+ mv_err_cost(&this_mv, center_mv, mvcost, x->errorperbit);

}

-#ifdef ENTROPY_STATS

+#ifdef VP8_ENTROPY_STATS

void print_mode_context(void)

{

FILE *f = fopen("modecont.c", "w");

@@ -1965,8 +1965,8 @@

fclose(f);

}

-/* MV ref count ENTROPY_STATS stats code */

-#ifdef ENTROPY_STATS

+/* MV ref count VP8_ENTROPY_STATS stats code */

+#ifdef VP8_ENTROPY_STATS

void init_mv_ref_counts()

{

vpx_memset(mv_ref_ct, 0, sizeof(mv_ref_ct));

@@ -2020,6 +2020,6 @@

}

-#endif/* END MV ref count ENTROPY_STATS stats code */

+#endif/* END MV ref count VP8_ENTROPY_STATS stats code */

#endif

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