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 0564E43D1E for ; Mon, 8 Aug 2022 14:48:31 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EE21168B711; Mon, 8 Aug 2022 17:48:27 +0300 (EEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2053.outbound.protection.outlook.com [40.92.89.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DEDA268AFC2 for ; Mon, 8 Aug 2022 17:48:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hIcyxuBKdifYb6DScuCBhWu4dnLeMh3VrcjYdbvWmkChwZNY9YAp7DkvG1DuqR7Xd/NSYVyUFeVyLrBOQ5ZlBxMV3DdnVec8yMS7C7PlCGCB0cl3zCTfjZbjp4+IlToqcfHoOHarPu8GJ7J20m0WnBrnX35ByTvuapYw3L+GmC7pvmRMMb4BNSW3BniIEfUz6MhW+cUhwESk+sBQcw0DRMzY+j4cw368A/Z+VOzLXo3SvII8FFsM/HhZRKnDM+46dfU8x4BwrG60siQPiUfa2gIX55V5ROhwUedrG920VDOy115D9tqoMf7zYIoxmfLTkuE2LkH49TXbitKXRls2xQ== 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=3ILV/89OQE7k7drAeQtpvaC/WZ4WILmkkODstZw3fHY=; b=lB8MmOXT61GTBH5/bOWZGz4CJtw1kTQWIWR8a8ToonGWAuCdPaQpM4skjvuFMeiVlIBmCLpu6T4Lhka50ivs6heMeYVuwoE/47XBMsofdI6xnzZaphDPU3tv1hUDeCJR5a9sTfNlloypSiZW9CwHev2xFj89eKModV4ye0Hb4oRKAG8dDlitg2RDqfPTZeRsBxKX5TbJrDf9zfSjZ0kEPgmiiCnGIRngfLBvHzvoZtY0nG4rc//pyxK0oRvR8XOImHbhdd5/jhU74o6VRHFLghmWxdUoM2idQgwLklhCtQBSuPbdwPHqbnHWKLNAHovNklkj/GlHMPh8edFgw9LdLw== 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=3ILV/89OQE7k7drAeQtpvaC/WZ4WILmkkODstZw3fHY=; b=V1TcHKMKjv6ACpGUmUkbkEPoLXcM13GumWOrWg8B+jIE+ENCon+ahgQXmbQlBHFXaEpQzDsLwEuWxyqn+H04MTi3rmXyKSo/YMTpj3BSzyS+UhYyqOrYpvuIS06YH/xM5eR7hW+nXWXdO6C+lnYsZcvCstFX3NqP54UQjWAMTmh0rAC+zgLWND9wVieLe8hkDs3jwueaeTtBvjcb0YxPnYx25Tz47Rv3KCHRr0LYm4gmLuL7SgOIgmbSHD4mvcvzlfCqRroDQBqmkAawJQeaO/d0OgBb7w4foc2n+Hrujx+uWXUE9QXTAdSNA6n5Wkr/HrkNYixQDWPNRqVKIeIuGQ== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AS4PR01MB9111.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4eb::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.18; Mon, 8 Aug 2022 14:48:20 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5504.020; Mon, 8 Aug 2022 14:48:20 +0000 Message-ID: Date: Mon, 8 Aug 2022 16:48:17 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220806233520.1154-1-pal@sandflow.com> From: Andreas Rheinhardt In-Reply-To: <20220806233520.1154-1-pal@sandflow.com> X-TMN: [CiQyqvGy6bBIkY8Oa1VOPmmwLCNMeZRN] X-ClientProxiedBy: ZR0P278CA0195.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::11) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 341213e8-e206-41e5-b434-08da794d0905 X-MS-TrafficTypeDiagnostic: AS4PR01MB9111:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SwdVby4nyorEuTwqIA3XthBEn1n7a837/OKeGu6qfigj0TdA3lqRBLKvUrU7XDHGi8DHyMDWe9g1aB+nXXj6L7F0ksBgEMG3ekhDplNMZm8gPg5UXsZ4cHuTWQs/4CBrMh7lWthKDBZP8w021hQXg+WiJlDyCkGLLIGf2O8tQsEBC1lCzIMKeYhG5sR/jCYpM+65NshAvn/6q4jViHiU1HyqEVFQmA4h3D8zrlmeRYTudW8Eprk7kr7p6Ih2aoc0K8bSs6Jd/UKeieHIflK7m+KHPK3mChvKrkGxUjSXDSDjS9uxg3LedGFD5Aumm7whQM5j6e+1clYJOkk/9RwqtSa4H1DXXx/PtNFsxdursnfhQcBUCzJZ6R9J64oxPx7rJfHMM0HPLQeImcctLpvAV5+4ZBeozH/9K11CSeULmhQEfbXdnKTlesJr85MURj2CybN1Ge42u3t3ECRo8jzSnurXzrdLwvsYs3+9js4KCqpRNJpu9DrM+EQeiSB93Wy8i2GynQKkoPy1sC08pgnZaMZgfFzwW6aEelZBJqXw1FYxPs4zsX2oWO00uwL5xvAgBytQvQComj1oQWIz6wi1QpDadXVOQZO/Em9/47na1BdM6qyezoXghFbnpKwvDUgbf6t+Pkq+kyNyHjUuawth9/ePacJNL7RE4cDv7C6Owz7gk9oP4QdfRAf+RFWPRMWD X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZDFxM0grNklQN0s5UWFobkFiQWpGQUpaQ2g0ZHBXNUdoNko3QS92eEd0VlBv?= =?utf-8?B?WFJBUjVKOHQzcVZ4OU9TOVBSZzU5VlNBbVFGbFVxTiszQWJwMmpiZEFKenJu?= =?utf-8?B?anVpWkZGQ0RXNWxmK3JvS3NDYjd4N0kyWWJ2aDdZZVZDTUlyTHhXMXk4YW5L?= =?utf-8?B?VFNaa21lVmJobXpveGJoQm93c1cxYWR4Nlo4TUJFb2JoNUUvTTl6OUFyNjRE?= =?utf-8?B?OGNtOHA4UjIyQStiT2NmdVM2WnQ3QmpBK2paU2hVVjdDbVdFWDkyRGRPa01S?= =?utf-8?B?UkJBbXpPdVNhWDhhbno5N2prNmF4bUFRZytOVG9xRnFXNlNsV3VJcERTRWNL?= =?utf-8?B?WXhMM0hBTnRvbFl6bFZKRFhXck1tMVdzR0QyK3lWd1hBVE1oSkt0UllDVFBV?= =?utf-8?B?TTBqdnRUZUN3aitlMmtSeE1hR1MraGZ2VUdxSUNFNkpyOUg4UnI0Y1lRZTJa?= =?utf-8?B?MDJNVjI1YkZTbDhVYy8xL2NTMitBQTRWK2tkMFdXQklCYWRLSWx3TW1vc0dq?= =?utf-8?B?OGFFUUFpVFRzTHMzZzNubTJDNWNFVHN6SGg0cjZCYkhKdkdpc3JGUk9wK2RX?= =?utf-8?B?WnQ1RDQ5TU1zclBBM29FOXBzaWtGZVo2V2VuM0hWd2xkY2J5eHN6dmxMWk5X?= =?utf-8?B?dmR4bXBaSXpROVpGbXdSZWlDbUJaVzQrRVB1RXNXZUJxODkyYmtlSHlpaGY3?= =?utf-8?B?Z1l1UmlDS3loZEZEdVZqdGJNNHJKc0FPNVFtQkN4c2JXUmFyZHJsZTdBVm4x?= =?utf-8?B?d0dtRTVBMnd2cnY2aUJyNGlBWjRwbUxxMUlMZld1L3JQWmsvZGJDcUwvSlhZ?= =?utf-8?B?WWxvbkdKUnBrSXYrQW9xUmRyNVVwazhkSFNWK2VvM0dpUUlSa1dYWVRlOUVD?= =?utf-8?B?TThUNzBLbXo0a1hRWHNITmk3L2RRTy9pc04zemUyd0ZFYmpoM1ZSVzBFYzN4?= =?utf-8?B?MXUvbXdabUppMU0wTUJFN3pIdVFwbWN5MmN0MTk4NEwzeXBEWi9UT2NRT25I?= =?utf-8?B?WXoweFYzUkQ5ek1ocVRsNlVQYk5SQUhkVjlWVFFxR3AzLy9ER3U0SGM1K0pD?= =?utf-8?B?Mk1IQkZWbDlVQnc1bWdtOEo0NXBMekRZblVpMm1ORlF6WjFiR1NHcGFZMDkr?= =?utf-8?B?QVE0U1pWRUFmbDhnNXlBQzNzc0d1ZWkxVGtXb0c0Z29iNGZhMmF1MXphTEJi?= =?utf-8?B?ZytGSThneUp0eW9vUHFkZ3lITm5ucWYzTUdnaWZXZ3FxRmFSRGpsTk1PUXJI?= =?utf-8?B?Z0hPclhPYk1KKzFGWk5DdU9EL1NDbmErNStSQ3p6OGp6RkVFN2o1L1BIemJI?= =?utf-8?B?THdCaVBuWStISEphYUpWcHBEL2pqajRIM0tPUnBOZWFSdDJleEVjN0hUb3cv?= =?utf-8?B?Vm1XT09vZlVrUGI4TmVyanJOSHN5ZGErSGJLdjVNb3YwaGExV0cycDBZTnFv?= =?utf-8?B?SXpzSFlwNlpUdUNZbHBLMXk4Y0tqTUVubUhtMGplblVLcElVQlhwRHRnTFQw?= =?utf-8?B?ODYvOW1MTFlLWXd1VnlEVktTRHlPbUd2dWJjT0hYWGQ0b0toNTVvWi8rbHFU?= =?utf-8?B?K0V2SmVGbmVINmtaVmhiRkNrdmNhZFcxMnc4emJMS3llMTlZdmlPa3NZcEF1?= =?utf-8?B?Z2tNN2dtRTNrNGwyVTlTbEoreEJPSzBwNE9wRmw0QlZKUkRJbDk2ZThJbnor?= =?utf-8?B?aHRiRmtmTVdScnlzZTFGaHBTTER5Tkg2eFZMMlhUbjIvTVZvRzFhNC8vSlI0?= =?utf-8?Q?DMr4SU7rzchT31Iqss=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 341213e8-e206-41e5-b434-08da794d0905 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2022 14:48:20.0595 (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: AS4PR01MB9111 Subject: Re: [FFmpeg-devel] [PATCH v7 1/2] avformat: refactor ff_stream_encode_params_copy() to stream_params_copy() 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: pal@sandflow.com: > From: Pierre-Anthony Lemieux > > Addresses http://ffmpeg.org/pipermail/ffmpeg-devel/2022-August/299726.html > > --- > libavformat/avformat.c | 66 ++++++++++++++++++++++++++++++++++++++++ > libavformat/fifo.c | 8 ++--- > libavformat/internal.h | 11 +++++++ > libavformat/mux.h | 9 ------ > libavformat/mux_utils.c | 28 ----------------- > libavformat/segment.c | 6 ++-- > libavformat/tee.c | 7 ++--- > libavformat/webm_chunk.c | 6 ++-- > 8 files changed, 86 insertions(+), 55 deletions(-) > > diff --git a/libavformat/avformat.c b/libavformat/avformat.c > index 30d6ea6a49..19c7219471 100644 > --- a/libavformat/avformat.c > +++ b/libavformat/avformat.c > @@ -235,6 +235,72 @@ int ff_stream_side_data_copy(AVStream *dst, const AVStream *src) > return 0; > } > > +/** > + * Copy all stream parameters from source to destination stream, with the > + * exception of the index field, which is usually set by avformat_new_stream(). > + * > + * @param dst pointer to destination AVStream > + * @param src pointer to source AVStream > + * @return >=0 on success, AVERROR code on error > + */ > +static int stream_params_copy(AVStream *dst, const AVStream *src) > +{ > + int ret; > + > + dst->id = src->id; > + dst->time_base = src->time_base; > + dst->start_time = src->start_time; > + dst->duration = src->duration; > + dst->nb_frames = src->nb_frames; > + dst->disposition = src->disposition; > + dst->discard = src->discard; > + dst->sample_aspect_ratio = src->sample_aspect_ratio; > + dst->avg_frame_rate = src->avg_frame_rate; > + dst->event_flags = src->event_flags; > + dst->r_frame_rate = src->r_frame_rate; > + dst->pts_wrap_bits = src->pts_wrap_bits; > + > + av_dict_free(&dst->metadata); > + ret = av_dict_copy(&dst->metadata, src->metadata, 0); > + if (ret < 0) > + return ret; > + > + ret = avcodec_parameters_copy(dst->codecpar, src->codecpar); > + if (ret < 0) > + return ret; > + > + ret = ff_stream_side_data_copy(dst, src); > + if (ret < 0) > + return ret; > + > + av_packet_unref(&dst->attached_pic); > + if (src->attached_pic.data) { > + ret = av_packet_ref(&dst->attached_pic, &src->attached_pic); > + if (ret < 0) > + return ret; > + } > + > + return 0; > +} > + > +AVStream *ff_stream_clone(AVFormatContext *dst_ctx, const AVStream *src) > +{ > + AVStream *st; > + int ret; > + > + st = avformat_new_stream(dst_ctx, NULL); > + if (!st) > + return NULL; > + > + ret = stream_params_copy(st, src); > + if (ret < 0) { > + ff_remove_stream(dst_ctx, st); > + return NULL; > + } > + > + return st; > +} > + > AVProgram *av_new_program(AVFormatContext *ac, int id) > { > AVProgram *program = NULL; > diff --git a/libavformat/fifo.c b/libavformat/fifo.c > index ead2bdc5cf..55d413b952 100644 > --- a/libavformat/fifo.c > +++ b/libavformat/fifo.c > @@ -505,13 +505,11 @@ static int fifo_mux_init(AVFormatContext *avf, const AVOutputFormat *oformat, > avf2->flags = avf->flags; > > for (i = 0; i < avf->nb_streams; ++i) { > - AVStream *st = avformat_new_stream(avf2, NULL); > + AVStream *st = NULL; > + > + st = ff_stream_clone(avf2, avf->streams[i]); I don't know why you stopped initializing st directly with its eventual value (if I see this corrently, the line wouldn't be overlong). I can fix this upon commit if you allow. Anyway, I will apply this in two days unless there are any comments from anyone else. > if (!st) > return AVERROR(ENOMEM); > - > - ret = ff_stream_encode_params_copy(st, avf->streams[i]); > - if (ret < 0) > - return ret; > } > > return 0; > diff --git a/libavformat/internal.h b/libavformat/internal.h > index b6b8fbf56f..9b07cfb271 100644 > --- a/libavformat/internal.h > +++ b/libavformat/internal.h > @@ -625,6 +625,17 @@ enum AVCodecID ff_get_pcm_codec_id(int bps, int flt, int be, int sflags); > */ > int ff_stream_side_data_copy(AVStream *dst, const AVStream *src); > > +/** > + * Create a new stream and copy to it all parameters from a source stream, with > + * the exception of the index field, which is set when the new stream is > + * created. > + * > + * @param dst_ctx pointer to the context in which the new stream is created > + * @param src pointer to source AVStream > + * @return pointer to the new stream or NULL on error > + */ > +AVStream *ff_stream_clone(AVFormatContext *dst_ctx, const AVStream *src); > + > /** > * Wrap ffurl_move() and log if error happens. > * > diff --git a/libavformat/mux.h b/libavformat/mux.h > index c01da82194..1bfcaf795f 100644 > --- a/libavformat/mux.h > +++ b/libavformat/mux.h > @@ -113,15 +113,6 @@ int ff_format_shift_data(AVFormatContext *s, int64_t read_start, int shift_size) > */ > int ff_format_output_open(AVFormatContext *s, const char *url, AVDictionary **options); > > -/** > - * Copy encoding parameters from source to destination stream > - * > - * @param dst pointer to destination AVStream > - * @param src pointer to source AVStream > - * @return >=0 on success, AVERROR code on error > - */ > -int ff_stream_encode_params_copy(AVStream *dst, const AVStream *src); > - > /** > * Parse creation_time in AVFormatContext metadata if exists and warn if the > * parsing fails. > diff --git a/libavformat/mux_utils.c b/libavformat/mux_utils.c > index eb8ea3d560..2fa2ab5b0f 100644 > --- a/libavformat/mux_utils.c > +++ b/libavformat/mux_utils.c > @@ -121,34 +121,6 @@ int ff_format_output_open(AVFormatContext *s, const char *url, AVDictionary **op > return 0; > } > > -int ff_stream_encode_params_copy(AVStream *dst, const AVStream *src) > -{ > - int ret; > - > - dst->id = src->id; > - dst->time_base = src->time_base; > - dst->nb_frames = src->nb_frames; > - dst->disposition = src->disposition; > - dst->sample_aspect_ratio = src->sample_aspect_ratio; > - dst->avg_frame_rate = src->avg_frame_rate; > - dst->r_frame_rate = src->r_frame_rate; > - > - av_dict_free(&dst->metadata); > - ret = av_dict_copy(&dst->metadata, src->metadata, 0); > - if (ret < 0) > - return ret; > - > - ret = avcodec_parameters_copy(dst->codecpar, src->codecpar); > - if (ret < 0) > - return ret; > - > - ret = ff_stream_side_data_copy(dst, src); > - if (ret < 0) > - return ret; > - > - return 0; > -} > - > int ff_parse_creation_time_metadata(AVFormatContext *s, int64_t *timestamp, int return_seconds) > { > AVDictionaryEntry *entry; > diff --git a/libavformat/segment.c b/libavformat/segment.c > index fa435d9f32..c904e20708 100644 > --- a/libavformat/segment.c > +++ b/libavformat/segment.c > @@ -167,11 +167,9 @@ static int segment_mux_init(AVFormatContext *s) > AVStream *st, *ist = s->streams[i]; > AVCodecParameters *ipar = ist->codecpar, *opar; > > - if (!(st = avformat_new_stream(oc, NULL))) > + st = ff_stream_clone(oc, ist); > + if (!st) > return AVERROR(ENOMEM); > - ret = ff_stream_encode_params_copy(st, ist); > - if (ret < 0) > - return ret; > opar = st->codecpar; > if (!oc->oformat->codec_tag || > av_codec_get_id (oc->oformat->codec_tag, ipar->codec_tag) == opar->codec_id || > diff --git a/libavformat/tee.c b/libavformat/tee.c > index f1f2a9d2a5..dd408dd096 100644 > --- a/libavformat/tee.c > +++ b/libavformat/tee.c > @@ -284,14 +284,11 @@ static int open_slave(AVFormatContext *avf, char *slave, TeeSlave *tee_slave) > } > tee_slave->stream_map[i] = stream_count++; > > - if (!(st2 = avformat_new_stream(avf2, NULL))) { > + st2 = ff_stream_clone(avf2, st); > + if (!st2) { > ret = AVERROR(ENOMEM); > goto end; > } > - > - ret = ff_stream_encode_params_copy(st2, st); > - if (ret < 0) > - goto end; > } > > ret = ff_format_output_open(avf2, filename, &options); > diff --git a/libavformat/webm_chunk.c b/libavformat/webm_chunk.c > index d69db3a004..9e71a1209d 100644 > --- a/libavformat/webm_chunk.c > +++ b/libavformat/webm_chunk.c > @@ -91,12 +91,10 @@ static int webm_chunk_init(AVFormatContext *s) > if ((ret = av_dict_copy(&oc->metadata, s->metadata, 0)) < 0) > return ret; > > - if (!(st = avformat_new_stream(oc, NULL))) > + st = ff_stream_clone(oc, ost); > + if (!st) > return AVERROR(ENOMEM); > > - if ((ret = ff_stream_encode_params_copy(st, ost)) < 0) > - return ret; > - > if (wc->http_method) > if ((ret = av_dict_set(&dict, "method", wc->http_method, 0)) < 0) > return ret; _______________________________________________ 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".