From patchwork Tue Nov 9 18:01:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31353 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp1494646iob; Tue, 9 Nov 2021 10:03:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJy/oYJ14eFl+Fg+cjYYC0rgeqy+mVrY6S2WvbJAEgWkO6wrdm76DV3CGz+e/r14wybFJSHQ X-Received: by 2002:a05:6402:11cb:: with SMTP id j11mr12643049edw.134.1636481039632; Tue, 09 Nov 2021 10:03:59 -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 sh11si31890776ejc.687.2021.11.09.10.03.59; Tue, 09 Nov 2021 10:03:59 -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=bb1sswaY; 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 8381D68AE33; Tue, 9 Nov 2021 20:02:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067058.outbound.protection.outlook.com [40.92.67.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7E46468AD12 for ; Tue, 9 Nov 2021 20:02:34 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V3UtYCj6DFhlx0vSLb6eezBc47yLPG9czkB/hPUAZieUEctPqqTcHW78fLpKp4Juyu55OvbUtsWQj4iGFNf/Wqjpqp1Hgxk8xnMGj+fNfb2DjA1IXMG6+xVX1Qiq3B+Zxf0pJmIhOOO0+VR0O6dp1bfUKKPThvcoVwjAqJmD+K6cSpinuYdhmXL18yuWkPHgHCqFj112HKcsDeS2fnP5eo88tkVyvz/PKb/HPNOye3R7JPxvQrqIJCLfYDTVzMwlj9IXr59/Ib8LLBUGpKuwGkU3zpHH+RCEs/Ll+6HQd9fu87rOfWYSa9uaTN5GOiykzhwwtZ1yzjO/wFeDxpZEdw== 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=EPl4fnsC5B1BUdgaFOipQGAOET9WKBsmPYo8LGXe2vM=; b=maEpAqFOMLEsaU4AX1xFYZotXJHyHekkZTwLWcq+i0xMMVRQPJfXy06oz2Ty4xsvz7Y8EMvwGic6U6HML55GnfcBjuLHGdDYySDlxKTwn27heglhQ5uE4ygF60dZYc2q2kyMtvNcPVSn8Y0ApY1AFe400aikVWlwGhxz7y0gnwMpZ7fBTD2F7I59z9cSW7F4GGwQsC7Vxc12NNlUrpd1pzrwgnPAyJOmL6J6zBylJ5PfsHc/Z/JasP/wvu01FjJFsi5tcRcJ1VwMW3xS8jE0ndy7IhLrTaavUxfEnOWeYmEYGv+qenFx/N4/cRPqtz0WwL/iplgJfYfZwlwDLBlP8A== 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=EPl4fnsC5B1BUdgaFOipQGAOET9WKBsmPYo8LGXe2vM=; b=bb1sswaY2erV/1o/ghg48P/Q+NemvHvw+/OAETeW/UHcx1YxWeCEg5azByHudKZVdrOQkKCzQkw9FeDl2CQW2no9JEK20M5R+aW3mQk4HllX5oYNuO22Ir74ojjThUMdUL5zDasE17Oft+qSROrm8/yNvP6obz+l7fbqfFMLUc3jYxWbvYtOuWYQmbc6zCEWyxWawdQRx0Qk3Hnq7irPBGEzVl7cwukQi8G2SdeQpFrfftkku11c7lCoLq6NDgJevGfxnOTe/m/o6GJxpK+eAdKoGWdAeMyh8GXm4lP25q4QRmf8NliOHZ/3bo+10Xd/719ePyMFnth3haHpzl80Ow== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4775.eurprd03.prod.outlook.com (2603:10a6:20b:d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.16; Tue, 9 Nov 2021 18:02:21 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%8]) with mapi id 15.20.4669.016; Tue, 9 Nov 2021 18:02:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Nov 2021 19:01:47 +0100 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [OWaQFiETnXMswZfeDcC5F828ECT3975E] X-ClientProxiedBy: FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211109180155.881111-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.171.90) by FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.5 via Frontend Transport; Tue, 9 Nov 2021 18:02:21 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4f54656f-cfab-4a82-a6eb-08d9a3ab1385 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUaEas4lV0e9Du8ljla95f+iN1ku1sEUQ1GeEEDST+0ECoKH7ko/hplHenXeXEVhgV43p1OouWzq8vPjjKUnU6p1XdpYWy/cM6x6HBVDXSas6qWAUlkf7N2nLipPjTBTbC44T4+AwfDV+Rt3TmpJKsat1bQE7pHRIPW+0uqCuQuz+vH5bvja0SdPrSMkZavKlgWkFMfCz4Envlu6x2F26b4kFdCXD3NvtDUF/aDung8VKb3yTQmlux6MWjNPDDyxaG9j/rv70NlnqRfG7bGLI9dp275Z3hXtcl7riPHbWDvenyvne8mUYB4qxnI2g8Ae7NYNMEKmlqtXXMcAcYLrarsP3gvxRd0TXaabHTfLwjXCpQ7thPyDh1rrPOAuZsnia2pPuLOeLsmBEy4VAC8uTtbcmZGveAg6cMHJUm2gGkkun/gICqgAP84RcKRkuFlgdxwRhj244F4aD+4X/G1W5MvnmRc68/NoyWQE8TRfzDjFfb3PhHXp2OY6mCBRhbaNLwDYYQZ4dbomcx0h3Qi9IFJYnMQwzA9HyM0ulO1XWiVfQYyRAvz/qcwNh+JKZ025esC4W8m+JLX2lZX2Z5+IY2ZciHWlG6mTBtL4xmxIvnxYJvB3Lc+3/5hbBE9vuRMPUlGGxDztqOKDlfyOD7O3hl6XXeKZzFL6uxoAwBJGLpJWebPvUyqNHYKjCxCHkACsRJu2RZYJby8t/WsqIvFIzXKUQ6xnb7EsCE= X-MS-TrafficTypeDiagnostic: AM6PR03MB4775: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KoyqtEChB4PRrhNWoRAltSsD1aJ7XLGJpwoA3CJX+Q6Jqqvi5Uadkg+VUgh+ky2IZcqTQiEZziev7ocJwtI97fzSrB90weaYAXFkMdIZjb2v761X/bTtEZJNbSg8A2F5futImKy+XXMnIYKu6B5uRdKrLFxFyBXL6njdtLGGZMXS8NU4FP7vGL5j5aip/YxvWxupB4wyodLbLMxEDGDY76aCriItvn9d8CBZMuRoc8a6fKdNILiZVfTZ2gEnTsAkyXMyBGATUxyS2CWQqU9APz9cXzG8yEu8eI8UA+1t/moH8O728JRnsMIQVSalFDPAdfLGxouYQjqVsOqh0JOEUZVvtH3twkhy1SJeFqdCvk81c/6NBChl+SjxK8yfEE5/GCQEMK37yNvhD65jUhhrML1oRxBjeDvFnI8c0tiHxXFcvGZDVLHBWVkucU39pvmBJwHklVm8AJdPIbEE+ScaY/k9C0VYxnjmO++PrQo3ZmRL8nmsuJrXbxlUTtxcYO6jyVsu9/DOmMVMtQjhtQFCLtOsjrZIW4pkbQ5NMasMOCg= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: J+R9o1DegUqAoKh3oJGJxQiympX2gQkjYseUszrozkFqpx+QT8FKR8QLcdzo1H4loEpH7LedRbavedzHvgLAgZmN1z23Lcl7SDW7K1YS/w9tWuDi+bryCDGeNwaoQk2mLw+Jhnkas0I5PV3a5VhFdj6OILm25gkNH1OdSum4WQDxz8fMkwLmdqX2Z5z1zIbWBIEApHcNjDKelbTCEHUBDrijWLRbnyk3zL2ziQOEpSTGtM45LBJBfOdjQpTRXrESoX52tvqY/qKZoj2P9CswOGIdzJdQtG28YQqhxhJNFqqyJAWXaoZ+bZ2BeKP3caSPrtjzuEhaQdN2caqqeE8xgAqZSi5+vcfavStSaCoO2rN/TyB5rh0FKBcUArm2dW7hHCT8E/mux0zQC0jln4DIrBtns2XrDWJKPS9lYDlE5ZCARRkVoua5HuPpfJbNmr+gQyks5VJxyph8xEX8bhs5J2Jk+B7YenW2LZoHpNK/SlbGGkrh+1sSoLBukN0Bh9h0uV+X6urxfDSvHweVwKI6+dc4ILOLGYOX90EuIQwl82iEbf9UZYndyFST/xEcv+ULkUlFjxESJoRqzb3gZYa76JLN5PfA12HnelHDoPJvGH3FhsWWM4sy8ICt2Ypcy5yIZVJ2lWhnh7IV8UPaX6hAuYFpKdli412vBDkxG95miZXAFzGcjW9hj9MsTRCUIBztRcfTja0LQBP++Q7VohXO3g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4f54656f-cfab-4a82-a6eb-08d9a3ab1385 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2021 18:02:21.3898 (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: AM6PR03MB4775 Subject: [FFmpeg-devel] [PATCH 09/17] avformat/mxfenc: Avoid allocation for timecode track 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: O6onCZC3iXfB Signed-off-by: Andreas Rheinhardt --- libavformat/mxfenc.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index cf63340313..aa9857fcff 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -421,6 +421,7 @@ typedef struct MXFContext { int track_instance_count; // used to generate MXFTrack uuids int cbr_index; ///< use a constant bitrate index uint8_t unused_tags[MXF_NUM_TAGS]; ///< local tags that we know will not be used + MXFStreamContext timecode_track_priv; } MXFContext; static void mxf_write_uuid(AVIOContext *pb, enum MXFMetadataSetType type, int value) @@ -2712,9 +2713,7 @@ static int mxf_init(AVFormatContext *s) mxf->timecode_track = av_mallocz(sizeof(*mxf->timecode_track)); if (!mxf->timecode_track) return AVERROR(ENOMEM); - mxf->timecode_track->priv_data = av_mallocz(sizeof(MXFStreamContext)); - if (!mxf->timecode_track->priv_data) - return AVERROR(ENOMEM); + mxf->timecode_track->priv_data = &mxf->timecode_track_priv; mxf->timecode_track->index = -1; return 0; @@ -3087,10 +3086,7 @@ static void mxf_deinit(AVFormatContext *s) av_freep(&mxf->index_entries); av_freep(&mxf->body_partition_offset); - if (mxf->timecode_track) { - av_freep(&mxf->timecode_track->priv_data); - av_freep(&mxf->timecode_track); - } + av_freep(&mxf->timecode_track); } static int mxf_interleave_get_packet(AVFormatContext *s, AVPacket *out, int flush)