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

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

index e8796a1fcfbf79521af071dbd8c393c1a38944c9..f2642227b68529fe79d57b979f01f7cc2d1d3eac 100644

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

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

@@ -22,6 +22,7 @@

#include "vpx_mem/vpx_mem.h"

#include "vp8/common/systemdependent.h"

#include "encodemv.h"

+#include "vpx_dsp/vpx_dsp_common.h"

#define MIN_BPB_FACTOR 0.01

@@ -380,7 +381,8 @@ static void calc_iframe_target_size(VP8_COMP *cpi)

int initial_boost = 32; /* |3.0 * per_frame_bandwidth| */

/* Boost depends somewhat on frame rate: only used for 1 layer case. */

if (cpi->oxcf.number_of_layers == 1) {

- kf_boost = MAX(initial_boost, (int)(2 * cpi->output_framerate - 16));

+ kf_boost = VPXMAX(initial_boost,

+ (int)(2 * cpi->output_framerate - 16));

}

else {

/* Initial factor: set target size to: |3.0 * per_frame_bandwidth|. */

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