From patchwork Sat Aug 6 17:39:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37163 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:92a9:b0:8d:7f3b:94fc with SMTP id q41csp900531pzg; Sat, 6 Aug 2022 10:40:11 -0700 (PDT) X-Google-Smtp-Source: AA6agR5134KitmHVczYrxakfMo2JkfG9b7DvBg7QdvQOiQSTHNJCq3PiL4K/ZIWHqac/r4BnNo2+ X-Received: by 2002:a17:907:97d1:b0:72e:5ee:2ea8 with SMTP id js17-20020a17090797d100b0072e05ee2ea8mr8622800ejc.592.1659807611438; Sat, 06 Aug 2022 10:40:11 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id go38-20020a1709070da600b00731148bc546si3066489ejc.38.2022.08.06.10.40.10; Sat, 06 Aug 2022 10:40:11 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=DEk8GJlU; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9263B68B649; Sat, 6 Aug 2022 20:40:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068041.outbound.protection.outlook.com [40.92.68.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6036D68B53E for ; Sat, 6 Aug 2022 20:40:00 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TT8Sce7zaP1bEb+GbxV/0whFJ7AsZS9fkwXorkT9itWbNX43hqReXJS/k4LxKdP+jWzecsYq01jJSYbj3akWHcy7kFwakiFs9BYI1UuQ8WMbbCol85n25nA/+0oq7uQe+eDbpy2ZFg8m6OJ+rp2zOzFelVR+WmshFVUeOY9RE2/ToMyRuKhlmMc7DahA/yYtaT1PlKBFdq/GkQ2pKkFF0kvEu3ADZkE5UF5TBq62spk4JqL4sxU9XMRz+Mpm9r/FUIzFIjpwaeMuoQV4iwMs+y54IFgWDs7KQ56pAV6BuEPLI30NLbyk5HThvpDW3Vt0fMmNSdZVSKrtiJfQVQXdAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=5wLZlQLoGGaSPfGLS0PXIUPKR3K1pf3l+K/SrmQ3ESw=; b=fDItpwYIERidmtoo81SWXUwN4xU92Lk0Q8GVAFVVCsxC634U5YAgE3GptUDYoRhAl+zyNFqBb0B/V9mw8Z3i2/6nxkmv4mjvg5HiGX4gs3lCqFH+37PQc1zmp3DX3FJHYwJepsXLTbNYYULqxVTcT3G06eKZF3Ejrj2cIMnywQRd6rmfS5UBfNdCw+ZnLfd4qqosfqBjQ1KDd2kJIa7ljDJhr282X9VYSKHlwbnNVJYYn5y4DJJ3iVPDG1wPS2txcb0To1S5ts/nM4Sm/pwUWFPLXhxlZKYcpfhub4OWUJOiD7JSEX6X2S+zre0Gcic1fTE/g6i9vi3G5UfjQqCo0A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5wLZlQLoGGaSPfGLS0PXIUPKR3K1pf3l+K/SrmQ3ESw=; b=DEk8GJlUusZg5rBaNzkx2SRKwYLeoMO1t6gK9ksj0VGiu5IK8xjWzWqi93mOnPVe5uMc7Q5U9qYxVh6njWM2hOqVSSPbr/wIfLCLzU+yq7M6N75LQ7AT0Av0L49A4QJqYtCO07XGKFLq+sK/1Glq9vL2hKexn9DkTQjfAi1hRKrfCGRRgVyJPyvsZkncsfxPB6cHKIv9Z2X3s6XUXuqB3IbyjH2dwtPnjg772CIg/yWN/F+XHjBmIGBm1bFlEObJP/Y1zLePIsInkLXsyL18JCtWL//hBg/3l2NmSfNEfmHBGwi8P3F3LqAHKrlTOUY8i41yVmTf1SccArupwa9y1A== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DB9PR01MB7180.eurprd01.prod.exchangelabs.com (2603:10a6:10:212::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.14; Sat, 6 Aug 2022 17:39:58 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5504.016; Sat, 6 Aug 2022 17:39:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 6 Aug 2022 19:39:47 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [2lBrJK5GVbCzNUohxi+oM4FXeRUHvlCB] X-ClientProxiedBy: AS9PR04CA0130.eurprd04.prod.outlook.com (2603:10a6:20b:531::29) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220806173948.294863-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 63a6fcb6-9ead-4773-9743-08da77d2ae7f X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXYfOqwd1ucqK0pZo26bPpvsJqAEJGegze2UwphspaCqFrJmvLcwPiTSt7UT8SNTU1OcuBaaPo//0mvztpbF/eGoW1pzJ/tm7VJqB9pGp3Qe19nY2nK2TkG2vHNVvxy8jzMbx+panwsxhZQyxeE7tQazP0fGy064sDBFKhhGJCPcwqp/pbQjMUyINGrh/cXvT0Eca970K/dtOKSJZBYaXj5aJa/vCOncAvAaeLzYWZYlWLjJOrbY8w7DJyVF/9f5fNQe6QOD6BhXHxmroyyJC9k/ON+BGuW3lp8kR59g3XcXIOjbhkS/DpXTurkISFcwdXLcFmioZMN7y1j72udx9GD2ZV/amsQvINqgsGP27yp/m2C5nINx24YBWTbMrGCIROJGSeFrcCEwaLdGp/OOusuJeQ3LXkx37Ljv9Ush/lQDcZ+ugsg2H6LtEqrL0e0zcG6oELotpkrOz3h8RHQbG58MgKe41viHibCaXbLIXL+3BcAyaSGCoJfZlHhDj9lkKeuGKF44jSPfIF+Ov09p57iVM6six93mHcqmGvEBlVmRoAWYQQXt3W1bQdCBYTDVMO5h4u6CV04RtwCz+6AJGe5pTyjIT3Q1L4WogZtw/MOjnDKr0+ce2ixi+67bql3s8MIHy2fsmik4Rz4Zdr1eTD4RzCWifEwhtZKFCRuSM6JAmdkfUj+BG7Vq3eKeBbvwk5XUhmyirPNIrq4pgXqyTmC6pKMWxw6Vfo= X-MS-TrafficTypeDiagnostic: DB9PR01MB7180:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ri3HO6HEAuix8w5o/IB1wnf6NyNPQYAPvwq0IBYjGcLQ8wrMHC2ugVpLf75zQ/AT47xb4/v6RlU0VlEy8EKvvOrh2743qnAeUAndw2Rfy9CiW2Wu5o9cxtnkYroEh6yc7Evv9tUBH5+K8pvGG2G+6jjxNQkQOhcp5kvr6VltIL/g25Zn8UJervpjsU1nhIdkGos7ru7hh3I4H9EcBwebs7x4FIKD0/fLh0J52ZJVDhP74Ynl5j9qQLqeu8M1do8fj1hkeqYeELGnGIfBLEfS8W5yExyY/lQNVYcLtSu+dRr7gmpc/DUViU40JzJ2Mja5pomDtiI8wa+ZYU8b/fx21Rgiivxgi/+Em0GGqaSeaRlhR95LMtT6fSpWWpFIPrsEyZFj78HNALviDxRxEzCoWub2TrFcYFBj5AQMRW19Z8iJIznksXAUVr4YVdSHFbJTjt3h84Ct+dEEVOko9aGRALeWrohyPxLNudb0mkwwaIGU0LB+3aA5isDHlA+J8lpcPqlGkDm9mdkNc3KnTY+dVjJSZ9K0uqhnNnqt19loUi8crEwIG6F86FsUH18Hk1JPKM6aTXJD0cy4zRWa7M7qPZd1mNqfgbubEZ2U9Y+md/6bJDz2/a1Au5s3g7TZ9rpXh+AGLPYXCz2sb3D28GIqbQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4kMCVJrPJ7iZF2P3iiQ6CX9yr4NK+PZAHaegpiL1hPZ4l2PLvU1IZKE5bEy55so1FElQ3wNUb3qDUr5Q1KgkajOfRytUi8m4dhBcLWSHWD2vh6ytsA2/pCNVsxKlDeH2G/Xciia0wxOlAbJ57JLBfj5bDy0AEOyMMCr4CTGPG80+Y44tZSIgYCmBxJkvYk97Kw9EuTk92GS3CcGOJLWrzN0bnj0e1dNlzL0P8bqSKCVa87BdvCnJ02hY7W7wB9bYzbJSX5Fe4cduzEryzTmzAwSsvqshRmEWAYgWELNO4GW26jZ2+9VwmpPgSq7ho2I4ItJK4mT87mLRd21SOodU8bAp8fjZlQA4KG0lQKSrQDjxmYwvPSvbNjWq81WAPywlFShO6EldctPSBoSpVKYFUaB3UKTpbQzwwnv2N4EON3L/jDOpF+pUFivvuy7DybM+/GgP3JHb5Nxi/P79+RKqQ9lzPMZwAiIYaViUPHXErHbbteGNwTc5KLitJKCJv+MeDfLoKmlz9vY/v3T/xjxNsidkJQG3FrFyLIQCPmg238CuykU0hVCuWjhi3tk2Cf1FAiv25wEFXKMimZ8i7WOIJbYGSZPFCYBPRgcb31R+m1L61b+thyT/7rKyUgPa8RVdzgz7eTAZfStYubtjtEGuyA3cSP8/zK5206PyViCEMzmEa5SJ+wIWQ5kxTqBBqpXkKrjVDOgff8PppQG6qMCcDovAJ8qNTd+X0JyAxSpwo9JH48yWP6XiLzRcyi4dzQwfREA9W1F7Ofn5tA6OBMhxSXinBkRUV/HfWb11rLryTMLDOBegjIyC1pHhXy9zcqF4W+iOcJ1S/X9S1vM9CZSDxYf6rA2DPTKXqFwZgPh1O+vVIYoOjjHc61aXl6PdG85CMPATnfn2kWvjksYcoe3O0HSz3NDRAP9C12ZM1khdFIJjFVuVyb3is7HYynbDp54mmWofSbVMxHcPZjOTAzTmvd+ylERiKCq323RVKO4l2DfPVGyZl7dvGJrWZnBsa+DOylSsm7qt97Svtfbg7CdUw3mG+j5BJJ5MbZ2W0p5ofjtJL22b/hGBM/luGZ1B26q/MmeT1jKFMUi4nQqDJdE4HjGxOWflFOWdzyUrfrEi0DnX4HZqXOvtdhdynnrH1pc9Lf8FRq8i0m5pWowhMh0TJSQM2JW1mx7NsagroHrzv9Q+QQrmDGyobhWV2CvCK6slIBrIfbYP8s2SzRyCOkzd9xNkYoYgJ69WfBJYH/lpkpAE1VCXSZBZ/aaQh/gJajIzIiQzgTuaVChGSiAX1UUyyoKDLspPuHzBiTZR4xUYetI= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 63a6fcb6-9ead-4773-9743-08da77d2ae7f X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Aug 2022 17:39:58.4062 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR01MB7180 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/nvdec: Use av_buffer_replace() where appropriate X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: bhviRW8oZVpb Signed-off-by: Andreas Rheinhardt --- libavcodec/nvdec.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavcodec/nvdec.c b/libavcodec/nvdec.c index 15665b83bb..fbaedf0b6b 100644 --- a/libavcodec/nvdec.c +++ b/libavcodec/nvdec.c @@ -524,12 +524,9 @@ static int nvdec_retrieve_data(void *logctx, AVFrame *frame) goto copy_fail; } - av_buffer_unref(&frame->hw_frames_ctx); - frame->hw_frames_ctx = av_buffer_ref(decoder->real_hw_frames_ref); - if (!frame->hw_frames_ctx) { - ret = AVERROR(ENOMEM); + ret = av_buffer_replace(&frame->hw_frames_ctx, decoder->real_hw_frames_ref); + if (ret < 0) goto copy_fail; - } unmap_data->idx = cf->idx; if (!(unmap_data->idx_ref = av_buffer_ref(cf->idx_ref)) ||