From patchwork Tue Nov 27 09:18:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 11179 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 6DDC944DA7E for ; Tue, 27 Nov 2018 11:26:20 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D98B2689FFB; Tue, 27 Nov 2018 11:26:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B05C968046F for ; Tue, 27 Nov 2018 11:26:14 +0200 (EET) Received: by mail-pg1-f194.google.com with SMTP id 70so7582118pgh.8 for ; Tue, 27 Nov 2018 01:26:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=R64CQfdG3PqYDIrsasK83ScJ7DyDVajz6uHLQw0JvAo=; b=qP4BId0gbYXmlplt+B7iWeWmpcUt7gCJh5EP/NUibczTzuKbn/jASlT1YG0u8EKWmm ABa61jsEos/96QPlZAIZt/O3faI/dc6ZEFYWQ2SfthWZ2+jx5ykYi4aHoctk0DwgZlkC ywnSX1R2CgqElQl1/eoyzSeUVBHr2TUmsQifdUIfzpwONnAEl/F2gT6cPlmbPdMzMKoG 9nMJDzNyvSVSTN9yE3OvlN4pLAQgb411jKalHexv9hjJHq43UeldneQyNeRIntIndXaE J8Q48Z/8VuSmRY5Ah8MS6GEu7PQniUqu8QImpL46bdYD4YEIpViLab6hWCNoaWJ9v6Qt KMVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=R64CQfdG3PqYDIrsasK83ScJ7DyDVajz6uHLQw0JvAo=; b=Rf+IAmxONOAamffkJe2dWl1qttE9/W/9wkmR5znEdEzXqxmgqR1SXhR76v7l5YEKxX HblDQSV6maq3D64vPBqN1bV9CCNWv7mKla2lJamYaey4Z5SBpR2aQCXWmKaAqHTf+0/N HS7eZzfD0bBthVGeNgI3KlV/JrrIZ5zf8HgelUusM9cVHjNKtLuPu5E5GLfhe1hWK5Vo 96XMnQ2Fs5CAcsrKAbdr+/m7r7QOfnj1uh9gAu0wrA7hHegVHvgQhE+kbElA0vRHOlJO TZ7RflCSlFxkzBKfYwg33MhewjSsL71FSsI9Z3wLSGyfZ0mtLu3OQ89AfzpBpQFac2uU Ob9Q== X-Gm-Message-State: AA+aEWZCKLbgJ8MujxoQeBKndGNCXz6kQjD39qyfkgcBir2vKzfYAqY4 e1UArvwP9NMWL9QlS3LysjSWndmn X-Google-Smtp-Source: AFSGD/VqHMyhTAnGaXNE26StnCUGjar0ZR+YGMZ9S+zFv52kUFn0Ke87D1kVIKo4mbyzlXEBmsHN9w== X-Received: by 2002:a63:8f45:: with SMTP id r5mr28080821pgn.222.1543310312025; Tue, 27 Nov 2018 01:18:32 -0800 (PST) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id l11sm3755095pff.65.2018.11.27.01.18.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Nov 2018 01:18:30 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Tue, 27 Nov 2018 17:18:26 +0800 Message-Id: <1543310306-2050-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 Subject: [FFmpeg-devel] [PATCH] lavc/libaomenc: Add a maximum constraint of 64 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 Cc: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" fixed the error in Intel(R) Xeon(R) Gold 6152 CPU like: [libaom-av1 @ 0x469f340] Failed to initialize encoder: Invalid parameter [libaom-av1 @ 0x469f340] Additional information: g_threads out of range [..MAX_NUM_THREADS] Signed-off-by: Jun Zhao --- libavcodec/libaomenc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index cb31c55..ccb0cf9 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -504,7 +504,8 @@ static av_cold int aom_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(), 64); if (ctx->lag_in_frames >= 0) enccfg.g_lag_in_frames = ctx->lag_in_frames;