libvpx/source/libvpx/vp8/encoder/pickinter.h - Issue 7624054: Revert r97185 "Update libvpx snapshot to v0.9.7-p1 (Cayuga)."

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

Issue 7624054: Revert r97185 "Update libvpx snapshot to v0.9.7-p1 (Cayuga)." (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party

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

View side-by-side diff with in-line comments

Download patch

Index: libvpx/source/libvpx/vp8/encoder/pickinter.h

diff --git a/libvpx/source/libvpx/vp8/encoder/pickinter.h b/libvpx/source/libvpx/vp8/encoder/pickinter.h

index a0103d165d60a2cd194fe33d7c14a0681c1c43eb..af060d7014e9b3a7dda86a93795e83c2afee3457 100644

--- a/libvpx/source/libvpx/vp8/encoder/pickinter.h

+++ b/libvpx/source/libvpx/vp8/encoder/pickinter.h

@@ -14,6 +14,8 @@

#include "vpx_ports/config.h"

#include "vp8/common/onyxc_int.h"

-extern void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int recon_uvoffset, int *returnrate, int *returndistortion, int *returnintra);

-extern void vp8_pick_intra_mode(VP8_COMP *cpi, MACROBLOCK *x, int *rate);

+#define RD_ESTIMATE(RM,DM,R,D) ( ((128+(R)*(RM)) >> 8) + (DM)*(D) )

+extern int vp8_pick_intra4x4mby_modes(const VP8_ENCODER_RTCD *, MACROBLOCK *mb, int *Rate, int *Distortion);

+extern int vp8_pick_intra_mbuv_mode(MACROBLOCK *mb);

+extern int vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int recon_uvoffset, int *returnrate, int *returndistortion, int *returnintra);

#endif

« no previous file with comments | « libvpx/source/libvpx/vp8/encoder/parms.cpp ('k') | libvpx/source/libvpx/vp8/encoder/pickinter.c » ('j') | no next file with comments »