From patchwork Sat Feb 3 19:33:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 45998 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a28:b0:199:de12:6fa6 with SMTP id cj40csp1707756pzb; Sat, 3 Feb 2024 11:31:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IEEH9uHJepevS9DPpg8XI3ByjztDmwmH7uItWPtaI3/SJBzGF4yt2aZ2LuR1KRbidUYbD67 X-Received: by 2002:a05:6402:888:b0:55f:f2ae:20ed with SMTP id e8-20020a056402088800b0055ff2ae20edmr2096965edy.16.1706988715441; Sat, 03 Feb 2024 11:31:55 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCXrfvlA6hkWN0C7szHIcFwFX7TPjuhW8afyJMDj/YpTMM6o/CxCzKWoJwHkkXvOSF+PgL0KxvCyzMUHa+ivVMDuXhVluhfttkyKNbRoVo/5y+0btlyh+S4FegYkMtK0KT3t/UOjmJ5wlpzIKt2fU9amPculnRVbSRyJ/qPlmK4KvasJF6j0u68tiOZBEVo+efMSmuSmoXzjXLfYUH2oT9BudKcJiFR+g7yodR9vuOw9gFeZON5NaxdhH5r7gD1OZMqrZ3JCvZ+LLYDB5oACSC9LgCUi3nwBLBMflhSpSU/y1/j6BguhU4gnHzbvFZBvcxBmCWBkhVpLrjCN/0W55hN3xF82w0toNc2MptnPXARRRokFRWLBB6UbEy7N+gawPmdG75KKZ0BCU4lHo0hxw5iSA0jx/ElzD5+ND1tiabykOPApzGYsNHuP+fl0U5EYfg5AYrDnUDBCnX4MAU/rJRyfyYT6ee/ck8wj2kT15JMZkmjs0ulSqAZk/REikGKWyqnlVyI+Y5nHCidC2FavrUtQr/U7J46wuP3gRGibA7bXCDG+jOpxS0Q/Sc7qiYAIqzfkoNRDGmEuolpe+wRPVL3wg8IXi3WOhDTf9D9trYa3T3Iifzv1F/T9iIKHp6pLPxpt1AyuciCisGtebd9ZLNJNLSk22WU5LpbxZ3eC0T9cYNSN7hTXCjJAjJQS7cS4Tioo48AJowllq3We2qT42N8CFeiA7eiHoUo1/h+981c6DNH8xvGU0Xt3u+h0jpNnVARJz4FrrJQU1vR4gw2tHwdiie2ruu6USJu+Ifmxna16/6qf9UPxKOcp6yYxIfYM3WQN2NAFF+x6lzD/fbSfKKO0TyD4hcijCI4DnbH9NvsHyREGgyzGHya+cprHXMo8m7yBf/kqBUVIxOotxuzi/QoO67/Bpm0krYr9i+Dz49f1M3DCBrNA6zOwgZBsBJdf4A/pPh EvjE9GceOB4wxBYBf/6u2A97tlsmq5DsL4yETROnwUWGE3VupudNyIjcynBHxn5W0DYwsHyJKk4Vv1KI3MQga7OE6yZr0diBzM8+i+Cs2e79dNuh/CXUbHz87mWWBsu+N+gJd+4yaBmYEldANRGf184sRokHHxv5eh4gDxIl7opCYbCVIR+HaDMxVni4/f/Rd/Qsccm3KvYaOLxoXzXw9leOZ/OWAd21aMvoHg43La0RGCUP0XkjreuN6wFaEjdbbM335jxY5PbLEti3x8hMVC4tEqj3pUisICYrMGTgJfDblw4gHHv9/rXOitJixCp4kJ+Kato/h9gtRcQgrsaxxQbWrvAS09gt7hxqymBRfYFAIZfyLRKSjG0wb2dU/NPxPx/HpUR2qlLB3gev8rRxMG5SdoS0/Sb0jKwhyHmC7c6niaOMQuFSp8t3VVzieOAIGM2nRaLCNvslMRXoxBBzC35pBYr3jeY9/K8wSHwVtJ2ALGfnyoyt7craDVhQSdB860J8NMaua8bskOGsQrZs+MvR5j72gO/xwpuT8M2Ms7qNuzM5vFITesCi/1etgwMtuKg44jS3ryYgK0DqgLaEfokaBuweduGwSAAq6CgIa7 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id eb10-20020a0564020d0a00b0055f0fa7d404si2187168edb.218.2024.02.03.11.31.55; Sat, 03 Feb 2024 11:31:55 -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=HRfwxNDh; 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 6827A68D12E; Sat, 3 Feb 2024 21:31:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2012.outbound.protection.outlook.com [40.92.59.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C04F368BC30 for ; Sat, 3 Feb 2024 21:31:46 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jaU8D12RRajBARlQvy21pkzSpYG3Snrmicw6/zWHKELPQrzZnsCaguX+sTICV8d2dhYf6rwfmQYtw2TKQSFDSFE69SiNxiXnv0ixNd1P0NHpvzbLwiJiBfwWPltbBrvnknP7Ey5d4QU/uNeNAHrCU2lxH0v/9tNwrMe29TnF87Wj4rE6Kn+NmhhchqpDMOK2+MMmC2ZOzQwEyhFwFZ2pK41tTv1UpYMPdoQnGw7krskRSQVWZfTKsZtXficFp7vxPHx+W8TJc/RwYvV5yP+utdQux4RnSMIMI39yamKODNZfjfrMXM/aYCcBYycK28fzFDlnJ1N7EmjJYgPy6o6+aA== 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=307H/R2fKK7W+dNag003NjtiEIFuSHcqQ/Ik1+Nu+Gk=; b=biejYMu5lNIsw83aeoBc78MhStIeKqsJopo7GuJA47ItI4ZinLCec5BJGjRjjeVBjt8j71aFHdCxKRGmu+b/PJO3FSJbkyYEX3MXgtlq196vay9KqUrnIl2tvGd1lI/q71Aqfl3t3eQlnBPRVmaFxiJPsfEbR/dxuH7aO/z+Vqana+YTeuzhE2bR1jkJsTOLy83ANhbv29Qfc21p+2g5m+LiHnQHHhr4D4RIddg5cXymkWWIMY8pka41z711DvgcYFSnabHWFT8Qjvr1zl2j4AYMz2StPqGG0j8CsP/ks5HI9izHnXuxxrozJBYJJkbaR+OMjGeSlSB8hlw62UdaTQ== 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=307H/R2fKK7W+dNag003NjtiEIFuSHcqQ/Ik1+Nu+Gk=; b=HRfwxNDhm4QoNeG/NbX52VmvjC7zdiWn3NELC5ix/6acFOSys1pKCArOuKhh9uEtxewnyKmGrvHTObEh1BAkh1T3Lun0Zegh+QNuDzbhLzkqbhMwJ18bI0VhsFRgSo+6gsMm+J4+3sgINNdp7iuY0h+rNM9aX++SgYKZPDYApE5cLYp9WA+1f5gqeXdxe058GqiYi1jMNcjn6x+gWUfbt4Sx52nG0z8sUEVrnD7rXklAF5nDj2x2otkpXeHXF0Ma7/BxQtNmQRvMUdC/Dm47phPWlmA180eoXGZ2ibcVvbnJJjSNoazCRerJA+8Y3xf1bkfUlc8malq5gCrjfCcnzg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0305.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.31; Sat, 3 Feb 2024 19:31:45 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7202.031; Sat, 3 Feb 2024 19:31:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 3 Feb 2024 20:33:30 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [HrnaRsMvGVmsApdZqdpnVpTC8ngQnAzvV8L53e/cm1Q=] X-ClientProxiedBy: ZR0P278CA0146.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::7) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240203193330.2254723-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0305:EE_ X-MS-Office365-Filtering-Correlation-Id: a3be96b7-1580-4d62-694f-08dc24eec1a6 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UoTsGgjGBfGlVvze8iimPqBv+KTnYKeauPz/o09iU4pKwtBeAOmbyFO7ladwfF1Fcer4YkmsMG2RoHHUS+IsQjPhd+M9O0Bn5iERQZhMywAICzVMagencJ88r/OfYNP1F/PGpcAJsa6WNghs4pjfV6Gag9tSwurgdXjSJjjRBKUTOVB2C1biKNsYhK1qVYyE9xUcsoxW+ybPFII3EEYt+OahFjgY+MPkD1T2y/oRejIgblt5fC9XlS9ixFaMoJXr/YLi+xFE3pSmDyeTRdKnWPwFR+HhxSoEV3Q0IW/R6gfTwP69Eyh0SCxiwMBE0NuXdn+ykz3iDkDcf2za+ZP1BQGMl4PQg7rrkhuqu/eHcNI4LEFpBqVI3KSBFMBq/SUNF6j8Z3omP/cRXrRQMyofV+pyqBjLutQPwFbu1c4JRai7iF17n64gG3nwA5aCFjKV9Tlt0I8ZlNq1UAtvTZIjSEKpeK5peLbTwPHgiKQXlrMeOrrGFwvxkD96FGyaCg2cfIA4WMA6dbeqIktrDfcD3TzEq4JM92aZVsnoPiwYBp+cm941+A15sZIhMeFNdIinRBJF0DnP3YcEs2mcwNrBgUkttOVF/MDgZZ+yoZyltB31x4HaKCezWNuSu9wMJZP4 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0231Cz4ZIckD+YxN/UCYpxbXQ3Ti74+k+wK0JfI+5e/TN9x0S6WZgXg+g5zcCjSGBzX49J9LPHEsu3lbFyVa8wOTmkw8ng7ED+kzq3MakKoly3Wgns4kjqFBnySHNS39XyHi/pU5TF/YxppbWdcTBgFTxzuPlEKakEICQzLYuWV36G0oouKqXCSGccLb5ZPoqpF07ZQdjXPYKnHwp/Cu4h8g/kf33P/zdAzE+gx8BBv8ZwLLPSdbkKFJSfZH1dDrA1cUUngVAu2g1zqjvOBPKv35uN5XRoB4yecviSNsYocfhIHYQMFnDM8e6v9OUKBFxY/jk2HshrZb76dAOc7chGmGV+9MvrrrBY69o3Bb/RKKE7AT5+UrMSxc86dXfXGftqWmTSQAV9d5veKqQA4QXzcMs8HxhlZ0vcuBBTMX8vFo31uEEtvwvZxsw7NtvH59XeUXAYEzRKGp1P7wYraA4K+gwrqQh1Ksrw6NlLK4aqUVwiA1MzqL2XPVpb85vU9EvfZ6ltlBRV2x1xPCxsDGz29Agikj02HQrCmPd9RV16onk3FdiYppnEDP271Ngb5WJr2lMM6Shzck89j/inncF9kBAvKUfqn7kiZtSqKB60J64xiF75VykEF16Phbl/rv62QIhuoK3GyXnduvUdzHWsyV1KT3c3HX6l4CcQXxQiBQW+E4+43tFhJv2v+1FyQdCBX5RfZpn3vSZjugmryV2TxGOtSONyFDat/feGmv1L8g56+LIkq434DI7uQOzo23zKXZwRPBExrSPFC95hrVEKrim248E/ozPC2580hN0LdDGxDqhs/KC5KhC1zIcNwJPyz9rpMJ2lg9/rTpt+sSQzTqpcKsYvVeRhOKGX27dAVfYIuWBvItXGZ8Yk8ujEqmIY6L7xKnNa/t+WtBeK+q/ufWvyvPKZYL1guSVSn6WMZxH8eswtXB3m2bgXYWPLPQET5EzywqhxQD4jaITTEYEut0uMl/MF1inz9DsyxV5wLNOFasFmk73BbVkmCaZOqliiAiX6WlAXTucDRP8aTnE0zEG49K2hTS6WWhEV6BYXDQ5jRPEQEuHO0DDC0v4xrHqFljAWCbYN9KBbS74VwfODfbWn9eifjbaWSjzBwdRBD9wBGPDQv/N9unZEzK14mD9Rc3vqjSU+SNWA0t5RVtCbs5ungqQcWUBqT3m4WUwScCsCoq9DkfFPQsZERcs8HZQZk1BZSflSAwNmV9WjDLxW1uYBfxf6s/YkBKoFQKtsgZaO1mRo4MC5wLXPHLBC/y X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a3be96b7-1580-4d62-694f-08dc24eec1a6 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Feb 2024 19:31:45.1154 (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: PR3P250MB0305 Subject: [FFmpeg-devel] [PATCH 5/5] avformat/mux: Don't allocate priv_pts separately 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: A3GKzLEWZnY8 Signed-off-by: Andreas Rheinhardt --- libavformat/avformat.c | 1 - libavformat/internal.h | 2 +- libavformat/mux.c | 17 ++++++----------- libavformat/mux_utils.c | 5 +---- 4 files changed, 8 insertions(+), 17 deletions(-) diff --git a/libavformat/avformat.c b/libavformat/avformat.c index ae79ee6ef7..ca31d3dc56 100644 --- a/libavformat/avformat.c +++ b/libavformat/avformat.c @@ -63,7 +63,6 @@ FF_ENABLE_DEPRECATION_WARNINGS av_parser_close(sti->parser); avcodec_free_context(&sti->avctx); av_bsf_free(&sti->bsfc); - av_freep(&sti->priv_pts); av_freep(&sti->index_entries); av_freep(&sti->probe_data.buf); diff --git a/libavformat/internal.h b/libavformat/internal.h index 520f1a5229..c66f959e9f 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -245,7 +245,7 @@ typedef struct FFStream { int is_intra_only; - FFFrac *priv_pts; + FFFrac priv_pts; /** * Stream information used internally by avformat_find_stream_info() diff --git a/libavformat/mux.c b/libavformat/mux.c index de10d2c008..93280f9047 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -406,16 +406,11 @@ static int init_pts(AVFormatContext *s) break; } - if (!sti->priv_pts) - sti->priv_pts = av_mallocz(sizeof(*sti->priv_pts)); - if (!sti->priv_pts) - return AVERROR(ENOMEM); - if (den != AV_NOPTS_VALUE) { if (den <= 0) return AVERROR_INVALIDDATA; - frac_init(sti->priv_pts, 0, 0, den); + frac_init(&sti->priv_pts, 0, 0, den); } } @@ -550,7 +545,7 @@ static int compute_muxer_pkt_fields(AVFormatContext *s, AVStream *st, AVPacket * } pkt->dts = // pkt->pts= st->cur_dts; - pkt->pts = sti->priv_pts->val; + pkt->pts = sti->priv_pts.val; } //calculate dts from pts @@ -587,7 +582,7 @@ static int compute_muxer_pkt_fields(AVFormatContext *s, AVStream *st, AVPacket * av_ts2str(pkt->pts), av_ts2str(pkt->dts)); sti->cur_dts = pkt->dts; - sti->priv_pts->val = pkt->dts; + sti->priv_pts.val = pkt->dts; /* update pts */ switch (st->codecpar->codec_type) { @@ -599,12 +594,12 @@ static int compute_muxer_pkt_fields(AVFormatContext *s, AVStream *st, AVPacket * /* HACK/FIXME, we skip the initial 0 size packets as they are most * likely equal to the encoder delay, but it would be better if we * had the real timestamps from the encoder */ - if (frame_size >= 0 && (pkt->size || sti->priv_pts->num != sti->priv_pts->den >> 1 || sti->priv_pts->val)) { - frac_add(sti->priv_pts, (int64_t)st->time_base.den * frame_size); + if (frame_size >= 0 && (pkt->size || sti->priv_pts.num != sti->priv_pts.den >> 1 || sti->priv_pts.val)) { + frac_add(&sti->priv_pts, (int64_t)st->time_base.den * frame_size); } break; case AVMEDIA_TYPE_VIDEO: - frac_add(sti->priv_pts, (int64_t)st->time_base.den * st->time_base.num); + frac_add(&sti->priv_pts, (int64_t)st->time_base.den * st->time_base.num); break; } return 0; diff --git a/libavformat/mux_utils.c b/libavformat/mux_utils.c index 3e63b8039a..c7ac2a9c97 100644 --- a/libavformat/mux_utils.c +++ b/libavformat/mux_utils.c @@ -33,10 +33,7 @@ #if FF_API_GET_END_PTS int64_t av_stream_get_end_pts(const AVStream *st) { - if (cffstream(st)->priv_pts) { - return cffstream(st)->priv_pts->val; - } else - return AV_NOPTS_VALUE; + return cffstream(st)->priv_pts.val; } #endif