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 2B8AE47553 for ; Mon, 11 Sep 2023 17:44:48 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1E9B068C970; Mon, 11 Sep 2023 20:44:46 +0300 (EEST) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01olkn2098.outbound.protection.outlook.com [40.92.65.98]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 33EB268C8BE for ; Mon, 11 Sep 2023 20:44:39 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KRqyPvLodIqMcQEW/7dWoVcfoB3jZ/+GjqL7LolWUc6wceEbxNwLSdsdmhg/7aSZxwSFVzHV6LNnzChaqzMbvf7OnfrDCI1bAYUL7NCD4e0L1EboczjYeU+souoGGWaKRtDgrvWUsBY0PSnqfF9X0rdvWR1jnRz9YX7NiPr9GzGJcSKJroNg88lENPlz7Ltw38etDmShh11vGTKorkl2gwUO3Z4wYD2dNt23W0o9LJ/UVB8Y3EaDFXeDXm/nzjuvZHgmx8UqyQtKPC2WuuM5PhGWTWzU2gNCL7O/GoN4ulH4a2OmhJoBFZ+Sqc1OlYEoE8F5A/87kRPe+ub7GUJPog== 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=TAORLU1iwX8pb9pWrzmyJU+CDzsJQfcGWNdShgrOTVc=; b=J/rZtKbT8rdiRQ0IHxFRdw/EJzR/xD81L2g7SyDh3ORl/oILSJ1rbGGcip1FStg+cqMGsQEyyBvoPpRUZj8thr8qpk5xQCG58bdT66vgbnGTolzzvip0Yl2apjDp5LhU0bLHG89XvsNAYFIXGkvsdaO3lVyFycrHax6POXDqae5qLT5yN4FWWZO2e+Deh5NCko+1clmaz08E8nzqIxAohFlCp3EkdtxS79nLmopmwTzqixp0OtTERTMXMIYmS5/BNUscdRtMB9hIDsxVl4TOpgr08OXeMUuM+y+JZEyemLz4nmZuw+wjYOATq+STLdWqKaXAkDrC1LFoTi1SVuCTMQ== 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=TAORLU1iwX8pb9pWrzmyJU+CDzsJQfcGWNdShgrOTVc=; b=VJsndPlzu9c5AMGHkeiVIamZhvv3zm1kn961yQl0KoI07lH8heUKxB3OBpstNe4mPZFemZyrgyma/diE7mmvIV/WTIWzojAzIsa2yhY3mmjW9d3mfQddc6q0YuxMl4OK8PITG8fxgICz1KvIngHtBh/pXDgYNWjOmp2JjpA4B6b51xLL4kU5gbiuwkldKNVedSUyvAwKXEoWQQlbecjS92/BscNbXmiHIzmW8Hk3tolZJMxFmfzSh8XsC+3zg+AtJr+8sVsyCS8vXkrD3O8QcE6/z6bxcLU/pzgTmf6ai+DjEUvq8EOG+4zKPYrsmbdDSHVFViqdAV6l3ljhSYyPoQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0396.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37f::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.35; Mon, 11 Sep 2023 17:44:37 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6768.029; Mon, 11 Sep 2023 17:44:37 +0000 Message-ID: Date: Mon, 11 Sep 2023 19:45:56 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20230906174431.45558-1-jamrial@gmail.com> <20230906174431.45558-3-jamrial@gmail.com> From: Andreas Rheinhardt In-Reply-To: <20230906174431.45558-3-jamrial@gmail.com> X-TMN: [uh7er/RFUQagJR+JZRTLjmukbLgUpi8d] X-ClientProxiedBy: ZR0P278CA0217.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:6a::15) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0396:EE_ X-MS-Office365-Filtering-Correlation-Id: 21bddcc8-3028-48cd-8eb7-08dbb2eec493 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NVcVRqEmoRK9qmFbK78NJlmzEWdWWzCeglwsTsqWZjttEl4lQtX50Ir0P9tc+I2TTjISTA7zgsKC+DAIn2qwdXfVntPQ1jxbwoCNOV1OypXqDD3Z1QTZpjizHx2sS9OgIQy5Vstoa8MDKE0xgsLw4weuPcKf+uH5hKk0rQFRMZAKlXu1kD0AHTTthF5w20wCCf0dPfSi5kTWiOL1/yc70XiAZC7iUSmdLTu49040T2YX7xKfq9ZxCP9tE6zdNFT9XJZW4P1DSuH8Ea8HOJ5n6fRq7cNIyJiNatdz8q+i8NHf0M/9ScwB6g4xnx8m+UKLM81lhJiYwQOnf/iwFZguOKfQ9QJDMaRtrsukVcI0JwpaPI6zo6eUbNtBRF469bO/CtFJ7HD1JOpn7E1dlVqqKga0Gu5fGZWMmY5UQSxCvwyIe157Nc3/kn5l+GqD7igiNpkmvJpRs/aw72pZZLMnsiOzeVdOkZKdndHdPjs9Fu4qMaYbHCjy7IoiJXc0QKd2SIbpfnP87y8oBMwi/vBHuBv576UOBfFksYd50xDtoAfapowb4obuA9BqzLZ/2YGR X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dDBSOW8vQXJPelY4ZTVGL1djamlaa1RVNGVEcjFVNGlpaVhsTGJoczVpYmxQ?= =?utf-8?B?djhzZ3pnZ2MwMk5sbGErM21ieDdUdzJxUHUrZ3NCb1c4TXhaYzdhaEVyZTkw?= =?utf-8?B?K1A3SGpja0hTSzJOTEdXTUVJYTJVVEwwSXVFcUNONVE3QnpsM3dxSUJNeEEr?= =?utf-8?B?U3NZb1RLaE0xOW9rRTdHVElSaFBubjM3NlZBcVpnYm9MN2NIMTdIZStuRE1R?= =?utf-8?B?REdDeEk0REtNQklrT3NBSGZqL0s0R2VwNlpERmYrYzdtbXExNnZZUmg3N3VL?= =?utf-8?B?SkliMVQwa3h1NzN1NmJiOXZZQWRFTG9WZWU2VDV6Sy9IRFNmdG9HcVpHVk5H?= =?utf-8?B?RkovQmlJeEk1dTREOExjMFk1NTI4TURFMHphRlBZcDh6dUZ4bzJrdmxLdCs3?= =?utf-8?B?bmpDdTBZVlY0dTZ5VnE4akNtVVJyNkR6NGJpODg4NE1XK2p1VUljSDhxT2Z4?= =?utf-8?B?M0I0TE96SUhsYkhBbjNabW5uQkJMSEMxQ1EyaFpRQjFaazVtT0lGQ0RXZHRY?= =?utf-8?B?Z2xscWt6UXVWSUN2L2p3UFVkVXdocGYxaDQ0cFhEWEpUdnhqMVZVeWV4cENt?= =?utf-8?B?MG5mTGhrdVo2U3FTSTU0SitDVXc0MTFLYnY4Sk9xSmFLbnNGSHIvWTJLSUs5?= =?utf-8?B?ZGwzdTkxTWllQkRmNjIvSUtFNnVUWTc0R1VzQWV3cFQybE1ja00yL3V2WlNp?= =?utf-8?B?T01sWEUvbFFwZFpPZWVzWk8xU3AzL2hWVEdQOWhRbEFhbDk2WWkzbnlCcHo5?= =?utf-8?B?bmxWMElIcmg4SDZGaWI3SDRZcDQ1VEMzbWdkMlU3NEZnZzZuTWtNbHpvUlNZ?= =?utf-8?B?QVZldmp6Q3AvS0JsTVo1QnVRNFV1UW1xNG5WNHpQZFV4bmM4TUlrL2dSei84?= =?utf-8?B?aVpIdE5UQ051Y1lUVkFJWXZwb2dxc3RTeitGMW9PcExPV215YUlDb2g2cVM2?= =?utf-8?B?clo4eUdVQXh2c1JjTVVHRjJ3ZGIzVklSWGFuT2ozU2xVc2JNREJTTlQyUURE?= =?utf-8?B?ZE9hRmV1NjZDalJpczhDOXpobk4xdTVQb3Y5eDVxL1Jrc1lldW55d3h0M0NZ?= =?utf-8?B?OWdOa2g0UkhMdFdhbGl4NG81aDE1ZnpaeVZNbzErMERFTmlDS0UwUWQvWExI?= =?utf-8?B?WmZLdkllUmRSbFJsQURHL0E0SmNrY2NEQVFYYlVDdmlrUHNtd01CeEhqWjdC?= =?utf-8?B?dXVXN1JjRDM1WmhKNmtkVW5RaDM4eEUrSUprNHlISVRxNnYrQ2ovaXV4RjNQ?= =?utf-8?B?NHpRZzB6R2lzNThacG41ZEFuekM4UC9TQzNzcmpZWUpUY3BPcjYycG45QnNy?= =?utf-8?B?RlZ6UTZTUGxyOWVkYjIxQUpXTlZKVEhNTGpsTlpuLzVXZ2p3RkdmdzFHanZq?= =?utf-8?B?b010Q00zV2x3MXE2cmk3Y1pQUzkzK0g2NXdzSzJwVU5KOXhNN2RhZjMyUzFu?= =?utf-8?B?SXBnSm9pR0NwR0ZYTXVpSWVIQnlvaXRNZHRDRnJma2tYeTI0MDZxNGhET00x?= =?utf-8?B?V3EwMzBpQU5JQVZwQWxKTnJwVng0Sk5id01Ed29RaUxVZGJJaEthZXllWmRP?= =?utf-8?B?aDY3bm5BOWE2N1BCRGlJSkFTalhNV0JveUtiZFg5d2tyZ1lOblh2MUxYTlo1?= =?utf-8?B?SmMrS1pRQ0tHS0o5Tm40Z0pONXZjZWZtTjFuaEx0dEE2MFMwRzFTNCtMcThn?= =?utf-8?Q?P0m5+DJZ13x2vVVaGgY4?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 21bddcc8-3028-48cd-8eb7-08dbb2eec493 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 17:44:37.5301 (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: AS8P250MB0396 Subject: Re: [FFmpeg-devel] [PATCH 02/10] avcodec/codec_par: add side data to AVCodecParameters 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: James Almer: > This will simplify the propagation of side data to decoders and from encoders. > Global side data will now reside in the AVCodecContext, thus be available > during init(), removing the need to propagate it inside packets. > > Global and frame specific side data will therefore be distinct. > > Signed-off-by: James Almer > --- > libavcodec/codec_par.c | 81 ++++++++++++++++++++++++++++++++++++++++++ > libavcodec/codec_par.h | 6 ++++ > 2 files changed, 87 insertions(+) > > diff --git a/libavcodec/codec_par.c b/libavcodec/codec_par.c > index a38a475dc7..c0c941c2b6 100644 > --- a/libavcodec/codec_par.c > +++ b/libavcodec/codec_par.c > @@ -27,11 +27,13 @@ > #include "libavutil/mem.h" > #include "avcodec.h" > #include "codec_par.h" > +#include "packet.h" > > static void codec_parameters_reset(AVCodecParameters *par) > { > av_freep(&par->extradata); > av_channel_layout_uninit(&par->ch_layout); > + av_packet_side_data_set_free(&par->side_data); > > memset(par, 0, sizeof(*par)); > > @@ -82,6 +84,8 @@ int avcodec_parameters_copy(AVCodecParameters *dst, const AVCodecParameters *src > dst->ch_layout = (AVChannelLayout){0}; > dst->extradata = NULL; > dst->extradata_size = 0; > + dst->side_data.sd = NULL; > + dst->side_data.nb_sd = 0; > if (src->extradata) { > dst->extradata = av_mallocz(src->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); > if (!dst->extradata) > @@ -89,6 +93,32 @@ int avcodec_parameters_copy(AVCodecParameters *dst, const AVCodecParameters *src > memcpy(dst->extradata, src->extradata, src->extradata_size); > dst->extradata_size = src->extradata_size; > } > + if (src->side_data.nb_sd) { > + const AVPacketSideDataSet *src_set = &src->side_data; > + AVPacketSideDataSet *dst_set = &dst->side_data; > + > + dst_set->sd = av_calloc(src_set->nb_sd, sizeof(*dst_set->sd)); > + if (!dst_set->sd) > + return AVERROR(ENOMEM); > + > + for (int i = 0; i < src_set->nb_sd; i++) { > + const AVPacketSideData *src_sd = src_set->sd[i]; > + AVPacketSideData *dst_sd = av_mallocz(sizeof(*dst_sd)); > + > + if (!dst_sd) > + return AVERROR(ENOMEM); > + > + dst_sd->data = av_memdup(src_sd->data, src_sd->size); > + if (!dst_sd->data) { > + return AVERROR(ENOMEM); > + av_free(dst_sd); > + } > + > + dst_sd->type = src_sd->type; > + dst_sd->size = src_sd->size; > + dst_set->sd[dst_set->nb_sd++] = dst_sd; > + } > + } > > ret = av_channel_layout_copy(&dst->ch_layout, &src->ch_layout); > if (ret < 0) > @@ -178,6 +208,32 @@ FF_ENABLE_DEPRECATION_WARNINGS > par->extradata_size = codec->extradata_size; > } > > + if (codec->nb_coded_side_data) { > + AVPacketSideDataSet *dst_set = &par->side_data; > + > + dst_set->sd = av_calloc(codec->nb_coded_side_data, sizeof(*dst_set->sd)); > + if (!dst_set->sd) > + return AVERROR(ENOMEM); > + > + for (int i = 0; i < codec->nb_coded_side_data; i++) { > + const AVPacketSideData *src_sd = &codec->coded_side_data[i]; > + AVPacketSideData *dst_sd = av_mallocz(sizeof(*dst_sd)); > + > + if (!dst_sd) > + return AVERROR(ENOMEM); > + > + dst_sd->data = av_memdup(src_sd->data, src_sd->size); > + if (!dst_sd->data) { > + return AVERROR(ENOMEM); > + av_free(dst_sd); No compiler warning for this? > + } > + > + dst_sd->type = src_sd->type; > + dst_sd->size = src_sd->size; > + dst_set->sd[dst_set->nb_sd++] = dst_sd; > + } > + } > + > return 0; > } > > @@ -262,5 +318,30 @@ FF_ENABLE_DEPRECATION_WARNINGS > codec->extradata_size = par->extradata_size; > } > > + for (int i = 0; i < codec->nb_coded_side_data; i++) > + av_free(codec->coded_side_data[i].data); > + av_freep(&codec->coded_side_data); > + codec->nb_coded_side_data = 0; > + if (par->side_data.nb_sd) { > + const AVPacketSideDataSet *src_set = &par->side_data; > + > + codec->coded_side_data = av_calloc(src_set->nb_sd, sizeof(*codec->coded_side_data)); > + if (!codec->coded_side_data) > + return AVERROR(ENOMEM); > + > + for (int i = 0; i < src_set->nb_sd; i++) { > + const AVPacketSideData *src_sd = src_set->sd[i]; > + AVPacketSideData *dst_sd = &codec->coded_side_data[i]; > + > + dst_sd->data = av_memdup(src_sd->data, src_sd->size); > + if (!dst_sd->data) > + return AVERROR(ENOMEM); > + > + dst_sd->type = src_sd->type; > + dst_sd->size = src_sd->size; > + codec->nb_coded_side_data++; > + } > + } > + > return 0; > } > diff --git a/libavcodec/codec_par.h b/libavcodec/codec_par.h > index add90fdb1e..169e595b7c 100644 > --- a/libavcodec/codec_par.h > +++ b/libavcodec/codec_par.h > @@ -29,6 +29,7 @@ > #include "libavutil/pixfmt.h" > > #include "codec_id.h" > +#include "packet.h" > > /** > * @addtogroup lavc_core > @@ -223,6 +224,11 @@ typedef struct AVCodecParameters { > * when no higher-level timing information is available. > */ > AVRational framerate; > + > + /** > + * Additional data associated with the entire stream. > + */ > + AVPacketSideDataSet side_data; > } AVCodecParameters; > > /** _______________________________________________ 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".