From patchwork Thu Dec 16 01:29:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32650 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp407950iog; Wed, 15 Dec 2021 17:30:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJxGMZSqT/NoJiZePIsVNNnsrtQiz4sV0iKU74A9kx3Yb+WsvEZUOJA4VxFXW3gSQ6QfZHeR X-Received: by 2002:a05:6402:11cb:: with SMTP id j11mr18709402edw.38.1639618217630; Wed, 15 Dec 2021 17:30:17 -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 hp34si3522240ejc.640.2021.12.15.17.29.59; Wed, 15 Dec 2021 17:30:17 -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=s2SWdvVj; 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 3DF0E68AE3E; Thu, 16 Dec 2021 03:29:49 +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 D8EED689FD9 for ; Thu, 16 Dec 2021 03:29:42 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mwy4uuOc/FXIpxQzLlLgd5U8YLJVfhXTQ/JHJTPs2y+Yw/vfnwk0Xa32ntQPTK4APlPP6gAnfq99MfqgOcw0rYwE/ji3pGzk/Z9PqXdjQmT4baOeeRXoVzy5tVScd7MMlvKy9zvrvrGh+JAyZghUQNSoeM0vO3xEI4Gvr0qAvr4oxx4ibzsknJoxu2ukNshxOqRlQ5TMFRlyNiIUr8MRbghgZeyeono91yPva6NC2FnyTsspBNzDnQHH6hmi2M6sBuCG5Xx+UaJfIsxrrrBe9d05/YxzHFaUy0Tw0GuWo+DpMVuPXxgmn59MlmfIkCg63FFjrdyQbLQcKidBfa4wZA== 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=VK0UKfsFcSImUincDhrCqbhflOcCXykAfOClxHICXpY=; b=akmN5Bq9SMcwzQZpzqYR1STSBDxVXoGqCZqtOlhhRkmidSi/+K/okjSWeG229NdV/lyo8mXQO8JdFKZYeI6ootr8QLkwcSRzIDCMwSrscc4x/RFP4AwB979VSTrL9qjpBjI7jkPrlE2av8InFD4AqsvsIdTWw2EnaOfj1yXarizZmq2XBKqQOL95N6BG0Vvlgrk6lK5ECnXFC6t04SIHch4hNkoUQu9zqCQ7eAU5LdOw87dRTaMtnw+IYj8NqZuenxBOjbkKsm4Gbg2CJmqXj6hheQH0t36tsZjwBRUju/G7oXDlLS83Wqlaauh/PR0aVSSMdm2Syca+sou5W94zQA== 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=VK0UKfsFcSImUincDhrCqbhflOcCXykAfOClxHICXpY=; b=s2SWdvVjbMvvUkoOtEvaSnxtDReWqIzwB2E8PPYdlQv12KPEOce9avBNKufKbllnyN20sl39srsArPBo2fC711uR3YxJgRE3aSaf3s1n53KyhKsVDvAHoI+iCBUiUKtktycR0L0U18R7r+BfTELSpRtT1APN1YGnRxoKJaD7jWgVUIpLUzTZGFpzUy2iL27wjM34ShppD+5UeqLA1KH2CGMEzz8SjgresaigAIqyMwasXAY0dU/ti+G5x8dLPj2eKoYrKBPqMDY8vByIiK8jE/veD9rnW96FYY7MC9A8aQgpahCG/D5s/DkaYUif5NKDeqzMpIusJQspmRz+RI90Sg== 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:41 +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:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Dec 2021 02:29:21 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [0OMULZcg1gNCEqa/Aqvk2PwPSjpVxaGA] 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-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3288af3e-d7d1-4577-64dd-08d9c033882d X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuBoyQUf2rHPVuupI3Je4ybRM0LTOFTQtJXzsNbXM55m11NHUygSEeBPbgGytUi4IoOS3et8DNjOqJYo7+900sjFGErWm632fdS6VyAsn/e6UO7kLPK9nJeQNwHWjJN0h63+TSCPdvecI/O1XC3cV/Hdwob2vGi8HScVTGNktHeCca/NQT+SfP5UYlIyxqXeJJoTlJ4qfepBBHQ8nF7yJ0zkfj+RM34dUJBJ/BuR16xQPFYxoNxU9aaC+EyQx5itDjGKEqzlzpn1iAlfbXC1+/TXZN7+M+jNTeunt2qHx5gimgVE7TV2RgQU+z1sYF+KR3U2aIRCztRlUhf+3/tJzzcVOrn7RXaUDj4dB8d/icpyceGyjwz6yZEWKtqsTDTZmqVjR/PXWXvXvN4+vpijMrGWZRU2McIDCuk79D3EW09itPCk/nYyJK3QbS28FRL1z/UDDByvGUtHJOdfdobVcpvqEsEIo6OKmIgMcgRQVbzssqHKDzsztzGKs0og8hC096QazCdfHADsB0aE0kA2GJKrhdUwUm+I2UGSfTTXDyeNNLlooOyDtK4pEaZKsCx7n2eHvVxVry8Xa5laJJ50gD2LLcXW24+fc8C9mfq8hbqzDsdGzkWR7kVo7e4Mq+SRRRS7lJatMl5Yn2CsvYTReZ601e2b6xqMI4qkA5U+QByZJ2NLValOOujfNGTJXCFNE02LrRNksaf1MFCftPqmpDjyN1BCnV02B4AASevD7rRwURSijHSkIco685FRTgwqzxOREDv1SYs+BdlYf9v9xV3 X-MS-TrafficTypeDiagnostic: AM7PR03MB6628:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: z7jpEqzNYhtS6tgpOXbmKG9kIkyKNLeCSiCUn9A+XZrQ7wVnissAwQAh313gju+aUN1rWN5/cOIIWIQEVgBaLx9L5oIk3H+kuPPOe72J4mJh1cZ+7D2cSi1YCFi7DIGNwpQUroeXDTwlGVfKowZHqpAvEdfrloqBcDW7aPA8my902xqRpLwzx0AIKlpvZv2ztJBusgs8f2wOzkSRiqfDfIdl9TKRBKH1IOgB9zxI2Qp+hDyr8/Vp2eTKNPvXYGRoGd3b+AE8+GMLmWeab1yaAQBtldFF1tXy8P7AK088iA1eXOrFL5r21WU+4FDlFXMQ8W9CG+V/2DyBG9cXtRC5TqGipHxmhC/oQ9u2A8gwUSeihHZmEPFimlifQia25+VEpg2iBOXWXY39dUwKdsJe2C9/3rHiqV4UvEfDkRuGdFAGBKLCOQ2QlLiSr0T/7tQ7mwguD2I2a9LSPzlRvCybcwj8xkfqkX/FDqBl6U+FB0uMMBwaBRlthkrfpopjHuZg6c9WInqc9PKBdhtSb5a3WnsPp4PPeo6/BRZqcAjmkevceOKnv09xLk0UaAie2e5qs1n3+8wDVTuNQ9WX3XVz5w== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TceH8xfrCwPhqJQzNlCpFqaaRbNanFejgL8MvP7K8yTvFYQT2MlEgJD9vX/4qVUG6oV7iF3ZoIZUfHPn+uQTsiIVAU0ktcCI4LEadwmLOeHs3SKxK5UF61JzkDPX4NoPoTzIcChfFLvQC56DmJcTcSd2aZShw8D5nirW0XUAqatYhWST1jLMV4YLHd0SJQ7jYeQ1OHDSnK/5miEa+w0GahhJXaC1YLW9NVpqscQvIF/YOsCOSvYJQBX1Lsid1dHyODuzX74vR58+BVZZVXVRdtxwTfOd3tGI1kOOL9WKAR9/010rUMZ9vhg/44Lu7OW2bI2iN2O22dC6/pfuqvXqGCRoYW4ajaV/HemTwFSe2QK2ZzcrCPhaGCoUBaViCsVLHrvt5wblo2AOuNu3xATLP4AeLN9KXqLdD2FYmJqC3lkTVbFrR8T7FJCQ5ylYX+mLicIJpCzg/ZAa4FVaCRayfUKvxaN70kXyiGZGd1NPJgRroWF+OhKAqJQYpmNRwqG2Cv3oWhMyHlXqSnuA0hoUkCdM9ts6bTWoqMjgR9SOWH7bEdf2wKvg4oaJhdz2cY/ZIb6j970clwVIl3spdWQ5ahS9h08As9InjqHQp2TNjjty51xAiqgw/j+WYP/ugZATYhZK0pTG2NGbEGCfLo+zWHWyxCFe8PhbDEi1wHt6su4iOHE4cL0oig0pR02gvBvl3NRfK9u46L05bfG2SLYGIOOGpSAlKE96LQuWs5FHqPw++LU5A8e9K0NoKroOOR+Tk1OF676z32yqm8oagqEz7dgzDaECeoT4MoNEQ67Mw9egtYZ2LE8Ibp6SoeTMb40ej0ZbnfHbVS3JCGNvAr5UmXs9/zC4IIGhu6McXUGkjHnOV8+1DhBJFEF616vyevb53RbC3XfuUcxeYbdTDLymKYNg7U4Auqze1DVz/XAkL4GAj3M/zpelJwsKWuaax9cxpqZu7VNQSVKdVGSiIAR0zg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3288af3e-d7d1-4577-64dd-08d9c033882d 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:41.2520 (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 13/15] avformat/mux, mxfenc: Don't use sizeof(AVPacket) 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: rqo7ZtKKZd0y This removes the last usage of sizeof(AVPacket) in the generic muxing code. Signed-off-by: Andreas Rheinhardt --- libavformat/mux.c | 8 +------- libavformat/mxfenc.c | 8 ++------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index b9c4abb9cf..0500f636de 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -1014,15 +1014,9 @@ int ff_interleave_packet_per_dts(AVFormatContext *s, AVPacket *pkt, AVStream *const st = s->streams[pktl->pkt.stream_index]; FFStream *const sti = ffstream(st); - *pkt = pktl->pkt; - - si->packet_buffer = pktl->next; - if (!si->packet_buffer) - si->packet_buffer_end = NULL; - if (sti->last_in_packet_buffer == pktl) sti->last_in_packet_buffer = NULL; - av_freep(&pktl); + avpriv_packet_list_get(&si->packet_buffer, &si->packet_buffer_end, pkt); return 1; } else { diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 00bbe58149..7635e183d0 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -3125,14 +3125,10 @@ static int mxf_interleave_get_packet(AVFormatContext *s, AVPacket *out, int flus pktl = si->packet_buffer; } - *out = pktl->pkt; - av_log(s, AV_LOG_TRACE, "out st:%d dts:%"PRId64"\n", (*out).stream_index, (*out).dts); - si->packet_buffer = pktl->next; if (ffstream(s->streams[pktl->pkt.stream_index])->last_in_packet_buffer == pktl) ffstream(s->streams[pktl->pkt.stream_index])->last_in_packet_buffer = NULL; - if (!si->packet_buffer) - si->packet_buffer_end = NULL; - av_freep(&pktl); + avpriv_packet_list_get(&si->packet_buffer, &si->packet_buffer_end, out); + av_log(s, AV_LOG_TRACE, "out st:%d dts:%"PRId64"\n", out->stream_index, out->dts); return 1; } else { out: