From patchwork Thu Mar 31 20:12:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35115 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp294507pzb; Thu, 31 Mar 2022 13:13:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy2iTIPa/hN8wnMT0od6QGof9nAxgQN9kGL/F72/GOfzRcDfXH+SkpKBnsrO7EZJZWtoOF0 X-Received: by 2002:a05:6402:1d4a:b0:419:7c50:dcbf with SMTP id dz10-20020a0564021d4a00b004197c50dcbfmr17829568edb.340.1648757602419; Thu, 31 Mar 2022 13:13:22 -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 qh25-20020a170906ecb900b006dfb07cee7fsi385492ejb.11.2022.03.31.13.13.21; Thu, 31 Mar 2022 13:13:22 -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=TVkZVyty; 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 62CF568020D; Thu, 31 Mar 2022 23:13:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072107.outbound.protection.outlook.com [40.92.72.107]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 093BE68020D for ; Thu, 31 Mar 2022 23:13:09 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mUJZWQ7QbdVwZCznuQxVQHnRYKCyMjz+XTTtRG6u4ghg1jnWmTdRk8ABzbA3LzploIgRTJifRPq5qSTir+tEGGhDsF94Dbd5AU9dxY0Mf+VU3v/jrnVotuUuHho41GnvjGK/H5rsMOkVPTnyvDolEqYxxM6A283GUxg4Kn+2qOuLMwse1nlSP77jLvbI6B6bOHTBdEqNQQxgiTFzVGNLSloB7pnxjV+UZJHb4BLjs0RgbjSeDZZUSTBfoimpOHIuZoN5IM6/LSuI8rljFsha7Nz7jNMaJUtJ4mcq4eTeE10oUb9UaYjxYo+U/9sWfLqTqdAxysy5yHBVxTRh3pB/WA== 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=PNswz1qUVSjTtBAud3eSUvlVh2BWdN/8aDudxrFmwUg=; b=jPhyJElw2Rff3ZwN7C2bhKmSank4+olUf2jLVKpsswZ7xwgnieciR+Iy6qNc/25KhDGDaVqJrHfSZB86AO29hIP2cCo3/oPv8qwoTq47TayATg/EAgWks1/A/euqHoB1riko21txTISErvfpoq9HBgzysQHsFTAW5UsRJQ5heOlyrAGyH8e+W49r32TuNwy/sV1FIqDZT7AiXFlri6weLsggzxU2iTLQZPzP3jgidvJyBLDgk0MsFNtyxJRtWqaUW8vJOoF0ZA/irs+0e0pmN5GoBlde+HtHi/lG8r+2krcBWO3+fDI1YIFlnsaxANE21LJtmgJQt7p39sDb8OfZVg== 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=PNswz1qUVSjTtBAud3eSUvlVh2BWdN/8aDudxrFmwUg=; b=TVkZVytyrvMyw9sPw9DC5GEfgGb7JaDy0gfcklkOftG1yeU/S+yeaV3sUnr7YPiVW2eC91H3AsOAZZ/QN0v97DIME8r2u8EX7Uga9Wag4AGBdakBu71yhdpG1irwTQSiVv5uYypz/PRKGjZolbwIAqhpkZxuwhR0YZjHUX6qyQF5jNyJZdzjGAMl5FzfimjCHT9ZMLcIsq7n3XouZedDqgsox75MJ8yFABPBrjcyXUtONSBCxNxrZFHbn/4oGV/dsr3d35Bwa7Qrqbdsb5/RIDLu/7sqQV+wD+NEXz3vIO4hoaXPx2Q+9P762BcLgDln9tb9RL+9p0AX0O8dSxASkQ== Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) by AM6PR01MB5158.eurprd01.prod.exchangelabs.com (2603:10a6:20b:95::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.21; Thu, 31 Mar 2022 20:13:08 +0000 Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com ([fe80::9070:a5fd:e532:bdf8]) by AS1PR01MB9564.eurprd01.prod.exchangelabs.com ([fe80::9070:a5fd:e532:bdf8%3]) with mapi id 15.20.5102.022; Thu, 31 Mar 2022 20:13:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 31 Mar 2022 22:12:58 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [VK3VG2ds2ii6HWA9EDtEpg5p0OZI2iJK] X-ClientProxiedBy: FR2P281CA0022.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::9) To AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) X-Microsoft-Original-Message-ID: <20220331201259.665495-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c62793ff-4472-4e84-0356-08da1352dee0 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTioWqjWavlllrypNQF6cxLWMcETpAIOuzsFjMUwfpJdHxyQNsMZi6Vqm3O4GgnZVWTN4O3LkGekA4WAVz2EGA9BM/Inystec4LIkgo8MTXGERZ/POJ4biJjt17QN5yxDo3GeAnxBzfTAnrm+vTUwLgidLk21s3PQP2k83WB8crlon5/b0d/JA4RjDyI+YnwTOYsFd+/abu/RzJCatCUg/XdSWFSdwX7+RI4qyrWTGmhgSNKaLvbyw4yglaMUwUfqI5+lp7Kn0fYTEo95XfHRtKkiPXkLYwD13mkJFQzYk9rnZN3OpmnYAYq8HEb3yQDzsIUXkRK+OlazUDHloor/GT02VkYdQ4jU7/K0SM71wsEkfHZ8Bf/tUgub+tavXQYwuIvuG0cPfJJyJAMsmemCdlOZkvMkh6oBjwldE91C0JByzxpY65uoaTrxfeWda3df2LriTANKKlBee/PKY2nn9Hicc5gvLrgqBSRf6iA/mNQNYb3SIZd5t06gSd+tomBcPwk6sKXCrwCEF3ZCCYOJagJXUpgXQiCjCU3O4cob/iZVTXghzeyOaSFWICT/Nd6dCuRpkEnKBr8NbglxGqFAaO0K7Je06psKDauSdpWcv/VjY+guWVUVySV7qe06cZaw5qD3YgcW2he2b3/u+eImyLcCbCL1PG4vDuJiOuto2bIrJiltkOWDuR4JS3DJ3OgKMWcgYGnM91e5Z2ces1zd8599VMzR9o1r/lzBGfK8B/Jye2vlZ5gB+5MxwDnjdQGac= X-MS-TrafficTypeDiagnostic: AM6PR01MB5158:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: g37eo4EVZEGTNXZ4l3yOVDt3UKIPbpEsW0xDXxH+b7Zcl21zfs6O27NNlNk4y5CBWKEQXCTT0EbsFAeI/gU/zUZtqlTT6CaFRQcjmufmCyBboBxAO8p2S+fEKZAtm6q8oEQ1nj+U1p55/Mda8kDfTWygyDHbvj04dqlbnE70eOd+ZkddCQvOfsTaHZQcslkPw77O93VmyR0hpzcCvFNO/4QcIqAtWn6HoCL+wbqVropmSlvu7FWlNzUQRDliucEzl1gHMSkowOQeCkiUbEsXtQm5I1cyKntVBbd4MqfpeFe9EoIgBkrgvLfRcOINmokaN+sMUpMcnT7q68geWXMyKpMy53Oyp3DP78hoU8vm/pUq4pu4ok6rzVUFFfLFFDNiZAJgYtE2QO5Su4w3eY7/13fZtUEx7bQnqWyx0XAurOR0o2poUcsHmZeauHEYzRaUoP1RKeE+x//5lmRzfJz+SVc84A8IntGcMyYaCBaZl83xzN9n1mPefKTIfBimVfSxXr5xM7OtYebN8U46ELoElX/bUkj4eXOo49sIQEw7+5XHAhS87BUKfJfmv5tRE9EJFQrCnQ2nhY9p4W4Hp2V1pg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZWlf8eO1yTtND+hU5iEw9FocgFGuhGyWH6j0kGRkRqmcyM+FIe3P/7lVgioTg2NU//rnO8HVdyCV/VOQO6J0dN3960ELbbVGmRMIdZ7nRh7JRGdXHQlVerYZqRdoX7QXVSrxHOXS3EzHiL7XTHlomeegk+Foz5PqQZJmUDtfuJTFZSUTIPOhG9dhL5P+p1cfXNncjsxr2qIXZPb9cf5e5chFH8Kaz5pkPahMLbHXYWfvvIHYdfYBaGnsn4eqHQTqqkFfDVatQ8BxrKyFIfpYP+NUY0rgcnYiSpM9vJLCiTXPzxwO/7fDMDROFDeZ8e3suVrXM0ved9JCn3waR14MTmE46rFUtDXAeNtqNOvzbMAC1gXIjCXVnbd+bboBN17PRJ3yJLJep0pejquelMSbhIWFWhnjpJbijj8eTQkIq4HmKP5VajrdchIhotAT2+i/Ki88oC3Ruq9UNoFxFnwRZPk8NGqIfMTV13AYXXc+VGmZrwKYOrONS1oDNhDeWcJ19ewiUTrF9mhVQ4aPonFSlbQ8XfSeAfSUH/9SIOZGgxubOkj5SPDRyfdP0v1M5e7CuYm5eAJvsKrjma9ZE4QF+3YAea/4hkmmDAA2/5kxGFZ7BkI8yMARj+QdxxF61JwqBhpwXW30WO93ZG1IekPfaE2Res1M9SQPqPJ0YsuZvWMc3Gf6ohE9aIZowlYHGm49dwBlKli9inQ4KCHPvh1MdP3Q3sdiLX/sDicxzYyaY/NdVyG6wOBxwBf0bpG/vPJ2UGAGfDDj8caj84t/ulzOF+JxgOGUpaVXo7F5IRbN7JHgQoRiLwtZMLkfEk3pAKhPFc31ce0nZzaQfdi0Kgx4hK/1KJwKJGE9dP9EQQTBh8zyT0VaHPRmxBnuVgFnRq9QxUcAQVm8qTeA+hWqoFCrVCM7TFgURYVPHzpfMY5/kEqdh1F1fWU7OWaqL7TDeeO8Gwf7aApqk/5KZDGzekbrI18WwKUsSjiLbDmx/uwZuAKCNlXKrMs7YQq6OjLeXWZrmHoRlfRmVbYp18/wCLb/20ntiVIzPx2jrmTUBFElH5lXlQqdJqsDC5LKn5nzDzNN5SWbyDkHc82irNXMxQ80BmP/Mt49X3KJczT0AM23oUEQxYVTjppZoPGuDKL2Ix6ze4tH8foI+SxWeoEYxJ/NhmASFNKUEa0/+pYCIxVtyjHJwGerXfYbcwTt/S863yNK4Jw8Iy0vVX9hkQc61/SPfVNJToYyapEpHSu45o1XrYIP8ox8rxqlxxHayyrc2HpGBzmcY37EKIM2JltReRzCa7cDqqtEuh+q03KM4HTacKIXUe6MHhwH4FrZXJQGZhEdDVJ0cOeDlfqMiRC9qO2Yq53c0RYVK+I0yQ1RiLnRw9zr9bb6wZvm2xjLnJWpN4D8H+KkXYtaEb0Gd7/YFPlinwSIrVHF1su2mZewaBN0TQS26bdlO36DCWlIa/jPbZ/f X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c62793ff-4472-4e84-0356-08da1352dee0 X-MS-Exchange-CrossTenant-AuthSource: AS1PR01MB9564.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2022 20:13:08.1469 (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: AM6PR01MB5158 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/vp9_raw_reorder_bsf: Fix leak of cached packet 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: aeWU9i6E65HH In case the BSF has not been drained before flushing/closing, the context's next_frame might be set; yet it is not freed in flush or close. The former only zeroes it (which automatically causes a leak in case it was set). So do this when closing and flushing. Signed-off-by: Andreas Rheinhardt --- libavcodec/vp9_raw_reorder_bsf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/vp9_raw_reorder_bsf.c b/libavcodec/vp9_raw_reorder_bsf.c index e7d301cb85..368dcb26c2 100644 --- a/libavcodec/vp9_raw_reorder_bsf.c +++ b/libavcodec/vp9_raw_reorder_bsf.c @@ -396,7 +396,7 @@ static void vp9_raw_reorder_flush(AVBSFContext *bsf) for (int s = 0; s < FRAME_SLOTS; s++) vp9_raw_reorder_clear_slot(ctx, s); - ctx->next_frame = NULL; + vp9_raw_reorder_frame_free(&ctx->next_frame); ctx->sequence = 0; } @@ -407,6 +407,7 @@ static void vp9_raw_reorder_close(AVBSFContext *bsf) for (s = 0; s < FRAME_SLOTS; s++) vp9_raw_reorder_clear_slot(ctx, s); + vp9_raw_reorder_frame_free(&ctx->next_frame); } static const enum AVCodecID vp9_raw_reorder_codec_ids[] = { From patchwork Thu Mar 31 20:14:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35116 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp294917pzb; Thu, 31 Mar 2022 13:14:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx4f2Iu0hWoH6qHOzdt7XFclSInJc0jUYYC1kQ6MGMrBqUksvBJRKLPn3xSOnwvfcQzZgRx X-Received: by 2002:a50:c099:0:b0:415:f5c7:700e with SMTP id k25-20020a50c099000000b00415f5c7700emr17924944edf.205.1648757669925; Thu, 31 Mar 2022 13:14:29 -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 mz14-20020a1709071b8e00b006df76385ddcsi290395ejc.636.2022.03.31.13.14.29; Thu, 31 Mar 2022 13:14:29 -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="W2i+7/iL"; 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 9068968B235; Thu, 31 Mar 2022 23:14:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072062.outbound.protection.outlook.com [40.92.72.62]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5B03C68A5B3 for ; Thu, 31 Mar 2022 23:14:20 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WBtzFMwE8MO6ki6c2wZs5tj9kXvLyxOTxPy1WSuINL3vwGM34+FuOleJ6s1CG6aaeZtVac1isaFcZpJ3oV1pnxbm0eyHhedonwaU04otnJCrTDVlsvmN91iCMn7w0NqmjcsC+vANnUszeLPm4bzMs/iV1VMYnuy9bqHmn6hWSXB+nhFbjsr7k4s6ENmD+OcCOa1CP4nyQsyraUFn43bD15Ocx3qd7JnNgdCBqEgiiiz3LTQ0wWzXdAONqtk+sf7tFo9cfIbkWuGlJU9i9prwerYOpPJgJv+g4W9SkPYaCzuLAYh0lcwBW0Ytl/lBMpikE8fiuFL3w1uDmHUQMohSVw== 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=XzmTVxmwhWqN7+ffI4T9FmXHJ1w+nGN2fP1cyad95Oo=; b=HiDnNpzPwAU6rCRbyYBSKFyTXY4Tpr4+rZlrxVucMRe8ZOdqrmOTM+Db1jDB4Kq+FBAMAYZjwNVMhwfGs4ch7A3zbbBRKT24NfbqdN3nWjhWKgAn7VDdzSoIUVEDP59Ig5X/WSjIjiPhoHvNHNwiOXT214TlQw4A4HwPYH4dy9lohqxKZvu1ZEXuyIqX6rXg71gC0EVD2llckpyhxLF8miAb539Zz25oOlEKe8AMHn0MBH2vqlWoOJnj3q7qeif798xF62kVT9xTLfF0loOFqT8jr781ycOKVgE7jMMM1Qx56FtysCQLcyLydqEccUJJSbPQZSCHF01Njwu9IfR3Cw== 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=XzmTVxmwhWqN7+ffI4T9FmXHJ1w+nGN2fP1cyad95Oo=; b=W2i+7/iL+F7MqXUOK4k4lrfmwARgFGcM1+EcJtsRatVzNqQQg80Dw/N9kejaS1+JaxmppUvaVtEQrvJEelTslCuyIEzosJxoSAtIQjH/bob4MdM0yKar7kC4RfqtodohPy1mwFcLXh4iELpmRvmeUMUY52Oo0Dt0RWjimoMIjKlzm3ZMvzFYVfMS53yLRao6sEFjKv7TLpzkOD1Qh9au4BIXdZx1oWdDQRpNEHtw6NFxgf2zhw7OUpOeIxV6FvTobSez6Nuo1PSxtuXO4Hyji4675vAJhVL6ttdh1ramA/lMeskDI9k7MgTHLiA3MsRfKB3ODR+3oFFVzVuLPKpcrQ== Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) by AM6PR01MB5158.eurprd01.prod.exchangelabs.com (2603:10a6:20b:95::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.21; Thu, 31 Mar 2022 20:14:18 +0000 Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com ([fe80::9070:a5fd:e532:bdf8]) by AS1PR01MB9564.eurprd01.prod.exchangelabs.com ([fe80::9070:a5fd:e532:bdf8%3]) with mapi id 15.20.5102.022; Thu, 31 Mar 2022 20:14:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 31 Mar 2022 22:14:11 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [a1It6WNPeKVecbU+tscp6c4qePRnul/I] X-ClientProxiedBy: AS9PR07CA0005.eurprd07.prod.outlook.com (2603:10a6:20b:46c::28) To AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) X-Microsoft-Original-Message-ID: <20220331201411.665573-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 28372518-a43c-418e-ddb8-08da135308d7 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNU3D1ocsBQC3N/nAWQbgq2xbmd11PRpA8WJDNRV2Xl1COt3PxNSItsH9aMJTIdF7rI/4KVyXcNUknjs35OTH4JHAagcEWO9kQrMk/d5gvuU/GKT7C/6RWVLFQPXUfiaJyUugtWqNGKrDiYUfhnlLadKkjX6JcX33ZZzu5LOmK5tNkdRHLppCrfajeNol4S+9XQY5IE642JVdHMnJU0/O27vsVAs+5TMbDYYL1F9uetHgUw1Hwzyoo/8+/S4/1n+veBL+fp3X+u6IpwtmQjh3VAztDF2pgDhXMk7Gw+K2Pco/Z3NDzEImkoMlrc8HBicEr+hrgwvrtg0L2hra5OabJXKZRVX1r2g3yiLDno2FytTAxugzBuEVkLe8YCp/TkGe7YIPyrO9e5klHYC21viJg5uPuKUk3+W7v1qG5DfIk3PbhSQBII+Q0m3UDrXqq39C3XmD+zQ87JD9ahAWj09ST6kP2MM9BU8nzZqPIml5y0Zpvs9IOFPlX3Q6yvGm8BSxjhMUnUs9Ys8IA9QNf+lXxx+kYvXul34BTB1G/8YoGA7roAS5PbfS+fcrWsX0HGFMUzdBPE4QJ8ncaHl6/Z9zrZiopcp3pVvwuJeSO0d68Nbfc4EGZ/09PIvn1bBmMV0VoKjudAlzLXIuGUAMWSXjfoLPY4vH64LONQSM06M02eDD3J/6/yz3CMJNh/V8gJizJeekeaKlFeRDDWWvTgr2RHhefoQfNGMNcQ= X-MS-TrafficTypeDiagnostic: AM6PR01MB5158:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ORtw1LdXY+nbWY8RQ9lEeBQH0ewuvDfcnbmuCZjLkCNsq5FeSYyQ1NDVXiJPBsnC097ScTVu98A2RjNPqrd+sdXPY+j2HpfiAeMOV6g5uaUMfKpN/Shgl566iHCdHIW4Ih0eJXNkB0bW6JkYDr/XmEgzkumslZnD+KiswdEyGQUY+0KPGdzxFlivVn7ee0hAJWFMjSHqL7HNp8rtpavLKAAA2hkUY5APSff09OBlrYSCna6McH8kvV07Onfpfa1pIsw5OXBTbxBzjNiWPrN0SeFH+KaPQp+4fBtf1hLJ5DWgTmYL70aiU0S9U9LWUOzkLf+SRN6d6sW0B+HqrKGJg7I2YEm7fwAo61aAkTQ9Y7E/xtfPX/bVuzz20moO4P92GAhqgM5KnUdvVMgZdKefs/RmE3h8RRwLOmNDd6Y2MhSVRKOAJQjXZrZiUdgWv5UZaVltXh7Qrw7T2JVBlq2/NIBn6jWtYKFMO96+8xQshbuFwzeauhAGBRPtY5ZtFsFoGtiGUAWOSLCkCSxcDsRLQ6uM8IKEE91CcdoZFcZ6gK8AaiM2g+RUDH3htPbwZJh4+A8CwutIud5l65K+tmGxHQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ceTnSEGXXCZiXdRRMKD7j9D7utMS1JFsfh5xwSBwZfblpjTo3/0XgtP8r+HLhy61eENZg+ECRDMIalZSwpWROb3m2BudZRp0AN2xoPCvUH5aavfKnX1CiRZEXA1G38PINKy3kTQXE3h5SKGdvb4yyk2ZbzE64WdAC+K6lp0q/UZatabLXNQY1J+n09q7v+y5sltLWsL/15ZqWDeVIkm5rx0x6b8E3d+YmALF+tzOlQQRQAj0zVSOj/JR5FQCdEynZCpxeoVFDG1tVnzV+L9kE4NLJmmuvhnytYb6aofq4bDq/uAQ+lO+d/D2AoKNNmO+KUV0dtMVOU76EcspymSK7zL+kdty8yUPJtj1GUbm/332UU1nQkxt8CA5+x9cJjBhSo9sfFRtJ/QpPmjRnaqKNfn9R5kAmvR4kb6n7+kEn0ClAe98+bOyi1IRBL3RotxvMfYxvuWW8LiMUW7Pe1NAglWaBjEuWXuSONAGkE9ayV5sIkMf58aXuzaVgBGaPT0pggXUimq6YzAH9tVaqfYuE0N17ruYpWpbSlXHgMYJVi482wHYMNpNLz34gfmLs5+PnYzdEwOMoni4AKskeAGg/AWYeWMCA6c5RplodF3eiItSYc490GHFZ72k8nMqOrze28vbjFnegwXaxR6nuKs87DOLd+1rN4vjBNwX2Kw1EkbvIzGD1NuaDPShxmNFEErfyHcmcK9cPfCs4ktDgUQ0ohtTA4bKBZ/Ucb8p80jH5jAWF7oeDoCEUcIU4KMVa6QvzEYAUbQk2MdJK46+/t1kE+tpXrK0FTLD8MJCzi6/RQwPDUYKlG/yQ5naVIIHXyrWm+pYMbbZmzk62cMUiC62vp0Sy73pMaQM4/sKXC7ilyue51aWlz66vqthPjRPao/9KyaLRrCwXFhVMAYtnHTTiksRyMFu0aBgJ0wny70UPeCMYYbuYOIPSglYjcSr9wgPV9sl7bh8I5MeNdLLK9j9aZlG4SXA+mlFVuWt5e/JUec3sJ4Dh/xEh5Vh/Ll0gOR/oStHNcLAiRgj2Ud9B46KAsEUP+7Say/D6tXlGhzRJ4iZCLOehHPqunmEEHfs1XqV/H4TmPLBpviok+YRzocGb/CVTzAJ8UOgWBJ7I0Qqs6T/3HjNmPkbOWy4lHpdzfdGkNBKS9KKZl7cXNp73q0oitrvoGUOtYQbZux97yhbYTkEAKlBmLV9nO8uS9oBGBQgyStxl0Gj9Afku6kG9ETIDfLB8bvmJoSDTdjPtdb0pbVgbKWhvhXELPZdGAdpI4SQO0OFX1lLfJfV2kRftyZbPh5HfHiEZ5zk4ednLs9rc3APCKnQDMid7ZfEd1e5cNNmwxiOJUlaNmRd+OfKacRNiehsejL+Enk3AtHtcFin8C/C/zkalcXm1214vg2OoWu7fpPfRbAkWqr5F/9nxkO2X3g7UxxSAhItuHROGwuzTMRgUxSLfUklBwA+FATJc5uZ X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 28372518-a43c-418e-ddb8-08da135308d7 X-MS-Exchange-CrossTenant-AuthSource: AS1PR01MB9564.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2022 20:14:18.0267 (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: AM6PR01MB5158 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/vp9_raw_reorder_bsf: Merge close and flush 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: w7yX00JJm1CF Also mark the function as av_cold while at it. Signed-off-by: Andreas Rheinhardt --- libavcodec/vp9_raw_reorder_bsf.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/libavcodec/vp9_raw_reorder_bsf.c b/libavcodec/vp9_raw_reorder_bsf.c index 368dcb26c2..d36093316c 100644 --- a/libavcodec/vp9_raw_reorder_bsf.c +++ b/libavcodec/vp9_raw_reorder_bsf.c @@ -390,7 +390,7 @@ fail: return err; } -static void vp9_raw_reorder_flush(AVBSFContext *bsf) +static av_cold void vp9_raw_reorder_flush_close(AVBSFContext *bsf) { VP9RawReorderContext *ctx = bsf->priv_data; @@ -400,16 +400,6 @@ static void vp9_raw_reorder_flush(AVBSFContext *bsf) ctx->sequence = 0; } -static void vp9_raw_reorder_close(AVBSFContext *bsf) -{ - VP9RawReorderContext *ctx = bsf->priv_data; - int s; - - for (s = 0; s < FRAME_SLOTS; s++) - vp9_raw_reorder_clear_slot(ctx, s); - vp9_raw_reorder_frame_free(&ctx->next_frame); -} - static const enum AVCodecID vp9_raw_reorder_codec_ids[] = { AV_CODEC_ID_VP9, AV_CODEC_ID_NONE, }; @@ -418,7 +408,7 @@ const FFBitStreamFilter ff_vp9_raw_reorder_bsf = { .p.name = "vp9_raw_reorder", .p.codec_ids = vp9_raw_reorder_codec_ids, .priv_data_size = sizeof(VP9RawReorderContext), - .close = &vp9_raw_reorder_close, - .flush = &vp9_raw_reorder_flush, .filter = &vp9_raw_reorder_filter, + .flush = &vp9_raw_reorder_flush_close, + .close = &vp9_raw_reorder_flush_close, };