From patchwork Fri May 3 08:11:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ruta Gadkari X-Patchwork-Id: 12972 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 EE7AE440ECF for ; Fri, 3 May 2019 11:11:43 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ACAE968AB03; Fri, 3 May 2019 11:11:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from hqemgate16.nvidia.com (hqemgate16.nvidia.com [216.228.121.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 70EE868A543 for ; Fri, 3 May 2019 11:11:36 +0300 (EEST) Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqemgate16.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Fri, 03 May 2019 01:11:30 -0700 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Fri, 03 May 2019 01:11:34 -0700 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Fri, 03 May 2019 01:11:34 -0700 Received: from nvidia.com (10.124.1.5) by HQMAIL101.nvidia.com (172.20.187.10) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Fri, 3 May 2019 08:11:32 +0000 From: Ruta Gadkari To: Date: Fri, 3 May 2019 13:41:11 +0530 Message-ID: <20190503081111.7516-1-rgadkari@nvidia.com> X-Mailer: git-send-email 2.17.1 X-NVConfidentiality: public MIME-Version: 1.0 X-Originating-IP: [10.124.1.5] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL101.nvidia.com (172.20.187.10) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1556871090; bh=bkvZ5hrYb9br5AjuspILmtDRunk6LRGN2+A88a+ERAw=; h=X-PGP-Universal:From:To:CC:Subject:Date:Message-ID:X-Mailer: X-NVConfidentiality:MIME-Version:X-Originating-IP: X-ClientProxiedBy:Content-Type; b=Fp+UVdNklBE6V9fBXZWUq3FNH66vIMlos+9N6Fg6NEhKjfhP9gS5C4zJn8wa2zkPo ZMxEpkLryjeK5ZBUJGmn2ZK0l2Wm8oDVbsGkwE7DwJZoA+Gu4z9L1D3y8vMAoNAi0l Z8O8LXnmeZUt6k3JtIxrDH/s+GIozNQ876T/op7mN5L2/zDObFc3AwbZenMyDmRoC1 nTH+zmsZ27HHajdKZY7B0afRTgrYXdZlEwv0Sk2cIAn7cjrnA2//NdDs5EFxPdbYyG 392PYgqGp5cgm6jWrAENEhlSJXT4rQoLBcl3ood1j4fwpp+ePosTiHSdesUQYYSMkJ OsJIYGh2jQN9Q== Subject: [FFmpeg-devel] [PATCH 1/1] cuviddec: Add capability check for maximum macroblock count 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: Ruta Gadkari , timo@rothenpieler.org Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Cuvid supports clips with a limit on maximum number of macroblocks. This check was missing after cuvidGetDecoderCaps API call allowing unsupported clips to proceed. Added the missing check, same as the one in hwaccel nvdec implementation. --- libavcodec/cuviddec.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/cuviddec.c b/libavcodec/cuviddec.c index d59d1faf9e..acee78cf2c 100644 --- a/libavcodec/cuviddec.c +++ b/libavcodec/cuviddec.c @@ -805,6 +805,12 @@ static int cuvid_test_capabilities(AVCodecContext *avctx, return AVERROR(EINVAL); } + if ((probed_width * probed_height) / 256 > caps->nMaxMBCount) { + av_log(avctx, AV_LOG_ERROR, "Video macroblock count %d exceeds maximum of %d\n", + (int)(probed_width * probed_height) / 256, caps->nMaxMBCount); + return AVERROR(EINVAL); + } + return 0; }