From patchwork Thu Dec 6 10:39:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 11299 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 8BF9444C71A for ; Thu, 6 Dec 2018 12:40:20 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 420C668A7AF; Thu, 6 Dec 2018 12:40:12 +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 9BB1768A796 for ; Thu, 6 Dec 2018 12:40:05 +0200 (EET) Received: by mail-pg1-f194.google.com with SMTP id 17so10476121pgg.1 for ; Thu, 06 Dec 2018 02:40:14 -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:in-reply-to:references; bh=NjkoBNQucBoiNB1b+wUqpEBOAkRqUKeNVNocCY6GItE=; b=hU360uWYIKQEExh8gWzjh64CzVIxjYu70u8TywCOF4tB5ZZWgt8P37Z4nHs2Vu+c/n XI7O8k9yMA+lq3HHi4U3dYwQDbJSQQR7jtV/UYo65YLKOoT8EaoDmlcIekQc6yg1QJ2+ 7MEmIEX3CK9D+5GU3+Vq65pmCE4kF3Won2zYo4A4/CByyikQFuD20olRaa0YhORcwWCC mob9xxWcCRHZoT5yqDwmh4/OsLHgXMGagQEc8AywdT9zEiVKR2EZZED9jbWBsFITWaQB PGAuYEALWxqfiekEsi56fQPo5eFHOeAX/gVp4zEkk+zTCKKyulHTSfY0eraX/ymsPPUR kiRg== 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:in-reply-to :references; bh=NjkoBNQucBoiNB1b+wUqpEBOAkRqUKeNVNocCY6GItE=; b=N+jW9unkh3SRugPHkGdh+y5fVgcmk98bUIatHgl98t2og42s1asptHlFB/w//WCLCH /ckDebH4CQhuSTw3+bsGtwHZ9q6y1LLaUkzRP3oc6fs+fU63B2cRrLQbMCVqisUUSaxt 45V43ausMfKgVpt+/GtLvqI8rpgOEtQ7cqjWPiRAzQzVZrJiC1vZrfKnV3+SNpLS6Qqi vjfd6nPKzhrzU/CdESb/hURJJL2hrFKBytaSApUx8LbsTp2wQwCaeP8/WEvVaI4i4t0m QPZiOHbkSu91e7V0P39uh/5Z4zBB6ulYrYoTDDXEcnDLpucyIBrMIGtiDfe/RzGrNZeg h7og== X-Gm-Message-State: AA+aEWYMMOKAcqZZo6wrB69IcCYiujytjTNBoU0cwT3YuqmUmd9l2SIf +tvptifTsKkWMTylxU9jp1Id9UVj X-Google-Smtp-Source: AFSGD/Wq+7YJZK7plsru4pTKe5o3ocNPe7jj/LnF/SRx1EM06Lp3nYMo4xfUp21kooltKT7eLRYyRg== X-Received: by 2002:a63:5153:: with SMTP id r19mr23441336pgl.281.1544092812858; Thu, 06 Dec 2018 02:40:12 -0800 (PST) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id b26sm68086815pfe.91.2018.12.06.02.40.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Dec 2018 02:40:12 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Dec 2018 18:39:58 +0800 Message-Id: <1544092798-4125-3-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1544092798-4125-1-git-send-email-mypopydev@gmail.com> References: <1544092798-4125-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH V1 2/2] lavc/vaapi_encode: fix slices number check. 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" Fix slice number check logic. Only when the user setting slices number more than the driver constraints dump the rounded up warning message. Signed-off-by: Jun Zhao --- libavcodec/vaapi_encode.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index eda8a36..3c8a33d 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -1572,7 +1572,7 @@ static av_cold int vaapi_encode_init_slice_structure(AVCodecContext *avctx) return AVERROR(EINVAL); } - if (ctx->nb_slices > avctx->slices) { + if (ctx->nb_slices < avctx->slices) { av_log(avctx, AV_LOG_WARNING, "Slice count rounded up to " "%d (from %d) due to driver constraints on slice " "structure.\n", ctx->nb_slices, avctx->slices);