From patchwork Fri Nov 16 00:21:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chirag Lathia X-Patchwork-Id: 11035 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 4792F44E397 for ; Fri, 16 Nov 2018 02:22:22 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A407F689BC4; Fri, 16 Nov 2018 02:22:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f68.google.com (mail-ot1-f68.google.com [209.85.210.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 16C5A689BC4 for ; Fri, 16 Nov 2018 02:22:16 +0200 (EET) Received: by mail-ot1-f68.google.com with SMTP id z33so19766611otz.11 for ; Thu, 15 Nov 2018 16:22:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=4bxjEHWjwhoPKHx6guX9yAyNiflUqC5TL0YwqAY/GWU=; b=WiOMn006J0LZ3KgmVsRZnsDzU/3tjhwiPReh93ZySvax9+CiI6xuYPCgkUpWYBZz34 /bbyJhkm2baa28w/jcWInnVhbMAJZJxN7O1htmiGXtFC6z5645CoNKtouGe7MBqjm+Wb bSZJVYW8opaOVpXA9+PKJr4+VP+ARL1iNYlgQfOqDtG5QQmDkYcOSHnXs+LjHXbnxAxn w6vzi0mE3HCmNndqviEnApEkR2FmTJNBGVwQflEEkf09i9a2gAUrf9EXsLEhfiwim1Cl ctYKxNaZZMZEcxM+tqmfpFBJ6ZK2USlu2iKO2TFgAUqcqaMeb169zDlFoi6OgSJ5w8Ms eXGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=4bxjEHWjwhoPKHx6guX9yAyNiflUqC5TL0YwqAY/GWU=; b=lQyEX0L2KHqDmmAiV2cnUyXZ8wOFmP1cjxSm8ZzQ0ix56o6izm1bolZU5ZjdduleR/ iB60hHrxDSE1HYZZ7WvhOK0LdZgKagkSh5CgI+llUzP2l1vn2Qv7MoEC3qbsbzVFhuKM A5BrSRn99dNeBUENGfptxl2cwdk1FzYpDCoYUaEWYz+Wi67NSXHsDDhifZnOViYGENDf gJX4U+cr9j1fUvCHYK92FUC1tUaiHYAYYQ7gJh6gY0FORhDY9cabfrke6oz0hMBKbj0X 5ymUEkxJz8lCzGjQZkYTBsw9zj/mPkiYWhFn0HgZLaEQvvyXGnKhKgIbZAozuDf5+ub6 LzvA== X-Gm-Message-State: AGRZ1gKfVzOgh92jkG8dF/X4gI4fEm2kg0xKPKATayvxyENnXFYqkUqg 73vUUAlE1G1pxNFU10P1MsADnBLHbTZ2fvFQAf+7YwqZB2R1Yw== X-Google-Smtp-Source: AJdET5eqx1jWIMj108I4kub62GPgqYJ6exPQKfhE1GaEUh7C7XXHbopfQPbVrmN2GxLvdMRhcfR3PN1q2JAcVp9jES4= X-Received: by 2002:a9d:1541:: with SMTP id z1mr4652796otz.305.1542327729169; Thu, 15 Nov 2018 16:22:09 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Chirag Lathia Date: Thu, 15 Nov 2018 16:21:58 -0800 Message-ID: To: ffmpeg-devel@ffmpeg.org Subject: Re: [FFmpeg-devel] [Ffmpeg-devel] [PATCH] Add a maximum constraint of 16 encoder threads. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Updated with James' review comment to cover the avctx->thread_count as well. Signed-off-by: Chirag Lathia --- libavcodec/libvpxenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) if (avctx->flags & AV_CODEC_FLAG_PASS1) From bf8750426bf84d972264fb430bf8f56f0b7eca43 Mon Sep 17 00:00:00 2001 From: Chirag Lathia Date: Thu, 15 Nov 2018 10:51:32 -0800 Subject: [PATCH] Add a maximum constraint of 16 encoder threads. Signed-off-by: Chirag Lathia --- libavcodec/libvpxenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index ad440a9c21..da9b9c6d46 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -497,7 +497,8 @@ static av_cold int vpx_init(AVCodecContext *avctx, enccfg.g_h = avctx->height; enccfg.g_timebase.num = avctx->time_base.num; enccfg.g_timebase.den = avctx->time_base.den; - enccfg.g_threads = avctx->thread_count ? avctx->thread_count : av_cpu_count(); + enccfg.g_threads = + FFMIN(avctx->thread_count ? avctx->thread_count : av_cpu_count(), 16); enccfg.g_lag_in_frames= ctx->lag_in_frames; if (avctx->flags & AV_CODEC_FLAG_PASS1) -- 2.19.1.1215.g8438c0b245-goog