From patchwork Thu Dec 16 01:29:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32651 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp408048iog; Wed, 15 Dec 2021 17:30:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJxHC2K6kkkHObC5iYuFWKW9ImpVuJBrfAp1bn9u759ESgZT7bLnN0xEo9AWVwV8asHgl1YD X-Received: by 2002:a05:6402:1250:: with SMTP id l16mr4558605edw.0.1639618225940; Wed, 15 Dec 2021 17:30:25 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c11si2593851edy.247.2021.12.15.17.30.25; Wed, 15 Dec 2021 17:30:25 -0800 (PST) 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=ttIyFPjX; 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 8089768AE5A; Thu, 16 Dec 2021 03:30:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2048.outbound.protection.outlook.com [40.92.89.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 34DE068AEBC for ; Thu, 16 Dec 2021 03:29:53 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZCN9kn46Am1v+0M83iVvok8kMyFZuIdCdJ77C2aMvS9pRTXCLZ5Fg0VgG85V+NqXyXtWtIopCoG6SshcmlCe/lL8UDwjh0AwXow+vkGxXXx7u/K0VJKx80OHxJB1RVtL746Wri8PDEyaQX0ZIDcLtFu8/g0GnUWM7luQRaWVYcVT9w2KnK/72agn8hIf51X+AFwHpIbNQ12gcdI4qkNOR0rDFUSIvUhwDNgX6W0jUxphlltz+JeNPLUWADvrhLV2SwPRZzlP2A7yGD7OBjocB9oR5eesrwXkaU/b4JTWCxenqmv4awEE7/uiI8cukAZqrmrnhMslagKstPM9s03XMA== 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=u5q6XZHSel6VOXsTKOgR4tV/ygPi5o/GIJ5R/Dxoo0E=; b=k4gS/fv+tmbQZ1uP7oJ7KX5YRrFBcPccG/H5Yc6/l9UIdKpjTGxrt7D00vNERGkcmNAIrQERaiYIom6Q6X3C7vt/YH/atUlAyMTNaPwJ3SyUawGygNPlhz3I322oPgAozQkc2GtTTd+em7KYExXAXtCdORA1cldX8+FRFcNSNQzppSl2Xl4ix7/94zTfyt5F/utA5d9ZKAWoU/JNl7Kk0n6RX3fawn+uQBx0Ndez4PDQxchkZWQhMMWp3HU261OIBjya24ZX1VsN5Np/+M58Jq3733ro38uq8+XrI0R1/LhoVvGKGhp/av9pBvgAc4at5/sDIix7tRQxzyp9KMU4sA== 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=u5q6XZHSel6VOXsTKOgR4tV/ygPi5o/GIJ5R/Dxoo0E=; b=ttIyFPjXfU+Up/fJD4MPamr0H3t1TjOl8esH5NOCXsmF1NAP/1g6ZQ0tJvFpyPE6V+fmm+hl575aiUDwY26eb4zENnBvd3834WglkJCn2q8GakSpnUxVXkJ+sGe/USGha+lfBEDJinhiD+nyHLsx8WVz8doe9pg8cEk6Othf2pWPKEfzAOdcJevkQxPoBpkxF82a8Buv96MrjEVA908apJJXL3A3u9uVMGH+kfC86ts6NVtS1/PXoHS6OQuhza6TUApSz0jhd/IFrrDflb8/1jjgM9H6Ac49RdppEA+HG+NEQlMYmZIYXmSAScrs8Y9HWWm4oC3rqiq8I1m3Px9unA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6628.eurprd03.prod.outlook.com (2603:10a6:20b:1bf::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.17; Thu, 16 Dec 2021 01:29:46 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%6]) with mapi id 15.20.4778.018; Thu, 16 Dec 2021 01:29:46 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Dec 2021 02:29:23 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [mkjRGwxCbTTQLvV7QpCPDHvpfwRE26Bw] X-ClientProxiedBy: AM9P192CA0004.EURP192.PROD.OUTLOOK.COM (2603:10a6:20b:21d::9) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211216012923.404907-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 76fceb86-145c-468a-dca3-08d9c0338b1c X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1JIv/JhDjmDHnP3Sz7aBkolAWITkatEl0UQM0MxQIQwuHEyz/WWX8Kl5YFWVgt6tyN/V9Z4aLURHDyWH/yqOioJf1MAWLXWThRlYXJ74QcZmcTD2dhcS0nBtkZ7C38j0ZLiEBrsl+MzzRfkAisuZYBPIoyngbWJvwtaR1pSOQmK1eHQXdQ3VjHf1whxNzCbJdJxLUCiIA4iz1FOgOTbCdrsvOQK0+5hD+DGf+ZqtaaKTA4wOqQLCbT+H+yJlpR4eCiZNhoxG4r/NbbUiE/auhku/zQBRR0Ram2z9OZtA79QQBNfFFy+jPJXHOI8qinAHe04Lr4RR05wO+OsQarDKFwGUZQT6MyKh4Ec0IIFSjZsTT9aFo7Og4vj0jGltMA640BzyeFG4ZT/EIPvQlefhg9ZCZ543Zf+oHUUWKlFJ5EJlaUl248Nfee0ZHTTV9CgbPww83vV5vYg4JWcLB7erQS+JmPqW714tAOB/y1bM5wreiww+86NpyjYZ1DWeykAVbNdcckAhIeMaSkidoAOPadiKL8fdzc8T2A/KKAP5CNzZ+pYnEhwp/K/kL+1vLsBWH+Tru+xrrYLIkaCasU6AluFPnTH/BT7v4ofwbe5iMiZgcvxJUewWzASZBAZEIHN/65eQq596G54yD1Z7ZBIglLcb55IX+drvGDPB+jEbZG36rnGZuww+SyG7LXBBY7SJdBehjGNPG4cTiMA0HTSa4mRJH09xoWNF/PyOfNOnnQnuM= X-MS-TrafficTypeDiagnostic: AM7PR03MB6628:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3Y7+j1k5h7XhxTDgv5SQ5X1Nszl3H5jAbeXuk3Ytun5gdIm6zXSxM8rYctUlcTq/hvGGBS1zNb1NXTeB8A9f835+txeIKXHj+mVJZNWo/H2yIrENfpdSDuzJhq/eCortA3WL6k+vL+LDKAXGDwvZM3ryMg6e3CMdy6t8ltozkHuw14oBcoXDQRwXuB0TIkPDbWr/XBHaEmk8Yxrbg2ebioMeA6L3Vuit10WiL34jLkZoJwtbMYaoClSncNPJc4m5m4fgLsg7KNnD8pvR06SjTA9eZpkoikwN54KW+UGdGDm+QTHUITxlb7cpuZmKEfSWSuRz5ejMzXpT8XXiEsqgHZqBeDVPGe9CTFWWkdxY45PIz9Kc2bTdYm/xSRguilmB0Bd7uJs+5IZQql7odYNZqbtZ0FEOzgPkfbMh2LbEzrHhOVGQcL35nF5LhzQud9JnuHxFOZcW8gHX93bFcyhrG2GsGMojykUVBuHK8rz5Xri79Bltg8ROZVh7niQO2upykSXq2IkuszboW46IcroijD2hGQFUhExJzXw1czJ+cH9JdWmlOU9ypfQq9xuX5rDTAbPaDBNZ0u1OxrUOnLv3hg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nObE4FV9aM297mBzFtjRxumjUDo0Yb8Zz38R9UDvh4jpC8DboOsI7FNhw8CiC1tnqYuEfTrZo7xoPMQAbspm4DqL/T/iI16NTCvljDvwD7+XiZNlt7A0B0JgXBURDEezPlykoPg8I8MSNGrhEepx0SWsXxciZJZ3StdSEulrGPiJo38pqNuMDj1Z8VyL6fOIEMDsOJHvAXOVkg1mPYDqePb8nyNEyjxudAWTUIzlBDVxXrUTDs/4dP0WBwmbxblbN+74wXNLq5Q4OAGc/UBBsx+s1/6TKsiuwN2/2oRdksh90QLU7RUad1jB5DqyvSrN4MvomDZoW5dOcgMCu+aIIm/aYLaXhiowIHYqe5RZLL0yYct2TKuYsXdD7W3DOicMOLmfGkD3dgdD0bMql9J/LbIkAbdg8TOyUYcKGx/f6Cm7lblNyMF4RmJ1QkxxxxKilNkM+t0JlZh5PCjCM3ju9SzjjVAbOAuJfeK4nJXQ0+7zakZry0Frb4qzIZ6dyY8pWOBcswf5ZXBiR4C3Ka8lH/aUF9V2FNE1HAZLKsaa5FiewtW6GzwOJsqb46nNqt3qWr4xjt5rpF3LT4NKNytwlj1xrRUyyPSNWqENPTREqbOnJhTNB8TLaxYposSLvsKBsgVzAJyokf9ie2DzSVfY8/jKnOe/5wnTYjU7e1ah1EWr1Xi4PIUoicn8FOHc1JDvyqK2NTeBsd6OgCpfeYQohm1lvczvMAGKT6pnSrYW1xZDBCujavqGSnzhZmMYgy5XGl14kw8H1yTqm5V5kyfuBOI/ArjLKEs0SrxWhKHkStm+oxKZxW155gfPzS6jkA/UHVxzD4BMEVzZk3IuLuMUD+L0n1JYd6FUECBXsjO2OF0szpYnPZ2lY1OvhZoquEhccVEYNEy+QIJEMYOLpICaiSebqXPdk1WCVAwRHXUxYD3p2O5qludor20voul7NuECAOir7SmELKZQyy6vJSnIag== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 76fceb86-145c-468a-dca3-08d9c0338b1c X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Dec 2021 01:29:46.1300 (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: AM7PR03MB6628 Subject: [FFmpeg-devel] [PATCH 15/15] avformat/movenc: Use dedicated pointer for access to MOVTrack 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: BN6Hkv7SWZA8 Improves readability and slightly decreases codesize. While just at it, also remove a check whether the packet list is nonempty before freeing it, as freeing an empty list is fine and basically a no-op. Signed-off-by: Andreas Rheinhardt --- libavformat/movenc.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 0ffc6395c3..9f2f8414d5 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -6466,28 +6466,28 @@ static void mov_free(AVFormatContext *s) } for (i = 0; i < mov->nb_streams; i++) { - if (mov->tracks[i].tag == MKTAG('r','t','p',' ')) - ff_mov_close_hinting(&mov->tracks[i]); - else if (mov->tracks[i].tag == MKTAG('t','m','c','d') && mov->nb_meta_tmcd) - av_freep(&mov->tracks[i].par); - av_freep(&mov->tracks[i].cluster); - av_freep(&mov->tracks[i].frag_info); - av_packet_free(&mov->tracks[i].cover_image); - - if (mov->tracks[i].eac3_priv) { - struct eac3_info *info = mov->tracks[i].eac3_priv; + MOVTrack *const track = &mov->tracks[i]; + + if (track->tag == MKTAG('r','t','p',' ')) + ff_mov_close_hinting(track); + else if (track->tag == MKTAG('t','m','c','d') && mov->nb_meta_tmcd) + av_freep(&track->par); + av_freep(&track->cluster); + av_freep(&track->frag_info); + av_packet_free(&track->cover_image); + + if (track->eac3_priv) { + struct eac3_info *info = track->eac3_priv; av_packet_free(&info->pkt); - av_freep(&mov->tracks[i].eac3_priv); + av_freep(&track->eac3_priv); } - if (mov->tracks[i].vos_len) - av_freep(&mov->tracks[i].vos_data); + if (track->vos_len) + av_freep(&track->vos_data); - ff_mov_cenc_free(&mov->tracks[i].cenc); - ffio_free_dyn_buf(&mov->tracks[i].mdat_buf); + ff_mov_cenc_free(&track->cenc); + ffio_free_dyn_buf(&track->mdat_buf); - if (mov->tracks[i].squashed_packet_queue.head) { - avpriv_packet_list_free(&mov->tracks[i].squashed_packet_queue); - } + avpriv_packet_list_free(&track->squashed_packet_queue); } av_freep(&mov->tracks);