source/libvpx/vp9/encoder/vp9_ethread.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/vp9/encoder/vp9_ethread.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/vp9/encoder/vp9_ethread.c

diff --git a/source/libvpx/vp9/encoder/vp9_ethread.c b/source/libvpx/vp9/encoder/vp9_ethread.c

index 00025b7a1984927e5d2db9f23f7529f8c971b91b..adb3fd8e87a2f188a281d22ad43b290b30a33227 100644

--- a/source/libvpx/vp9/encoder/vp9_ethread.c

+++ b/source/libvpx/vp9/encoder/vp9_ethread.c

@@ -67,7 +67,7 @@ void vp9_encode_tiles_mt(VP9_COMP *cpi) {

VP9_COMMON *const cm = &cpi->common;

const int tile_cols = 1 << cm->log2_tile_cols;

const VPxWorkerInterface *const winterface = vpx_get_worker_interface();

- const int num_workers = MIN(cpi->oxcf.max_threads, tile_cols);

+ const int num_workers = VPXMIN(cpi->oxcf.max_threads, tile_cols);

int i;

vp9_init_tile_data(cpi);

@@ -80,7 +80,7 @@ void vp9_encode_tiles_mt(VP9_COMP *cpi) {

// resolution.

if (cpi->use_svc) {

int max_tile_cols = get_max_tile_cols(cpi);

- allocated_workers = MIN(cpi->oxcf.max_threads, max_tile_cols);

+ allocated_workers = VPXMIN(cpi->oxcf.max_threads, max_tile_cols);

}

CHECK_MEM_ERROR(cm, cpi->workers,

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