source/libvpx/vp9/encoder/vp9_encodeframe.c - Issue 17009012: 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_encodeframe.c

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

Patch Set: Created 7 years, 6 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_encodeframe.c

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

--- source/libvpx/vp9/encoder/vp9_encodeframe.c (revision 207064)

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

@@ -23,7 +23,6 @@

#include "vp9/encoder/vp9_segmentation.h"

#include "vp9/encoder/vp9_encodeintra.h"

#include "vp9/common/vp9_reconinter.h"

-#include "vp9/common/vp9_invtrans.h"

#include "vp9/encoder/vp9_rdopt.h"

#include "vp9/common/vp9_findnearmv.h"

#include "vp9/common/vp9_reconintra.h"

@@ -603,6 +602,8 @@

MACROBLOCK *const x = &cpi->mb;

MACROBLOCKD *const xd = &x->e_mbd;

+ x->rd_search = 1;

if (bsize < BLOCK_SIZE_SB8X8)

if (xd->ab_index != 0)

return;

@@ -1975,6 +1976,7 @@

const int mis = cm->mode_info_stride;

const int bwl = mi_width_log2(bsize);

const int bw = 1 << bwl, bh = 1 << mi_height_log2(bsize);

+ x->rd_search = 0;

if (cm->frame_type == KEY_FRAME) {

if (cpi->oxcf.tuning == VP8_TUNE_SSIM) {

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