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 3A71A439DB for ; Thu, 4 Aug 2022 17:15:44 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0DFEE68B9F3; Thu, 4 Aug 2022 20:15:43 +0300 (EEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2022.outbound.protection.outlook.com [40.92.91.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2B54868B9E7 for ; Thu, 4 Aug 2022 20:15:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N82L8TrjQKgjTtpeGgv2t9Z1N7fe807ka6RrIi1Htlnzz6Bf5O+pZYMtJC9Z5YUQkypZpTyASJyrbDnS1743TW+mQR8X5hdMiEUOH2ITFEGH3xC/BZmoKSAkYdk2u1gVvONCuLEJIUoPnqL7giNP9oIh/m8hmF7EnCSkHv8DpqMg6zLioqLhOKE2Fu9hnzQ6ZJ2eWxLT1v0IzEO3rgPaaYOqLgdFlM3qoF+Z5vQdcK/dnnTlDiD1u4QNOws6yI7y86Oe6I+6cnDDvEsjw3Yx87f4wtV1CxgStyfQszrntl5Zo02qGSZmjPEbUXMqv7aYfEJb51og2+MmQqVEmJ5+Tg== 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=gS3gZQ/JpA4mLWhqNuVy2i7pVftkOTwGhgpAOGfnVcM=; b=E2g9Uu9UIEXdsn/6llkT1RbMpTIfavwNEN6iPhOoC/hwmkbvatpdXs+T0iX/Zm3xB21z3AufLg9xzxGC/k7k0KxaLjEhD5pxQjB8yj2xBgwoNnVk999CIkB86wHqVJBmJ31JozuM0Be2O7Tb9UGRsYty3dY2fFGG97J1b1zSTJL6qfAiPx/GKl7oY5TEYvmR5lGBqiH1Vv4zlvUNPYXelcy/ToGQDNEp6hzcmm2xP7uJv+Q/5CNqHH9XAGe5CPPO6VAxUCJAe+Bis8K/a33Um8dGrkvYgXlmJ8QhDRrBipK5L21jioGGiximFNPkmLLIGl1jSimVBbcvkW0ArixJYA== 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=gS3gZQ/JpA4mLWhqNuVy2i7pVftkOTwGhgpAOGfnVcM=; b=qss9tHCezUWfS2xcu3EqqWqaEqRcy0WWvzpykP9wVhNkVWm6xcmNuB8FYA1YhPX3VDbYtR8UUu/SxB8W15OpZfP/b3nD0DKm/LK9NeHL2X8iD/swFqb6o7Tyx97vaMuKAhRw1wBvsplJe17tfoGAZ9DzNAN7ZeZ5RN82r5l7PbHsVF0fQk40BR1P7XxM+AWZ1twiGRS6Ha+DaO3Wzgv8yHItqvwK/tTOF2Le5fBefxl1RExOVpbcemvEQkMVXpkJFSluKFhR+VwE78oKqzS3D36ITBNMm0Kfo62bLQelaQN29rWfN1cHMz98ZAjJ75+hhCvama8t6zeE+d4UNumwtw== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AM0PR01MB6114.eurprd01.prod.exchangelabs.com (2603:10a6:208:163::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5482.12; Thu, 4 Aug 2022 17:15:35 +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.5482.016; Thu, 4 Aug 2022 17:15:34 +0000 Message-ID: Date: Thu, 4 Aug 2022 19:15:33 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220731215157.22022-1-pal@sandflow.com> From: Andreas Rheinhardt In-Reply-To: X-TMN: [/cnetqjSxRnV90wI2sGpTOUdyW6rNLgH] X-ClientProxiedBy: AM5PR1001CA0058.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:206:15::35) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <63fb593e-7af0-0ba7-66e9-0cb9fb1552bc@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 616bb382-f548-44a0-7192-08da763cf14b X-MS-TrafficTypeDiagnostic: AM0PR01MB6114:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0NGZMqs4EzaEA87veyZGu2rUlzrTCURN8FjhqsRESoRokrRg9OIlWwgm4PUq2UynKq9sb5kH/QXuPGSSNFU4YfYFeTD3cccL937yryflVJ0PMyKbNh5Agj6kaYQmByCI5aFgc+AyAMQFEAzPREqTRYibQb1ehoxKf1VJ2bj39TDyyDdBiNc8XNB5x0iW4Ba1AMprfrDsLBogrYlDtbvje1vn/f3nXiDV/V83w2dRp1gW+001+Log2YACYh/x4oDJHo66mAQBOnkcK8hYYAD9R1ccEGiVPMyevdBMM14nMQitD9gQqw8LS0L7hXrrCfik9zifoEe/KEs+6rytjYar3HIRlzCUr7wVsfnSDS6FmVuXYtdfVUQ/oUa1cAoRXdH4HhuJUbqs4yDMk0dyII1rfpjp0pjNBXuq+9Fe1GxpvamJtc/q3oirWKDw9S1jeYhJdcBqnbu0mc6i7ReYv3xoOcK8pVF3OZyE/qySPGQXfvZHcjWUu7sThPpZezMNkJE7FVatygnp5RcwfrAAZqMthJkpdmtDkeazqSv7NrweAm7WPeG1szdLRAgqe6bPe5crgvOKchmTchQCk4nyimPWPQ8Zim4Ktt5OZLgvaX8ldocn5rfI7mnPAY4ftYYAEuNk6MFokYibBj1GxSgtDiV2sd+lkx4skpj2OsKTLFPS2GeqDRUS2VnPqRGoIL/SDsRTCHloKh+5V4cU7RMdv8CUZgOj0g/ZcBqHWwy57P5Gmf4= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?M2VJY1RJa1RpcmpvVTVLQVV5Z2xMREFQbFlnODNZdFVKdVMyblIzc3BMSERE?= =?utf-8?B?Wi94eHI5bFpMd0N5Syt4S0F6Tjd5cUJVa2dHQndPVDJXb2FFQkZ2NDFBSFYr?= =?utf-8?B?OGtBTkJQZ3dmdzErR3pqUHFoNCsyNkNWcUJ5SlhTamFtdUtVRHpSWFJnUUtU?= =?utf-8?B?bURZM244T3RSMDdEYkhjbkZ4OHJaNGxOK20xQk1ucG5zSnR3ZDF2OVFVQjQ5?= =?utf-8?B?Qy9yMjVoQlMzOXR0bmJDUHdpUnM4NytlTEQxTGVsNGN4UzlaZ1VvckVzYWZQ?= =?utf-8?B?djkwT2JXVUlBdUJiN1BvamxEcS9xQmNGZGVZZWZsODQ3emM2Yk9ydTF0VDI4?= =?utf-8?B?aEhhUlFoemxNNkJ3bnhTa3gvV1B5cENQL3RKNFVLMzRWRU5MQ2hIcWZWRE10?= =?utf-8?B?YzNGSXQyM1l3dUhJZnVGRjdkWUVrc29HSjd5cDR6ZERXRTc5ekhUMXNkMlhU?= =?utf-8?B?SjY1STZlTWs0VXRoYU9xU1hQaUxjV3FsNkMzS1RsNVRUeWNpYXM4bE15bjlm?= =?utf-8?B?RGtNYkp5STV6dHY3WkhkVnQxTmphdnpjaEZKWEhVV2VVNU4xenF2R1dtMGNs?= =?utf-8?B?aXgrSENoTG5MWFdLcmFxbGJ0aXpGTHVVY0NURGYwMG83Y0lPQmJTS2Z3ZjRk?= =?utf-8?B?SXpLbm1IWDJ5bG5tTitlZWxHNW5xdXo2eS85bXZFeS9Kc0lmRVRBOURvVEdi?= =?utf-8?B?ZlcxdFAwUVNDeGhjU3M2MmJhYXJGbXR1M1p6c2FiR2JVOGk0czZZTTNPblM3?= =?utf-8?B?cGVHOW1jVkZXbEpaL0RGc3JqeW5uL3UxUUVtM2N3R0VZNDFIWHRFKy9XcXlX?= =?utf-8?B?YWIzNW0zeDNWMHBWdEM0TElyYU9ib3ROUkxzN216TDNuRVpWWE9HNVJLdDE0?= =?utf-8?B?MUk2N0ViL0JrMnJYU0pDQnppYXdqMy9LRk1NZFZjY0tGOW9LWTUwcGxvbkRU?= =?utf-8?B?dHREZTFZNmU1SWQ1UnpTaDA2TUR0RGZSV2dVZHN2SVZPOTllSmg4b0tzRUNs?= =?utf-8?B?MHQ1Z3FmY2Q0WHFnQlJiOC9PRTVvRVJYcFNOVDE4WUdMamV6OFVPTHExMEdN?= =?utf-8?B?N25HaXZyS1FaMDFqYnYwYTB3UElzY3J3dFhrL2ZsTUVxcDVJZUpxNHMvRlpF?= =?utf-8?B?TjZ6enQ1blluaFFCa3dzdVRQNFNEZTR3bDZ3RjNPYlFQNWFRdmhBeVE5ZUE4?= =?utf-8?B?bUY1MGdIZXBjdEZrTk1SNnhLTWVMYkxCMElsZVdiUTd4OFNWVEVTMVg4ZG1G?= =?utf-8?B?REtENW0yTGdxZThybHIvOHlJWXNWQ3VNRU1OVFlTSGxQaVVDblN5am95eXJa?= =?utf-8?B?clZhZnBIOVN5ZnNVdXJtSG5Gdm9sV0dNWGlTMWNzdVliZnFzYWFvY2FVWGNE?= =?utf-8?B?aG5EVW5vbEY4SVdlZlA5Z1ZvYk90RzVLRURZbThOdi81OUdGbDBsRjNKclR3?= =?utf-8?B?YzhSMlp2OVdqTDJUajYzRXZtcmZNOVV0N1VrN2Fud2RENFJPTkwxVjlQNFVN?= =?utf-8?B?ZXZraUFBc29nZldLRDBUUWRXSFRKRlllZGY3SnExTVljVkZDVUt2Q1pHVEdQ?= =?utf-8?B?b1NkeGFzM0F4b2pDTmJhQzVmNk1sNTFWenQ4bEpQam9JUS91SENTdG4vVEpl?= =?utf-8?B?LzJiL3NsVDZXUTd4Qk4rS1Zsanhqa0Z2QVpRWWdYekpSRW15R1JDV2F6bllx?= =?utf-8?B?dHJFSDA2N2tUNG5ESWNpWTlZcFpMVWJYeG1QbEZ3cDM1Q0dzQVRBVG4vUnNC?= =?utf-8?Q?WzPVGGcj+FXgJXXZeo=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 616bb382-f548-44a0-7192-08da763cf14b X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Aug 2022 17:15:34.7058 (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: AM0PR01MB6114 Subject: Re: [FFmpeg-devel] [PATCH v5 1/2] avformat: refactor ff_stream_encode_params_copy() to ff_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: Pierre-Anthony Lemieux: > On Thu, Aug 4, 2022 at 9:53 AM Andreas Rheinhardt > wrote: >> >> pal@sandflow.com: >>> From: Pierre-Anthony Lemieux >>> >>> As discussed at https://ffmpeg.org/pipermail/ffmpeg-devel/2022-July/298491.html. >>> Note that ff_stream_params_copy() does not copy: >>> * the index field >>> * the attached_pic if its size is 0 >>> >>> Addresses http://ffmpeg.org/pipermail/ffmpeg-devel/2022-August/299514.html >>> >>> --- >>> libavformat/avformat.c | 40 ++++++++++++++++++++++++++++++++++++++++ >>> libavformat/fifo.c | 2 +- >>> libavformat/internal.h | 12 ++++++++++++ >>> libavformat/mux.h | 9 --------- >>> libavformat/mux_utils.c | 28 ---------------------------- >>> libavformat/segment.c | 2 +- >>> libavformat/tee.c | 2 +- >>> libavformat/webm_chunk.c | 2 +- >>> 8 files changed, 56 insertions(+), 41 deletions(-) >>> >>> diff --git a/libavformat/avformat.c b/libavformat/avformat.c >>> index 30d6ea6a49..242187c359 100644 >>> --- a/libavformat/avformat.c >>> +++ b/libavformat/avformat.c >>> @@ -235,6 +235,46 @@ int ff_stream_side_data_copy(AVStream *dst, const AVStream *src) >>> return 0; >>> } >>> >>> +int ff_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.size > 0) { >>> + ret = av_packet_ref(&dst->attached_pic, &src->attached_pic); >>> + if (ret < 0) >>> + return ret; >>> + } >>> + >>> + return 0; >>> +} >>> + >>> AVProgram *av_new_program(AVFormatContext *ac, int id) >>> { >>> AVProgram *program = NULL; >>> diff --git a/libavformat/fifo.c b/libavformat/fifo.c >>> index ead2bdc5cf..fef116d040 100644 >>> --- a/libavformat/fifo.c >>> +++ b/libavformat/fifo.c >>> @@ -509,7 +509,7 @@ static int fifo_mux_init(AVFormatContext *avf, const AVOutputFormat *oformat, >>> if (!st) >>> return AVERROR(ENOMEM); >>> >>> - ret = ff_stream_encode_params_copy(st, avf->streams[i]); >>> + ret = ff_stream_params_copy(st, avf->streams[i]); >>> if (ret < 0) >>> return ret; >>> } >>> diff --git a/libavformat/internal.h b/libavformat/internal.h >>> index b6b8fbf56f..87a00bbae3 100644 >>> --- a/libavformat/internal.h >>> +++ b/libavformat/internal.h >>> @@ -625,6 +625,18 @@ 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); >>> >>> +/** >>> + * Copy all stream parameters from source to destination stream, with the >>> + * exception of: >>> + * * the index field, which is usually set by avformat_new_stream() >>> + * * the attached_pic field, if attached_pic.size is 0 or less >>> + * >>> + * @param dst pointer to destination AVStream >>> + * @param src pointer to source AVStream >>> + * @return >=0 on success, AVERROR code on error >>> + */ >>> +int ff_stream_params_copy(AVStream *dst, 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..a8f3e94714 100644 >>> --- a/libavformat/segment.c >>> +++ b/libavformat/segment.c >>> @@ -169,7 +169,7 @@ static int segment_mux_init(AVFormatContext *s) >>> >>> if (!(st = avformat_new_stream(oc, NULL))) >>> return AVERROR(ENOMEM); >>> - ret = ff_stream_encode_params_copy(st, ist); >>> + ret = ff_stream_params_copy(st, ist); >>> if (ret < 0) >>> return ret; >>> opar = st->codecpar; >>> diff --git a/libavformat/tee.c b/libavformat/tee.c >>> index f1f2a9d2a5..dbfad604d0 100644 >>> --- a/libavformat/tee.c >>> +++ b/libavformat/tee.c >>> @@ -289,7 +289,7 @@ static int open_slave(AVFormatContext *avf, char *slave, TeeSlave *tee_slave) >>> goto end; >>> } >>> >>> - ret = ff_stream_encode_params_copy(st2, st); >>> + ret = ff_stream_params_copy(st2, st); >>> if (ret < 0) >>> goto end; >>> } >>> diff --git a/libavformat/webm_chunk.c b/libavformat/webm_chunk.c >>> index d69db3a004..39f21fce7a 100644 >>> --- a/libavformat/webm_chunk.c >>> +++ b/libavformat/webm_chunk.c >>> @@ -94,7 +94,7 @@ static int webm_chunk_init(AVFormatContext *s) >>> if (!(st = avformat_new_stream(oc, NULL))) >>> return AVERROR(ENOMEM); >>> >>> - if ((ret = ff_stream_encode_params_copy(st, ost)) < 0) >>> + if ((ret = ff_stream_params_copy(st, ost)) < 0) >>> return ret; >>> >>> if (wc->http_method) >> >> Looking at these callers shows that they all have one thing in common: >> They create a stream and immediately afterwards copy stream parameters. >> The caller that you intend to add in #2 does the same. How about we make >> a function that is equivalent to >> avformat_new_stream+ff_stream_params_copy above and use that? (But >> please leave ff_stream_params_copy as it is in the form of a static >> function.) > > avformat_clone_stream()? > I was not thinking about a public function. But clone_stream sounds good. - 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".