From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 8DFF949386 for ; Sat, 9 Mar 2024 19:37:52 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D5C9E68CC2A; Sat, 9 Mar 2024 21:37:48 +0200 (EET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2065.outbound.protection.outlook.com [40.92.90.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8988068C442 for ; Sat, 9 Mar 2024 21:37:41 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IEyUU1xKCG6BLFJ3ljneuCN0W4TNIv+ymF9MDvRIc55gwkvUJehr/a0yhME7hT4MiQShc75dMUxEwrBFv2iprJGNPUz98NO9zR7nsh/O9vMMLXv7cOUra/zxDKxVd9EiJHYVwpkiPMeSRrQ3fanuXVXbG6KLoK3xbuKjTqpQbf7fo1g0eNiZjKMe9A+XkpXZZjZWStubt1HHE/7Rahv0U4/VRjhUXJKRQ6lnM7FFg8gmp41lYdGAFfAWln5QA6dIhQ+TmS1rmxgVl+Mal3/bVRHXXVb2Xz9CK9LxFzLlonQ8npeUQ41kyW019jOyq3dWxRO13sBOIawZcG/6csNOdQ== 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=QjsxKDZ70Za5xKM8VX7IjCKGhmb0NW/4QvyMq1QYsls=; b=FSznI9+J/DAjyV8putbEEmqjzQj6tmUzy99WEMYebWr/MFnBR7hEdPP0OdSvf/jiDu03qVk0HLflvALvS+KXLwMYuMq7IWVYMaxx6sa4fkF7w23qykrdOVKO4cVtwLTquoLzVXYpfLpkh3YmErpPo/nZ3+SuGhME2dD+PG9kkPU7T7fah2tvFpv2LfSpflPU7yxZSY7TYPdgW8NW93Dhif1Mh4ceZyySzdcjnVoL+gQ3AVm+lNL2VXE1hZzCJRtFBBHyoG28G+L+mLbnLZ6KzU6HiUaS3HrGl3giHrGZO2N439Mzo3r5JuDm7jFK7b9f1+IuNQ784wHG2Cu7XV/+pw== 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=QjsxKDZ70Za5xKM8VX7IjCKGhmb0NW/4QvyMq1QYsls=; b=AJU4+kVYW/2L+x9sBVHv2xcUcjWDB7bPi4DkdNjcn2EPkq+MfSPYrOJJrg7uizeXDuTFyxu6cZt23bTUa9hfKkNOIL08Q9iW1wBqQIZ8HFoYrDtAUEt0PevyOwKLLpmxkyeOxQbmI3zSD5c1GQGEIZEA2MOaTxoyM4wr7Gsix6P0YLp2LLDbkAzNRaYWtYCSbhbT1DeP1nu4Ray0d6+XQkruqmBKoCJnZlaensv7bzSDWqlkikKPhEDqPkYZMqVZq2z+XzykPwW+kP8PnfZHwAo05x0rcntz287/ofUhllqQR6c5DmnS0022mn5cALsBr+lmz3SvKVDyChlCjY32Xw== Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) by PRAP250MB0614.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:294::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.33; Sat, 9 Mar 2024 19:37:39 +0000 Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::8230:ffad:27e5:20bf]) by DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::8230:ffad:27e5:20bf%3]) with mapi id 15.20.7362.031; Sat, 9 Mar 2024 19:37:39 +0000 Message-ID: Date: Sat, 9 Mar 2024 20:37:36 +0100 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [rc8rxp5q6B5A8ecbfNATMSoFrsreOhuk17pMfxzhpVc=] X-ClientProxiedBy: ZR2P278CA0066.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:52::20) To DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) X-Microsoft-Original-Message-ID: <7e8febbb-ba5b-43b7-9726-dfc5099cc66b@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0P250MB0747:EE_|PRAP250MB0614:EE_ X-MS-Office365-Filtering-Correlation-Id: 04121f97-3cd8-4154-f6ef-08dc40706117 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EchDe4I9rB5j5IhKyn7YbCRxFGB7rF2MUetRhPIZu9vOEyDXb8ea3uSz+5hwMmEN0YAQvIzBi6+8HSDZqGxtiVN/SjcGeQMDiemLhVmXulDk3PncQybYb0gnbFL4B8qVawjlcQKssw/eQdHbIBjRN44UVrVkQSaBNWPbk3MefJ4++TpyCemvJ5ZyCQl/wZpioGQJ1sJdibetOvjtArjehaqB688OAuL+a+IT0MNAwuQXObZ8IMl2j1BKDYeBQJi/1NXV56uvrPzqwJVIrKQDgm/gHunUux4A/8FbtAakFAI20NjuIdasCa5/loh+/yP8DeWElMSls8XZO//tmOf5QIyy3FsuyzwQOu/khdQAzi4eSHZQLpCzBNaEsDFEBtYg+g/gAgZzXE93VanEeTWGAjGbCUPCFDQwteR0H0xsd0w2pqF3Z42sZzQ7/dmwXVsdAfT6utI7HqhgngpWtDzKmVA0W1mAyEmCgkjaMqbDhPhtzC4DEMKf+cwuUq37ilckvf5fReZhmKiDXI9nvu4yT1vCsj3wO2HCYsccmiGBHrwX0bFY1Crs6IVW5vmJ8fsx X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?OVVPT1FwWWRhYjBCaGNqUm9Cc2xkTXZCRXBqQ0JEQytrS01qL2NBUkQxdFVR?= =?utf-8?B?ZnNheWR6OXY2S0hLQ3pwUFA3cXdMUTQzdjM1aitrdnNYdnFIazJEblJCSXB0?= =?utf-8?B?VkhmVkxWck5XRkY3WVIweE9LY2RNSGxOb0FZdHBWSHVxZHFhaFFTbXNxOUQw?= =?utf-8?B?WlNITmNBS1NnVER5OTZkZUx3aXBMYW9LWXl3NDFjTUtDaWFTZDE1UVZqRjlE?= =?utf-8?B?dG1RR3diek5FUGUwK0l2Y3lSSjVwV3dQME5taHowWlNmc3ozRXlDWXJ3Q3Bs?= =?utf-8?B?Ty9DWlVuZ0JZR3BBZGlHWThNck9nbHhJb21ybzRvM3luWGNaa2hGWFFPazZI?= =?utf-8?B?bUJMaVNqK2xvY29NSi9aL3dtZzFZUU42ck9ybUlreko3ZkZNZ3NLbHV1Skk0?= =?utf-8?B?NnJnak5lZEp0dmZrVnNYZnNaRGFLUGY2MHhGSTV4K1Q4VHNldFZxTWhZV3dj?= =?utf-8?B?WkxiOEVEc283c2NCVG41NUcyOWVncjlOY3puNlQveENMSC9xd1RzbzdCT0V4?= =?utf-8?B?SWEyUVZpK3ZqUmNseExWMkV6RUJId1Fycm1pTW1LT05xblRRMkdBalNlUTAy?= =?utf-8?B?U0w4U3pxRGVvQU42cTdqV1J4aGRGd3lBTTFlSmZzL3hySXNpL3JZWFE5TXB4?= =?utf-8?B?WTRYemhYVEVNNnQxWHBuMGl2RVFlMzdTRGlERXNZdDFRQUdGbjVseUgrZzU5?= =?utf-8?B?cDhqT0hlRllOdGgwbk1ZSDNLMTMwTUUvNk50eWtSNGhTeGJ2UHlWbW5vSGhG?= =?utf-8?B?WGcxK1RQeVdMVzFBM1hmRWFLbXFBRS8yTHROQXRodUJUVGxFa21EVzhwamJM?= =?utf-8?B?Ui9zWDBKS0tlU1RaUjMwdG1BMFVkMjhENWFFT2J5VUFJRlRrZ2xONEFHamYr?= =?utf-8?B?T1pWZ0swRjdDUW8yL2dmUzNvVE1CMU9VNStHeG4ySzRQVW9YbUkwRU5TVW5k?= =?utf-8?B?RS84UFV0N2txSDV1TUVzeXp2ekFtWktjTEdyY2ZXSTFDYUljYTNFQVJJczlV?= =?utf-8?B?YzlhbGpGRThiLzhDQnA3RXROV2k4ajVlNzNKa0pISldZTkFCS1FjaElqTDF6?= =?utf-8?B?clBMZDRyckhRa2c1SGhTUWdaZUxkQ0ZMV3ZaZ2ViMVFDMXN6MFJwNVM1VnlU?= =?utf-8?B?S2VXVHJzQUEzbmpQWkp0TEdtOXBDd1VRTlB2T3RCQ202WWh2anpNc2hwM28y?= =?utf-8?B?amJLaWRkekRzeGN6TW5KdG5zWkYvV1lLMUJsZitvNzhBKy9LVG55Nzg1dThm?= =?utf-8?B?OUZkeXpjVnVqUGVvZDFERTBsZ2FUWlIrY2xOMFBzWWF2SXIzcDQ0U1hjTjZm?= =?utf-8?B?U2JDY1NvNWRWZFdQTU9ZNVQ3cW8zbnJBbzRFaE9reEp5ajk1V1FyS2Y3RVlH?= =?utf-8?B?V05tdHpEWHhPN3Mwc1hIWEJBelZBK21rNVdqTFkyOXU1RWUydXlXZ0xTcFk1?= =?utf-8?B?cHhvNlJ2K2J2RFpNbEE3Yi9iYVJUK3o4cmtVVjJXaUhPV2UwSGhraXo3Y0Nh?= =?utf-8?B?ZnIxSUlWNzlYanB0NzR2VS90L0MxdHdZSS9qL1pjVXVjRWs5a0N3VTdaaEI4?= =?utf-8?B?QU5QUU43ZmkxWUIyS2pmU1V0eXlaSy9zMTEzTXVmOGhUVmI0bEtNNjlCNnpW?= =?utf-8?B?Y09sR1liZXhaOXhQNUpvb0ZJeVRNMUNOV3RKRGF3UHRKMm1LWEN3eWNuem1p?= =?utf-8?B?N0M0RndlL2Jkd1RKNWZFWGw4eUxLTjRvS2dOa2xPK2MrV2JhWWpFVlpnPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 04121f97-3cd8-4154-f6ef-08dc40706117 X-MS-Exchange-CrossTenant-AuthSource: DU0P250MB0747.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Mar 2024 19:37:39.1290 (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: PRAP250MB0614 Subject: Re: [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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Andreas Rheinhardt: > 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; > Will apply tomorrow unless there are objections. - Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".