From patchwork Sun Aug 28 21:19:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37530 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1584806pzh; Sun, 28 Aug 2022 14:21:26 -0700 (PDT) X-Google-Smtp-Source: AA6agR4/5Pa5j/AIevOBw8w0TjDYx1p6+69jR16LA0bgjDamxq924bGxPzHoGVWIV9bsBgR/yRrk X-Received: by 2002:a05:6402:2714:b0:446:eaa5:79f2 with SMTP id y20-20020a056402271400b00446eaa579f2mr14616413edd.22.1661721686720; Sun, 28 Aug 2022 14:21:26 -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 p13-20020a1709066a8d00b0073d5b737a78si5114867ejr.752.2022.08.28.14.21.26; Sun, 28 Aug 2022 14:21:26 -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=SGHqDYVd; 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 183F968BA4D; Mon, 29 Aug 2022 00:20:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2094.outbound.protection.outlook.com [40.92.91.94]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6FD4F68B9BD for ; Mon, 29 Aug 2022 00:20:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X2o9A6zH5VhRsM+F4gLTNgGItI91a0WWcq489c+/MvHB25AmtnVCqm5OsTTbnBPDd5004BM9O3UqBvYTLP6GNoJjnfrlPY78ieR55jkVMSf0NSM8Nqcor0ggbj15Zkesr+YBuAz7zR2qTpJfR+gt2Djq7urMSJHfz/6jXKY/QlrR2+uei/NhHoL9nnmYMrSU6GNPdoYu8JzG01n/hfN1ftdiqtPnR5NkpXiF8OuSr1OitBcCMxV2k11oC+9snYTpbvxnv95cXfAxsc8lIG84W2C8sL3V14+9rDXN2pGzP/Vj9uQTv3vDCrNoeGNwFRcAxvcJqIQhTDeZt6RFJA+Ozg== 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=M4de1juFlidzEvjJ8/1l8wqGG7Xg5cZ1lk1o+SZWEAI=; b=OTPjuyRzRp0fEo/R4Z2L7ZrO+nc8Z8gr1zUYCkt76oOefskmw9CL2aXSs2CVR847eLTbM+6SELv9XlljlTG0e8IGi8W3L3nuULgywcaeBTFVuBfh0HNuD9bob8Ircg0vV0WCXXDEI68Hi85/ytuyCX3Iwokjryc3lvwL+zxnkLdYDB/F/Z90AuArL+udszOKEOscorYB/3/Y7+wQVmK5v2cf9GqDRZhe8IcfnZr/nK4jjYb68jKN3L3NX1S34VeepA89fipfSoDj75D2WN8Nue20j2A5uo4GXXa0w/ylhcegoD+8I16GNGClKwvabRGjl6SzbZjINZJ84KLeC8PM6Q== 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=M4de1juFlidzEvjJ8/1l8wqGG7Xg5cZ1lk1o+SZWEAI=; b=SGHqDYVdpMmO5+WnOw88AWs8rDEZf3THl4w8P7UfQUoIpWXPATW9Vqej5Ri5OM0G1+l1loRLb/b4YqnxK9FmssgHctWccfBEm1E+tr45RQMZMB0sAQarK2KSb+Yex6Jnu2Qh89h8Yxm37AAAmRxtkdPdeki4jIjgd8fU43hJ6RnM+HVQaG4OFytw11tTOCCWkOnxQSFvzbkQZUzByxSwf4P+LygcTSQfC6I6jXg0+ziRnMJrti0FRd/OHiyBsmbRevKP/gVxAh8smvRYjEOrMaTe6sjqVBYKt+kO6ExUlrhjAtOhdoABKT/9PeZfBTZV9Cqkeld5gd1ZA8upmhB57w== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.15; Sun, 28 Aug 2022 21:20:21 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::7d2a:d9d8:f384:4cee]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::7d2a:d9d8:f384:4cee%9]) with mapi id 15.20.5566.021; Sun, 28 Aug 2022 21:20:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Aug 2022 23:19:56 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [/Fxn6nnQmdlEt2WfGch3L6zy1CtjfC7D] X-ClientProxiedBy: AS9PR06CA0114.eurprd06.prod.outlook.com (2603:10a6:20b:465::12) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20220828211957.472263-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 347eda02-8269-449f-5628-08da893b1d4b X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmrlP0uwnDwxs8RZ0OmP5JOdUCHk6A5rQg5gNV7tLE/6fMdzx857RzK+dFJikXI1kk9w4/O6Rt5foxKdjhMGmkJ72Qv1QVxKPeNPkOplfmeEZt7jW8fAEHF5aJT4ZKj7sFaBUUGJrKqs5n7K1nmC6Y6ciCQkOdKJq1VtUHEoU5J6gbKeIQ2/+f6vfgKZO5KhCqiFtF0b7KKnyIhiFvGfhAnGOPRyggx5ly1V2rPFktMY8+a5PZaufce3iNEtLqvAoUvYsPY3rSsfwvXE0QG8Pw7B0+UujJMaR1fbA2Nuyi9zn/z4BIkQzcO57HJ2R/MAjqGEuVJd6FQ9zIsVPia8g2nuH359w3To2g3xHIrGA8Lf2wAKUUPlRn7wTXdn8yYmmZd/svW+jYIqSAqTvIrY0SpbuSSyfTCByNy32epcI2V8X/yKy7v1S1NE7yGh4+W87v3AxFu/5iIY02hL1Cv7ZWmYWTOqLE8ZNOI1eTZalZxqgnCoZi9CNZj91dWItr7mZALM0no63dyc+AO601Va9keufXuQF7BJDugB1rlg7Smxji+WmPvlN0m1mYpxO88lL3X/8lPChHLNHHoQwMqxFP9uQw4LJIWieMLOkRqmnctC2l9DdkXY5Fj4taR4IeyNIJbCahSheQiRQrR9Ma3z6qK1IfRa3EeCWaKR8YVr2DCfNha6qNoK1n9zUPoJxXb27oFtvuUcafc+dGWRxQnoyh5XhO+fzZpNX0aGK3nNJkeo9TI4zpRhLssp6aDGWz6p9Sw= X-MS-TrafficTypeDiagnostic: DU0P250MB0747:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5eMhxZDoIyfnBUMSuWQJYQOkD2TsEeoJ4D14T/lH4dYVBg8Dx3hufjGm0Ixh6muIEaohCJgAlmENQMO84St0Qc+m8XWAJSoYvzArS9rFNJGhoF6d7wwqBt7+OyIdQrjlXLFv8llfsCbMGoCxTvCijARbgQ8MtI+5fwIkKrugBAR20ekoTuNYLUNJXf44KjWY8dCcx5DFNH/Wyfff3hqGUlP+cTsKMz2oyymCumylyizfuWUe0L4zzfVtXmneHpZZukFPlsdDGC+kmJJR/p1Im9OrNoEphm3ESUtVe4acdiuLqiovl9DAdo0Eszxp+okBe0vcsKrgcwDIYp23m9blmN6TC5cwBSP9/aNSHUon3tB6ORaqEdKTU1gu+og2SI3TLa8uCFEcbyw5eTZzevZnhFLzeeb6ZXYkds9eX/3EmUKiJ+h2mZIxyZCdIQkOBBXDVZPmTF8M0aOQvgirOmETurHcQsD6aH5zfjReI3uBFiEJbu+lS2gtOWP/rb0cwXRQ/yvlnE35ftGZ6EJqfzCmhK4RUR0L3gV4z+dF7uQTfQGe9DAFHtoJv/yPBSvgY36po78YcEkXGKW+vejg61B37h1PFSdSd5ZeqQGfn2Rrae2KUVy40W++ldBhnFqj0ZTmNjboOyclsSU/HegMXcr7RA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OCsSBIFi7I6gP4JcOdntHUDra07dXmnQDsLVEsjlYAGaDPyPNxhYSrNJy8lV+fwh82NNIBhzY0T+ECeMg/vlkfRiXj3oHL/+XZLVhv6WEkBnmTOeb775yNim2k/muEkUFnZnT+aS0r0mAzAZqpyUyGGE4yyy1sVVQN1Be5Uo3GOoWkQYKmIQDj0MZ+JMnWMpPMhJ1XII2ePIGhLjcSG8kkYgI+p0opXB+vgsDtq/Sn1tXsNGSa89bMf+sF5VoF5wbtfVqnKExyHDZrNSHNk/lmLag00dTAFRF+POIGWLkoF/ES106r+8NgR8ZSnhuwjQmAbbG1JZ0E5x357HdHOpC7spiAQnP0ukAv1lMc6qwm4BH8ENdCx6ManG7YQQ3TuD+22ViXZP809Iv5YUhzwHIg7jMkt4PmyVDEGfffryJNPJobdejFD2sHvmzcvM9Jp8tDMjWVnkVT4d6WdwS1zhTiW/6Mu6DO2qku9JV/NNOG+GhYB9+e48zozwuvtYYZA0gMyurEd/cwdJeASMLd+ATbyIZoWPkWGsVG7BnQJnB77XbuzaBfXffFODACytROsfy0Zv17X/pW/kYFGCv/Mh2HtxG9SUmb596uC/v1n2kHCFrAuikP3HhbQmDlVhMurdkMkO+vmiCo6fclh0SmvjNvWkaNgSn34frijDXUNN8O0akmCq+YTD/ov6BoY71AAGcf75wzCSLoMyekgDo31ETYG1P/lEm4whA6HZGZJyicdOPsCov1nf7Vlv1NLMe8lW0fKoDTSqysPIi+XPNSyCj9cwhd/3KCpx9GYqhrDeBsUkwmbAOsAdA2evjdoqDYvpoUHeVrDTIMIttoVGEM9fVJ6Dtw8jCqAVI3mmu3l0YPkE7ra4gDZ+BX5aRn1Zo9orTCvbOc1rN6EDxesONqKkZXGR3C4LT6hd6EOUzQw8IpUFsS8VtMQcIbHKr0YRTSzRoRMphDKEi7vwmo3feaugbVzrjaj2DTaCL62VbEmzrpkd5LWturbcVS6LoibIpY/hS3evJtkAqpt9eyLxbVADrXB8mxdgtIFW+UsMNO9vU0Ft0qphpxjniyOF0ynBy9efBjTjlEm/+mUq4+2GJl1STUCQP48Fq9/rYz1izkY1FAw7cfVBb8C98DRy9zN7DxytRZGvN62Afia+vRCMy6HOxczDZMPh2BXKm4sbBbPF+6ju9UqJs4Jgl1U+eD7czh298ptlkQSCj3+Bgo4IWE4cPufjgMOZrf9DARpUSUx1JM3Va0vjNNejP3yHEGoAwSVWHxZFqr/9Gy4DGC5RvtNGmD58tDHUVoLuC3mz0Q02tno= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 347eda02-8269-449f-5628-08da893b1d4b X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Aug 2022 21:20:21.5617 (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: DU0P250MB0747 Subject: [FFmpeg-devel] [PATCH 10/11] avcodec/encode: Avoid unreferencing blank AVFrames 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: p6gnzFZeszM5 ff_thread_video_encode_frame() already returns blank frames. Signed-off-by: Andreas Rheinhardt --- libavcodec/encode.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/encode.c b/libavcodec/encode.c index 2c02b24cf2..8c6d81286c 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -263,18 +263,17 @@ static int encode_simple_internal(AVCodecContext *avctx, AVPacket *avpkt) av_assert0(codec->cb_type == FF_CODEC_CB_TYPE_ENCODE); if (CONFIG_FRAME_THREAD_ENCODER && avci->frame_thread_encoder) - /* This might unref frame. */ + /* This will unref frame. */ ret = ff_thread_video_encode_frame(avctx, avpkt, frame, &got_packet); else { ret = ff_encode_encode_cb(avctx, avpkt, frame, &got_packet); + if (frame) + av_frame_unref(frame); } if (avci->draining && !got_packet) avci->draining_done = 1; - if (frame) - av_frame_unref(frame); - return ret; }