From patchwork Thu Mar 7 15:40:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46872 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c995:b0:1a1:738b:6bc0 with SMTP id gy21csp358003pzb; Thu, 7 Mar 2024 07:41:24 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWdxxsigyUGZntCri/MypJC0IZpwWAqtfbC6dPMM4DFiyJOhwvNwyulB3ZznOMkarN85iMQjrZafWnLEj83H3yykWDl6If1XzO+rg== X-Google-Smtp-Source: AGHT+IH/H2STV7TIOKnu/dH5hl1W3OilA7GpZEWje+7oRWTkMvpYqeKgtGMwrgz61kWbmUWddvPr X-Received: by 2002:a05:6512:3d1f:b0:513:2f96:72b5 with SMTP id d31-20020a0565123d1f00b005132f9672b5mr2368189lfv.33.1709826084100; Thu, 07 Mar 2024 07:41:24 -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 h3-20020a170906260300b00a45e382d2f7si81947ejc.178.2024.03.07.07.41.18; Thu, 07 Mar 2024 07:41:24 -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=qIxpEHoP; 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 7CD4F68B5A1; Thu, 7 Mar 2024 17:41:15 +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-db8eur05olkn2046.outbound.protection.outlook.com [40.92.89.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6C81D68C119 for ; Thu, 7 Mar 2024 17:41:08 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CXstD3H0JRkD5QnCkHouRt0dmh5BYZgQy+7p4iha2S6aieebodSsppylcsThpXtjMEF1OPjV+QmC4T2LnVmzwPxeVwefWQJbPM/48mI03FzCoQ9gnIe6VQ/RfKYdpy+Crdbif3XE6Y/K2XLrxkB5Yxos2S7MrVRHQbEFOJLDrimHwWDEKrRCeplk40qjnm/NN2rNMBOk8A5k8kcO3zqZbwLf6mNunTdhyVvH5/hy3D74Gn43GRfQ+Iw7K+a+TUkefkK0C7J8NOoqDTEFLH8mdSyTJyozSAWwbL08R4T4+WuX4i5h4ou1nI5uyiUScFGG+bYbvVGK3b40YPm8pPAtew== 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=6ouH85tRj/IxnGT2aLKTLzaopV1C1H5d0egiW02PTz8=; b=BgcBwAdETAoIjFPJGxNBuqPWX3qJQyBXuaGx/wk75ekfZl32LNyKy9VCvqmuFA9NESU4jrtawZEEQ15QORvRaWikShkWE287FefUYWmfRTAiDol5guuLpcp1mtoOmUmDeoQbbrgOrh6nkynniRWnwLJcqMKTbJBm3Wjq5oK3PKr1raghtqU3KxjCbFCSVkYLTGmWzT4Xoew69+BpXpQNAG4zI9ePBektNHSGsnm8Q2vBzcgOS0TRJQarRg07kejHRYdO3Zmfe8p0RpB651EnEB5QqyW+D7UMD1UQS5P0Tl2qwPCjHkCevZ/Eiwn5kg1jPWh9kX48azVbaJLzRsfrDQ== 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=6ouH85tRj/IxnGT2aLKTLzaopV1C1H5d0egiW02PTz8=; b=qIxpEHoPSyBT2iVENtyNC+LuQvyxo/1x1STlTbOVuBPueW7fhew91bdmJ3e6eon9MEjwt7ECGnH93SSDvhibwAHq7Pgue4Np3N4DFQGcoHgNgRFdkqe5n/JDHKAq1SYdxOoPB3tLMhZPbtcPhVKSqoa+/ff7EepVSO7DQnCL6MraYQjBG3Nnstok6ChKY/lvRojJXuGqarhNqJZ1V1tp50b235uBW/p9DfUZPPSbAtRcpfyXXuF1daOOEe45PaVcKV3XNsf8ReBkYfPOY/Tc9YuUHlvl8JDfpYelGLLGxYgU3/JE6U+tVeHLbVvXFc9uZr4tNgJlz2LJdHumOGJw8A== Received: from GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:109::15) by PR3P250MB0180.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17b::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39; Thu, 7 Mar 2024 15:41:06 +0000 Received: from GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM ([fe80::a8f2:5082:22e4:8d1b]) by GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM ([fe80::a8f2:5082:22e4:8d1b%5]) with mapi id 15.20.7339.035; Thu, 7 Mar 2024 15:41:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Mar 2024 16:40:58 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [jrWPzfgAzKps8grZYnJkrlaElWOozlJ8] X-ClientProxiedBy: ZR0P278CA0153.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::20) To GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:109::15) X-Microsoft-Original-Message-ID: <20240307154058.3614830-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1SPRMB0052:EE_|PR3P250MB0180:EE_ X-MS-Office365-Filtering-Correlation-Id: 1942fe3b-18c5-4d6e-8f37-08dc3ebd006b X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ctd7SMlAoBKcFL8xUDPMLzGi78Z9/DzwqpUpkfCw8kB6s0g/Ewkg+gSDaqtQEovEa9njZfIaFEBqxJr64+MX0hOulueJQ8Ugy0sue3cVh0LnZ75pAsCHuf5ZT85TOEMYv4QyPHvaAFoMM5aJ8VS48f7gAzay8ZWBnq5YYPSR6Ju0TTR5HACpNXme0poOT5wnuNajbmpdfUTB9q7QHdQXNlORsvqHnWuiDq5zP6MfDKB5gz2tYS2bptPXysnQI2fCphLLfTOXgpbGiaCzeF53H8SYEouoKIdy2wNPEn1I5vnpbd/PDiJhKSQbwvU5LNmm1mMh5SqDvBj+pXDM2ZnioBNnKeJe73wYbW3jW2FJWhQajHERBODQLSpTgUrgJ3u5EON8YddHAkgMrCza5kDtriq3sb6DmzDQgNtrJ6V1lFNCtIWRV84yR8llTzKkguHu/gb2//89z3QmgLZAApTdupoOeQ1N9/LWY9pP22UFXm975Z70/m0PKohVCQ2nh9RFkPumoxSA9qfEjg5YSP8VuJFL8mqxFRoONUuiypXaYXiJb6KZxQ9WXpge4iB8vHogU+oYUqBsyAQsPexHrsaJI8NhvUVGwGRv34RtKMXRrQaVaWo6f4f/TY2EdzHAd1/i X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: acWNq2X10N4mUVUgSE/nGQf25ejDiDREuEnibQT+QHAh3N7DliXM2kLw0qT9uxpQ92ywebaGXLDKPqFdYty5woYuQSo8kuQ7Ockgdb49Vy2iSvqI27caWdUX7cVeCB71UPlxi6TypOPNBCp5zed5/suP1mODaXsTEY5/lrzdLo9U7PWosFgJPBd+ZyzgzgdqeJEUWnTb20UN3tPmKFZCTIS2ZJ4vrwKzYlX8usr+XBPUTXmeVVf2EIrCcJrAnEHhz4B/BxUtG1bzalfm0c81woqok6VjTxSxQHB21SUYN92LCxrUVxhMxaMW4iqfI/PT/of5yASB0oPLn2Tecr8i28mGU6Y+woQslMx5n5j8d2eZaarL0ISJfxzjSjebN9VkUzB6VFNQW17MjyLnFoE3MI6pfR5ZVofSidbTynvGE30fxmlTn1YHE2Q5gUxzaqKkkM3A2aobe1WskkU9nmOkRyiBiSAKAQGHZ4onQ332zsnyrkY4lYuP4QRzDLgsKmaUci5GHukKdVzMPS63iiJb/RTLXC3q6o3qmbE3RzFOnYk9HnHs/qP4KmPb5weMvcEp4kLBysdywYDTb8pUqeFpkhWUk08e2GzPf8OC9wdjTWPvBgnvtgyzvak2R5f/bc3ozu4HqDAFcNopNCHMIF51VJZVPj4oa8oXtcVCzruOGdJplDrvxFTo3PcGopJnfRgIMfl4o4a+yxYAQ/+ewuVq2z9AW59EZcV4N2afXRR7e9VLlJXFdVUpYtQX+qCjdTjWEFl9o73R+nREMRG9zMtK3oTTbI9N3UGKer1C5bC9SnGofbo0iE6DNHKzssXp8PEKtxIuKic0U7MYk7eU+JAZ3j8qwP69ovHpj0E9fSYoNmCbmQCOpzZHJvh/hyjasNvFmsE+eqnIpHAN+VOTq3k9f9bfA4EsUurzceiZjt6SDHPg7LjbLYgkVw11XmPNCpahmVSPQD995k/9aBFVRmxvZ3GqQF2voWI7iww8B/kCOKXzdcO7Fbetf/eKojcmxkSKwmdR6P3kyPVLezS/7cIYZsScn003JyDKUx1kmakBB8ToNeg3PjqFB/RkPRLzWP/YEzl5alCvXvD/EkW7kMwTePei7mbsYbz8BlX06cB339B6RKdxxnbSnhPpsYPu1mLht6jrPmEeAwy/aZDtu7CAEMzn2aVpqI9vjbL2y2zWE6OkRltlUo2BACoJdQg4dcbph50IJJ9kOSNKyDMLG95g61JJGz+Iwxc7HXYC/OCloHjF+Lqw5JQIzGPhhJ9KuqGACnV8uwrEFsT6clQwxCZFog== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1942fe3b-18c5-4d6e-8f37-08dc3ebd006b X-MS-Exchange-CrossTenant-AuthSource: GV1SPRMB0052.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2024 15:41:05.8278 (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: PR3P250MB0180 Subject: [FFmpeg-devel] [PATCH] avcodec/libdav1d: Stop mangling AVPacket.opaque 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: LapJIceOcWab Unnecessary since 67e7f0b05eeee37eee1357769038270fda08fe32 as there are no longer two opaque fields. Signed-off-by: Andreas Rheinhardt --- libavcodec/libdav1d.c | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index 79478ae893..08fe7a841d 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -296,10 +296,6 @@ static void libdav1d_flush(AVCodecContext *c) dav1d_flush(dav1d->c); } -typedef struct OpaqueData { - void *pkt_orig_opaque; -} OpaqueData; - static void libdav1d_data_free(const uint8_t *data, void *opaque) { AVBufferRef *buf = opaque; @@ -309,7 +305,6 @@ static void libdav1d_data_free(const uint8_t *data, void *opaque) { static void libdav1d_user_data_free(const uint8_t *data, void *opaque) { AVPacket *pkt = opaque; av_assert0(data == opaque); - av_free(pkt->opaque); av_packet_free(&pkt); } @@ -332,8 +327,6 @@ static int libdav1d_receive_frame_internal(AVCodecContext *c, Dav1dPicture *p) } if (pkt->size) { - OpaqueData *od = NULL; - res = dav1d_data_wrap(data, pkt->data, pkt->size, libdav1d_data_free, pkt->buf); if (res < 0) { @@ -343,21 +336,9 @@ static int libdav1d_receive_frame_internal(AVCodecContext *c, Dav1dPicture *p) pkt->buf = NULL; - if (pkt->opaque && (c->flags & AV_CODEC_FLAG_COPY_OPAQUE)) { - od = av_mallocz(sizeof(*od)); - if (!od) { - av_packet_free(&pkt); - dav1d_data_unref(data); - return AVERROR(ENOMEM); - } - od->pkt_orig_opaque = pkt->opaque; - } - pkt->opaque = od; - res = dav1d_data_wrap_user_data(data, (const uint8_t *)pkt, libdav1d_user_data_free, pkt); if (res < 0) { - av_free(pkt->opaque); av_packet_free(&pkt); dav1d_data_unref(data); return res; @@ -396,7 +377,6 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) Libdav1dContext *dav1d = c->priv_data; Dav1dPicture pic = { 0 }, *p = &pic; AVPacket *pkt; - OpaqueData *od = NULL; #if FF_DAV1D_VERSION_AT_LEAST(5,1) enum Dav1dEventFlags event_flags = 0; #endif @@ -451,16 +431,9 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) ff_set_sar(c, frame->sample_aspect_ratio); pkt = (AVPacket *)p->m.user_data.data; - od = pkt->opaque; - - // restore the original user opaque value for - // ff_decode_frame_props_from_pkt() - pkt->opaque = od ? od->pkt_orig_opaque : NULL; - av_freep(&od); // match timestamps and packet size res = ff_decode_frame_props_from_pkt(c, frame, pkt); - pkt->opaque = NULL; if (res < 0) goto fail;