From patchwork Thu Nov 15 19:45:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chirag Lathia X-Patchwork-Id: 11034 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 9DEAC44C40B for ; Thu, 15 Nov 2018 21:46:05 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 22520689E95; Thu, 15 Nov 2018 21:46:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f194.google.com (mail-oi1-f194.google.com [209.85.167.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4998D6809AC for ; Thu, 15 Nov 2018 21:45:59 +0200 (EET) Received: by mail-oi1-f194.google.com with SMTP id 192-v6so17770561oii.6 for ; Thu, 15 Nov 2018 11:45:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=TiDfDficfMShs5ncUlo/9jBICBY5PEoNPzvRsHYMm5c=; b=uf/I6zBEMd1oS43xq6u60A4aQq1M6KNoEparx24J2WVy4xhQlGHdIkh9RLxZ852kCL +x0bKwlxYmSnUfIhDW3VUbZnZeIGAKvxJFEMm1ytTRbqbvuKRcwDtLxTUwKT3z0D5+pq SlsyDaUTkPX022uV54W0s0GrbY2iLvsKsJ278ks0WIhUcyWE90uVLo8PsDj0Zx+Jvp1Q 9VBzIRLwH9VtFQJ2TrkGEhRSlEt9XfyYBtSRMxOnkud6MGdJzkPGeG7K+ko/I9uoJmL3 T3BXLuPwwHP6l2WP+OfTobBkj9ro3tuLXtY5tq5rugONc3sZFi8+rjjHM3tw97TTTdMs mj1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=TiDfDficfMShs5ncUlo/9jBICBY5PEoNPzvRsHYMm5c=; b=dt1dkfJuPo0Px6LwAuuEbgtILyulBFtYaDrHaZRtjDRHZ3JUCrjWi9AadIDKMjpm71 MJeclRjvYF3DIgM5BocVlCYKsc6d0T/sYvH0G8JIP5a+CpMjgr2coqPkt44Kn0VWxHPp MvzBQo4t23oNLWjlO9xGKIlbJOVEnAXN1DCm7ETA8EmTekRKmWWgdti+/Zt1EPQQhmqk eRSnFafAWwlzwajp8W34FCTEg8Lz2NZvLykVDVqIMy1SNs5ZbsKveNOXn8YStioLG329 5D9gS9B3OHTqARc/xsEw77v1mKYhBwZAe7Cl+ZsmXEX8skS2t72oOz/NZiVH2cnD8bzs eQWg== X-Gm-Message-State: AGRZ1gITnflPjH1ScLVMy9sQzCDGKAcc1TaP5pLgDLAqqsMHQAgvEw11 JbHLZ3msugz/4FGoXLEf21VtrnrYExbFFzE8OriJiRlLK9WmpA== X-Google-Smtp-Source: AJdET5eyLr4SzEf5eiiaY1cPIC64bp1QbdIVNutnxIJLYi9jUY1JK0vXJvyrj3VUglgqVFA5SDKZz0EH6nNGMqB8L70= X-Received: by 2002:aca:cc51:: with SMTP id c78-v6mr4325073oig.150.1542311157081; Thu, 15 Nov 2018 11:45:57 -0800 (PST) MIME-Version: 1.0 From: Chirag Lathia Date: Thu, 15 Nov 2018 11:45:45 -0800 Message-ID: To: ffmpeg-devel@ffmpeg.org Subject: [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" libvpx supports a maximum of 16 encoder threads. Signed-off-by: Chirag Lathia --- libavcodec/libvpxenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) if (avctx->flags & AV_CODEC_FLAG_PASS1) -- From c5c9d0c8bbd80e2eda324d73a96d750ea09ab2b4 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..dda4b96fb2 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 = + avctx->thread_count ? avctx->thread_count : FFMIN(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