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 0F6B842953 for ; Sat, 7 May 2022 11:30:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C801268B424; Sat, 7 May 2022 14:29:24 +0300 (EEST) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073071.outbound.protection.outlook.com [40.92.73.71]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CFB9A68B3D2 for ; Sat, 7 May 2022 14:29:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Nwbp/k4Sc9vhNG8XtWtsCSwKxCEjBnJuYnAmDSuCjPv90XCLq1akDX7lYvRmyi1ZGJSjn4vUoi6+zzzt2dnfmdJYpHSUB7R81FnVNv0npoWk6FmkxA2zLJncix+854IA1wmMtu5Gz7iEn/w1pe0rR3LwJiGwK+a8tMC6kQ3h1zJmdppWGQYtDFrgUCVN9HZuZC/s3df0aztjaOd+FiJIdhpvJHV+2Rdcxu1ibwYMoSy7Tqgk5vAnYp1zP+oIUD0BGcJp3hCG7xAHH54fdvJZjaCutf9ijzWv49c/HZm/gtOjte3xycGX+qlIeAJJd4JrAoloBrKeSqrjI+gtkMz8xA== 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=kxLF9bD9h3YuPVrSbZxYS+qIqctqAzLmkkerfC7tEs8=; b=g1jtosnQeGefPu+t4RzSE6Sw0/KQfDpNwtKcxb30478ZewXZpdPwx0VU8N3RpT3mGoxnveDOJnnKcgfEtrTaRxbpRv+BQLNqRQNPG7pEtvyGHkM5orKw6k+CTHHj/IWPLyDOqzAFrrm2YNHGCFUm2bU8BG6zB53Kt1KENSLVycmubQhngmYp1f012uDolkBPKc2C7+woQS0WI2SDPoVrPGSMxyM9k7HcElp2UqVjOM8/C7HSbG+5w/CWMRfUIXFGaZwgzIlnlUq+ly164gigP/7eVgFEftOm/tRfvyaILaSFEP9sfDid9O8EHjVG9y53DvB5OCH5bcN3BEfNxFvObA== 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=kxLF9bD9h3YuPVrSbZxYS+qIqctqAzLmkkerfC7tEs8=; b=q46Dn+sO+W+GhVxuYJ625BTwukb7jH95c9rROzmZNRKiepgyQEdwo3XS23GvfPjCjMtaneCGzPNzkpPLRNA4fjZQQ/SWFDY3lIHYG7v7AZhibp+ZLYTvNmNv9BKmEligZ41YJExBeBw6vWmrqMfm8l24RA/CowOXvdxIKGpBiA+Bic65w5Ly+CuStPHklLXZ/isdccpoBzwImeSUCsxH82GjCaC0j2/Iyke6dJsv9Q5r1JGC2RN2Dq5efdjjGLSmtLxCfS68UUOMLYVzDWIUhYl3TO4JoZXGxuPGLdS4yAgQ5xkrnYtatP6FP1QqiMHlLGY+reR7g5zfS66Asz/u0w== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by DB6PR0102MB2663.eurprd01.prod.exchangelabs.com (2603:10a6:6:e::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.21; Sat, 7 May 2022 11:29:20 +0000 Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431]) by AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431%6]) with mapi id 15.20.5206.024; Sat, 7 May 2022 11:29:20 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 May 2022 13:28:00 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [3UiL5nawnky/e9BpNTxXtNVDUMKbuOII] X-ClientProxiedBy: ZRAP278CA0004.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::14) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220507112830.406162-13-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4db35362-b595-457a-5a63-08da301cd3dc X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRIovyFjHwHllp74iOQFItwnbYBPdB8kijbBgQ80YpasMWky3pmgJqQ8/90p4J8hTA4n+PAG53dqSNLkbeQ5wM9y3HQyzoMxfYguTUUKF1VnMbiA4qx+/GfIjqs4Vo/vEfMrdXj4wYdSBRC1NI3YGGyZGT8KOQszqIegWfMzgZ5pFtLlPsq1PYhHkxxKjYNG9f184Rt+s9sw3CJtidfnQIYU8wzy5+p92LY6VQ9jJH1D1CrK4QMKx/wgOLA+CNTnC8P+5RkwV+Ziv5QuBvMfS1AuLU7Gsht2lbiKVtenl7J9aSz5H05WlOqL7Dx8d4Sk9q3NAN0UfbUxLgfA42Yf2pkG13zsy9fySU28ppmyrb/nNYzzmKoYO0LD7jU0VjWbW1jl+5M/q83wycqoVPQFi37qqrJWUaJWJcutdj6BbY5RsYOqQTbXUZ0x+GOy8ZCS1ka9e3y9sjFa+7MLNrLDIm2blQ4Wft7VUvntiCXDTCHAcarUkWja3qGhPoq4d8O5WZHtyXSfp7zJ3r5YiRcju35YoeiyFOD8FugC+pewWW0DJABvQBMZ0zmlqqw3qYQqTyV5m9xAg9WgJkicagglAa1nRU6L1QKI2tFguqL8cEyRs719mqNVn3EAn6jLchjQSPlsWW0ZL5tp5xcO5ZoLXem1mTEVx4ecPGtUDI67D6FEsrvW/qI8SLjihZqddBFu0SaDV1IMvrNWJKxmooKlLbgvTttQl7Itz2xnowmOVhj70sra2KYXCZyCCzvydFWvio= X-MS-TrafficTypeDiagnostic: DB6PR0102MB2663:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KxQfJEMAyB8lI2shX34BQh48rWu+lrTcKFqz7vZXPT3Mo5F1aFfrHr5caLp3iIeBOUl3neHNsc56cgDt6gWklonDo2xmxK76pGnDtVdwtusjYVb5GLa6rBEV5nEWozuj3kmB1WnEEgNKWq5OtZcmydSZnXN34RrxMjJ1iy+OOmKaPazpzyCGKXU3JwCRdwKBDAaXwNDaq6auypZtFp84P5otQe/Cpq7WNXnpx34rD/3n37jqDc7a3+PkuIJo+wnit2d9gbaLcTyfjvzYRQisRuctOaklgJxb7P3FFU+zQH+wYRaSGAUjkH/9CPqRoWtIOFPFq3628uVy+aG0Vhabozjp33D6gN5/9sn3J6bmMNFp17jWl2/uoyZBoR2wzOYn9jYLX7qsOqkvzeywnGmo4LHGCF4gBqeVRKeNTGDwAteczRn5ttCgpWA77Hv7LLh0bIdYKhrP59ECZW6ACIuwAfX0MzSAzlTStIbHzu+QWGarWObEEEhmi2sN8V1CfWMmfNAhL5M2oNKXpWPOkMMzsaNE+IMiWx2uubTkE9gkJ0FsUHGnIdYVi+4GnzKAowsAmK9wC9dMA+9xD1hf7dknJBhS2SpjE7bRASDnSCDuZRuS7t7B4m9G1uE0ACav9RZB X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?4QNVb8IKaiyEWgE4LuHKPDRbXzN7kQ6PwAOpygU68ChVMCLN0ldVaBC2MV3b?= =?us-ascii?Q?W5bLnMw4vXJVL5KjWeZXIB9Eme4tUA/Mx7Cy8ElKc9cMdOJRBG8Ev8FIahLB?= =?us-ascii?Q?AivA+Ols6bWXjed2jG9kQDBpzG+mvPPpaqD64WdBOxQi80q+yVLZhbGLyFfj?= =?us-ascii?Q?DHst8DTdidatNW5Zz5JwcTcV0yGcF9T51ympyrojc582b1wSJvxxtCONjYs9?= =?us-ascii?Q?Q9AkNAo5weXpGOE2Cj5XQRWYt+6GJMbVOh6Y9zcWmFm0OF9A+KoByCpRRmUB?= =?us-ascii?Q?ff4cFyIDyvJA6INODuUgD017U4IHMy5n5IRh5epW51QHBDL4mK//WPqT1iLv?= =?us-ascii?Q?wmsfxgJgLJ2M7SILwR4Fnrjt3oZWGZRl4fxUNPV3C0sdeCcqu6L05WKMO7cD?= =?us-ascii?Q?Wp2Aw2vPw+IWmQDXppvPbbyGPGEPY0UDQdVszqcnlUHRoOZfZM+vRRkwy8Dv?= =?us-ascii?Q?fzxZQNjTtRhGGydXLQraOdIzcnjDhF97j6qfou7lRTyaAo0AtVtHXKy+eVYG?= =?us-ascii?Q?aDKSOxVMGYhzhYbQ56P2SeaB/kEKm68dwLfVI/3lbbgXeXCdI0Xs9BqyC/8J?= =?us-ascii?Q?17+CdW8ezPeh99/3Pm8KiJb2Rfkz8pwX0nAVFbdQWSq72PvCx7g5Zr5OgHc6?= =?us-ascii?Q?cqeY+r1f6B9M4wAmaQxLjfxpP4xfiCJ8Ym1tlJyp0wVI8pFM6r0rS2zwcPWf?= =?us-ascii?Q?tdWW6PLcpU8xcriB+Yv9q9cCZX4IfPuhkxeYFasTyfA4rAaMXuo08jKUByLT?= =?us-ascii?Q?H2XZDmZ/Rq9IEsCaPcLoEuWeqG4Ij6SdUWWxFe+ejyq3t9wKUOmGVQ9qLoBK?= =?us-ascii?Q?jI8Q2wTXAhKy5mcBefixQ/vsxQqD13wX6U7LF/Os/vYWYH1QMUAQSCJqRMdn?= =?us-ascii?Q?7QMXsolt2JIMY8tD7b83KxLmi2JoI/h+KTD/Vle3VKcMz7mtg4/kMFH7/fVx?= =?us-ascii?Q?CNMbSJlXM5zOsnkxbvcgfm6OT+ScSISiT1W1rZwD7lE1rWECZprB7vGuCasQ?= =?us-ascii?Q?3k7BHFW3vb0OZMzgriJG2G1wVnQy5yhV9xE2BE6Oh/xAkA5F3ffaLpKycRoo?= =?us-ascii?Q?7KhUE/bK+ODhK9lPKs7sYZna74ottGJCsZI8g3kJRRGp+doJ92zQvXxCTnRb?= =?us-ascii?Q?TI1yVaTHxOfj6/aq3V/O4OUvdICHDbWZcGXq2Cs7gRge8MCxUzRdx4XAApAH?= =?us-ascii?Q?N7/J14z4aQS29DgsaqE24TxGqdu8VRWMeFev9DbCiCdvk3b2LiCnHlXBcV+k?= =?us-ascii?Q?xjXPFhGObch6Bug5NWnmOzVXOVX/bkr4DKayr9oqr9sDuTOj7bMu4YpZksj6?= =?us-ascii?Q?oVtaDTdPrh2wk5J9Ubw1rQmt+eYpGfQoJ7uIQZcrVaklTtPHBv0+Jt1HI3YG?= =?us-ascii?Q?nufdzQTiGA08534fkeJoAYt+L6Q7wHbMK2RLJlcvMhjHiIpkx8zW02AOZv49?= =?us-ascii?Q?gnueOLiCNKteN32b8WfbV19svbMbxtmV?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4db35362-b595-457a-5a63-08da301cd3dc X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2022 11:29:20.0511 (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: DB6PR0102MB2663 Subject: [FFmpeg-devel] [PATCH 14/44] avformat/utils: Move ff_stream_encode_params_copy() to mux_utils.c 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 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: Only used by muxers. Signed-off-by: Andreas Rheinhardt --- libavformat/internal.h | 9 --------- libavformat/mux.h | 9 +++++++++ libavformat/mux_utils.c | 28 ++++++++++++++++++++++++++++ libavformat/utils.c | 28 ---------------------------- libavformat/webm_chunk.c | 1 + 5 files changed, 38 insertions(+), 37 deletions(-) diff --git a/libavformat/internal.h b/libavformat/internal.h index 51deb1c49f..16f84374f7 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -781,15 +781,6 @@ enum AVCodecID ff_get_pcm_codec_id(int bps, int flt, int be, int sflags); */ int ff_generate_avci_extradata(AVStream *st); -/** - * 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); - /** * Copy side data from source to destination stream * diff --git a/libavformat/mux.h b/libavformat/mux.h index 1bfcaf795f..c01da82194 100644 --- a/libavformat/mux.h +++ b/libavformat/mux.h @@ -113,6 +113,15 @@ 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 2fa2ab5b0f..eb8ea3d560 100644 --- a/libavformat/mux_utils.c +++ b/libavformat/mux_utils.c @@ -121,6 +121,34 @@ 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/utils.c b/libavformat/utils.c index 44ceeecac6..5bda45d124 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -553,34 +553,6 @@ int av_read_pause(AVFormatContext *s) return AVERROR(ENOSYS); } -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_stream_side_data_copy(AVStream *dst, const AVStream *src) { /* Free existing side data*/ diff --git a/libavformat/webm_chunk.c b/libavformat/webm_chunk.c index 9348e6680a..d69db3a004 100644 --- a/libavformat/webm_chunk.c +++ b/libavformat/webm_chunk.c @@ -28,6 +28,7 @@ #include "avio.h" #include "avio_internal.h" #include "internal.h" +#include "mux.h" #include "libavutil/log.h" #include "libavutil/opt.h" -- 2.32.0 _______________________________________________ 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".