From patchwork Sat May 7 11:28:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35676 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp2123386pzb; Sat, 7 May 2022 04:36:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwAPxXxOQDZemdXqlxmFiVw7z0bTP3ZS+hbx+FlmQJ3jRgJAL6n4n5yfy6oj+OhMDiFNerL X-Received: by 2002:a17:907:2d8a:b0:6f5:df90:45c4 with SMTP id gt10-20020a1709072d8a00b006f5df9045c4mr4670138ejc.662.1651923367759; Sat, 07 May 2022 04:36:07 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w15-20020a170906b18f00b006f0034e2730si7759497ejy.930.2022.05.07.04.36.07; Sat, 07 May 2022 04:36:07 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=mk0jl7k8; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B171868B4F0; Sat, 7 May 2022 14:31:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2070.outbound.protection.outlook.com [40.92.89.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 763D068B413 for ; Sat, 7 May 2022 14:31:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eSfDWe0P6wUbdbO0rxBcXjqcMwtRLrhEaJg6Q/zEOcL8tQ2hcfjmQwW94+EZ+TMgqFH0jIctBaxEKBljwgv8AWU3GeKGE5vBvi7NtSFmxHszfDsmvN+k7If8Nh0+/BYx3qqCFgiMyo91x8QrRCacKLNwWzy3EgSS+2SQhIleZh38/P9DdiYIEgkZbqW2U8COZof3vPVxQcGmczjMx/WOn/Oyisb3qgUiAG2+mJ/zNnylrXNE5c4KbdzpB9sROdXzDq4/TReG5cnIMKMnYHSv9wiz+6d+t1Xt/i9Rpu6Bl5SDcOJnQt7adSOuShOLDKPgKo8QDL4PJw9rcED69StuYg== 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=A0b4f1mx1rWUQUT0G8BuciBPkJUCQ5q8C+J4IURQqhA=; b=YJekF+jYUHVnX15ZR4UyqfuGr/dUXIMImmp1hAveUfUL05M3Zx0LX+X6PcecrnRla2JihhRX2RdUrH9P7iDdxIAN7aLjgt3Pt3Evc+2GI7sIgl4yYvJkLH4I6eI5cjBxUbLa/rsdUfmX7mbvxf0pMyFoSX48XnDotHJMthBB4ZgNC46zY89acXeclt2HGBj2/6sTTLJI1Vqbpl69GR4xkvn0AGJGgiZnCJoyx8mNR7XGmnumjmuzaxZ30QcYv2JRoNszw7wxfyCdOcnjwwH5vuY1XxaIBcDjUissGSgC/STeLBsDbzGd5HXGmjnb6xgRDh0Ttt6GIlb4QO1s72zYeQ== 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=A0b4f1mx1rWUQUT0G8BuciBPkJUCQ5q8C+J4IURQqhA=; b=mk0jl7k8llnWiA/TY1OozpgaWmkINUwDTTP9UNgBSrxQt7L9uLOTP9PHFUsgPXYREJFtmFu7XPbuJqPRWMr8kZZUmJO+fM/Z3xaCJbWY3tHz3nmdV1bgp/NXbXNnnBZFSIDb0uCnA9w4e7MRl2ksecUbFuQEwQkaPPxhmN3BI23AhzGtyKnuHThvpmBvOcxtSLpBka956qRVdjrxv7FokkCW3Gs91O5OPm+qk65Oq5MB+NJP3yGwro0siLl/uwTHawLlGAmRFaM9usoeVq+w7r03JONrqBFw+Wxpz608E6d95sR6JYqRMg55sJMUe+WpRc+doYj/Bttd8CW3Tm/rdg== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by AM6PR0102MB3128.eurprd01.prod.exchangelabs.com (2603:10a6:209:c::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Sat, 7 May 2022 11:31:26 +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:31:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 May 2022 13:28:29 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [bGqzJXDCeB29H3H0OhOnaatxEG0F53C+] 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-42-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 60d7a396-a56a-457b-0db1-08da301d18a4 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UJIjRE5frp5NC4IyFBWce+atiGmsDaoZhwQirNq4f985YXNpnAz2tcY1Zq9YKxUvxppj24PlWhUpUUXQsb9Eh2lYaj2ltvAxMfP9ZxObjwryhk+SnY5cczeg9Sfms4XluY/cAo/jhh11+Kv5KUs88WTYs2bBnS/FvJgXKxd9o9gDwcr5G2brhhgugkSE56jwc3dLvyexZgqIpxcCQ/oD75QKJmA+1/vYWQR+sIPZdsIj327r1JfleTawbfFwlakueQER3AfeGjgiADPKP3SP+I3DFOIKqfEuxzWDHpTQTWcgEaxIo400wlIOEezBQjLuioPd/5Qa7A3Kb9yQSFpFrU39bGKW6F5NDZiepYa4TRI4u+v6LbRfkAdsgN1RRSrs7BcLClJy32RIDJAvq4/2v+zIsQNSwQdXVQzRBZ5DEA+7JtzkVrxT+hjoJVVC5s2TvFfZ/6Y0/CwgimQiF2yPoAEeBlh3+zYYQL6sxrD7HSEROr29lXpIFgGE9/4bJHc8oDi4bUq6SOW8v0wSesAhjtmRE0RXX/QyWG+/0xc1DztuMHTMHhu/tKu5cMbT63OSs5qQV6dmBbMXBW0TREbQQK57qi8clSq/oD4DeCClp1+woJKB8yhSJRwcGXCSISLu4Wa3qNYKYYoc8jph3RPHap9iEY4SkQ82UM5jyVBkcC9luuNTf6gkK7bnj6y/8iNiwsIJUY+1cObUg== X-MS-TrafficTypeDiagnostic: AM6PR0102MB3128:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Gk5MfAhAVhuATQVI+T72E8f3pBR+FMyWS1MDJixjZqMayxDt/D3qsKesz39qGcZN+PMx7HVLZMQXYQ54GIgU6RPbEZHvOtZY10X+vQUvNIbivUW6OAFeb/nwFGKX58QGrq1KYNoPoXgHIgrWlc6nAk0OZtCxZ2o6FZk3RRMgeyWf26SXt9jxkepGj+XuvBFO654OMg5S998ayeZjggxLs2+/8JVEh/UhM6Grby1MpQFFa/1nvS6l3xEgcDtvoEn5xmExeGEpEx0m8NEMKBJOayX7zJATwdQH1gCMdC2DpbLGNkjFiE6SD/ttzRJ8ZEwuSp5EK6flXVFA8f5lobFjVwMGCtdUc3olfbY4NlsvZKTqEfLbcvLSAIGHm3LLjzOT2Q4Na47v24Dwe/ZZePUZni40hV7g/JUAx/kz5HhD8jP6shoouvJgXSwSOOp99KPRecGVr4ZLGs1rdzuf51ZNLV6NaSqv2aFLH+cO98Hvo024BfNANWCg5IUUbhBcIp/1TqthEqRkSMnbM6JJDFHhk/XXDyTBgEQHjDv/aCQ1QQBgHl3zxh6eeP68r4Vc+OhWKLRiVOFG8ToWVq4dtASCc8qSAeU/i2HrS7alPKfkB4gAwRG/HZ6dbEwOhpSpMKJQ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: l+OhGpT+xgyBwIWubAjnUmEbouhd8v9Pk82WoZP7Gl+bkUEGT1rOHZ+1JMu31jl2W08oufNqizeC/Fqy7CqnOhvRqtxsTNRr2BDb5slHAWUqT53Ld6gZNa+d+AeJXo8R+C6z4mfJCWgGZSawJUrjS4+GzxJ+N+mntsDgcVlkEklTje9oMQcv6HWTnK1h+7o3FATuLCvH/nIX8A9qWLeAFWV2Dk6LPeT5Y2b3PV3ZxjeaMGA/7teQfB+tZ+lCGYzDgvpZ97vtbloNhqf8nK4w5j3tIwNjHpLIykoQM0QbIr8oqa2s6UABQAxxNOqDIZdx/bBkq7AZfVgTKhl18pSn8vaA1pLvEY882LDKX2F9nN18T5u+OtEeuR2TDSQsEtiFncZvmNBvuhIfemJuaO/UC7ir/UOmlvTxM+KQRFipBwiBsu6zU7o+/oku9QIIOAHWryz01W4e2RvNzCpm/jNKwiaG/4bgxXL/+lFPVLD/ck0AXdriBpHbA31AcTFfoBbN+pjqQ7VDukjkzfX/q7RxX/ihpz5lPn/THT1Yyy1zyh4ceuk//tSGiuObtlb2dOxBbjHtrl6FAg/7B83kXxG9fKGU+SIEtBfu07shkM0uRhNPFm2vqarvLJ0Fb7Tx8UszxgZ2+jzeWf3kLCuNUfs6RWwNzYh5pIO6fhTFcbGF3mKvgMI/psndao545UMCvO89m1QPyhcgdeJUREDjVmYoE3QR/sg2PtMR2eyl3nO5tu0eSmn9r0pq4jJSAZUp8394umOotP+HaXvzzAn4Uqad1uo0DaNFmiFBKOLNr8l1b1ZVmz+9SNu8uf76jPQB++cTvpZcRt2VF2cfcNtbG2S1amR8i5zB+U5gyIYSsWRBWwmZP4XeJgxVxfKVFZgC8te8FFWKswRDTIuzAsRmW1A0FjLADoztNRcoc+BtA+C51HHmVmJ7D35fO218oXaJTP8VIibX0Vdxc98+kJ4QSuq3JBL2nkQTDXkoz3IND426XWyEFoeZPVaTQmBXJXuB6/8bqvqQZO6VhhJhErax0F0ERuANObeh7zOpwwekTHJNA45+WwPWNBF1ViIkzyjKkKctul0d7qK5oJO21qkujj3iKk+YCrqNumrmJlnpHGj7Qw0jQL0UrWtcGDRCbo9Pq8zmRRid67a1JzBNWnyzAYbWVx487Oi1fAyGDFAZQ5DSf6nj9wc7szyxxR8xRbTt4d51P7gcpKMLI7tQJUzZDRQQJ4Ipews3ALSJMMkPzqOwYkcZ5OHHqpMMazG4V/IwTKw/D2r2EyPD0TxoFp1jtRu3UEngiE00KnhlZ618L/WykSgkP1Rn22tEGAqWV6kQKYO6DVRmhDWpNRi3K4XVz7ocLUDDHYnTApCmaWNwTkMWU8CQ3pCg+7tTorgjk1QCQqyAdy+tBNqipGp48ItBHupm3Rty6yfOgKB+Hxllktq6qcpuXDTuAWTNDvhJPOVvjYWY X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 60d7a396-a56a-457b-0db1-08da301d18a4 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:31:15.3653 (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: AM6PR0102MB3128 Subject: [FFmpeg-devel] [PATCH 43/44] avformat/utils: Move ff_stream_side_data_copy to avformat.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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: qEWWDtEa3NCi Signed-off-by: Andreas Rheinhardt --- libavformat/avformat.c | 30 ++++++++++++++++++++++++++++++ libavformat/utils.c | 30 ------------------------------ 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/libavformat/avformat.c b/libavformat/avformat.c index 2a919ad89f..3eae41d109 100644 --- a/libavformat/avformat.c +++ b/libavformat/avformat.c @@ -204,6 +204,36 @@ uint8_t *av_stream_new_side_data(AVStream *st, enum AVPacketSideDataType type, return data; } +int ff_stream_side_data_copy(AVStream *dst, const AVStream *src) +{ + /* Free existing side data*/ + for (int i = 0; i < dst->nb_side_data; i++) + av_free(dst->side_data[i].data); + av_freep(&dst->side_data); + dst->nb_side_data = 0; + + /* Copy side data if present */ + if (src->nb_side_data) { + dst->side_data = av_calloc(src->nb_side_data, + sizeof(*dst->side_data)); + if (!dst->side_data) + return AVERROR(ENOMEM); + dst->nb_side_data = src->nb_side_data; + + for (int i = 0; i < src->nb_side_data; i++) { + uint8_t *data = av_memdup(src->side_data[i].data, + src->side_data[i].size); + if (!data) + return AVERROR(ENOMEM); + dst->side_data[i].type = src->side_data[i].type; + dst->side_data[i].size = src->side_data[i].size; + dst->side_data[i].data = data; + } + } + + return 0; +} + AVProgram *av_new_program(AVFormatContext *ac, int id) { AVProgram *program = NULL; diff --git a/libavformat/utils.c b/libavformat/utils.c index 848afa3c35..667ed0c4c5 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -255,36 +255,6 @@ int ff_alloc_extradata(AVCodecParameters *par, int size) /*******************************************************/ -int ff_stream_side_data_copy(AVStream *dst, const AVStream *src) -{ - /* Free existing side data*/ - for (int i = 0; i < dst->nb_side_data; i++) - av_free(dst->side_data[i].data); - av_freep(&dst->side_data); - dst->nb_side_data = 0; - - /* Copy side data if present */ - if (src->nb_side_data) { - dst->side_data = av_calloc(src->nb_side_data, - sizeof(*dst->side_data)); - if (!dst->side_data) - return AVERROR(ENOMEM); - dst->nb_side_data = src->nb_side_data; - - for (int i = 0; i < src->nb_side_data; i++) { - uint8_t *data = av_memdup(src->side_data[i].data, - src->side_data[i].size); - if (!data) - return AVERROR(ENOMEM); - dst->side_data[i].type = src->side_data[i].type; - dst->side_data[i].size = src->side_data[i].size; - dst->side_data[i].data = data; - } - } - - return 0; -} - uint64_t ff_ntp_time(void) { return (av_gettime() / 1000) * 1000 + NTP_OFFSET_US;