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 2F30F4366E for ; Tue, 21 Jun 2022 02:35:04 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8243D68B661; Tue, 21 Jun 2022 05:34:52 +0300 (EEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2015.outbound.protection.outlook.com [40.92.89.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8564B68B5A0 for ; Tue, 21 Jun 2022 05:34:45 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IbbQ3wVo4Rg39F+jTmCqs87JBviz0PPUcroeZK4h6OI2OraTWSuTfJUG97+CTpnFOxQalZR+pC8CC1JDBFuJBBTnzenULZ45RPA6t9sRedteJyG5zTNiHPQeifyzNh6IvUMlzoh9h4cxQkLBnX4O+747pNnbH172fOPYR9RIRxXm3E1GEMYLJCE0ce7D2tmP3BETOUx4+2tQPNmu1hWI8O7OeeWo6Bjb2OBgeRNHvFSTTnvxSFymLNFrAssqCGTBW6G8DxvpPOfhWupcU+bfEgh0Ei/n0qFo6uKtqDpv6oQg3+6nDHGlX+Rr7idd8bFwmzZAuJGZne+2KgVSFqdYeg== 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=ufk5D6ZBWfbIr4j6HUT9AGjGKhBATu5M/2/owV9zLok=; b=EHh3fUmSiPhvAUI3wjE/fGwiYRNMD7CDjsf7CTZXVqNwvz2diKl34bmArkkoRytSKl58zFCKXIdHOnLerCdoVf1pw+oiCrGx6jdJKreEESZQFX/FSKDSjhGsPC0KYSEjNeTa5mayxbhwGlGmAe5k7t8r3DhQq143AFdv7j30JDUgZebWX7Gh4xLbBcEYSO7r95jy0RsPdaCcnlgBCo/2+TCp9Y0noZo72KadJXBERtRKuTKGXJVZEekzVm80VMVXre/mWdtgIL1YfnLaWn4ZTJQvwH7Qa3TLWeH+KrIfGtJoxQBQMe8J/OXkRBGtatZpWTceTcooWy6PULw6Hidp4Q== 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=ufk5D6ZBWfbIr4j6HUT9AGjGKhBATu5M/2/owV9zLok=; b=AUvjtwKPvrvnjqOsMp2nGaxY52Wo7ZRXji14Fo/adVO8mdlAMTfbYc+dsvzKu/pMXqBkY/zxdMgVC6uEd7mIOdAJT839NOFK/cZQieLR4NAmCeHJ9iWaS4G0xfm7ON/AYh+imaDMBdmMpXcVN0sAGacCwcGz3Lu+53/LYTjehYAnxuTuU/I957EVvw4JVPJCAVDHrDDYWTkhj4Fy/bVNJBfmNTtcUcW8nGUzGgIMdhcob0Q33cN2F7boF6aezLKni+1OVTU5HKPP8MObbT5+7qjUDuwMbDuuhaHN3oHFkTxPaDJyDYU3JqN0BWCmbK5A7Y46PNVPtqJk8e4Nwy0nUQ== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by PAXPR01MB9074.eurprd01.prod.exchangelabs.com (2603:10a6:102:2b4::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.18; Tue, 21 Jun 2022 02:34:36 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5353.022; Tue, 21 Jun 2022 02:34:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Jun 2022 04:34:17 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [KjOT2MHKnl6TkYH6ENk+yEDylYzlxzCA] X-ClientProxiedBy: ZR0P278CA0187.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::9) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220621023418.3322554-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0a708a2e-8171-4bfa-6234-08da532e94cf X-MS-Exchange-SLBlob-MailProps: ZTmCor6bjd+txgLjEkup8ou8XEaNp8HXfzcEGGKRH15czYnyo74c5sWhBRDi/WWyqDNScAbXY2JkkYMJCSYmWWyBiT8PUkr5bKgX8jHTAF9I8e0F3ZcwgtVlIfB+a7P+8+yn59+u+lVv2xCKIcY8172vCEbEstbAeK6OIYaSYS2iQPp/6LABt22zcWGwRNwOvjMYo/ss9WvTobHehWVm+PLm2jofCkKGDHdYQZdY8byUotsyKLNBeXkAWOWRtJk5duKVA5TIFoB2gBpMGwfU1bZRcMMn6G64jLhXdtX+fcZuXg+1yuYv4CbbkYngPiaNdOOCTBMPyNI+qZBOSclxk/2JEbVu5I1rQUeRk/j/J+aan/OLo+CJNDdHnPNco+4M+mM2ceK+rLzlLgUaKTCAkdRAON/dgTbjbWrdeAjHaXB2iNd5j1OeXs4R36TgTE/Ea0JlTs2AvFUQdfiVvd0FEgZQOcjkZ7XlKquHnSV9ryak6QXW9bzR3T19c5b4dsRP/EK3XsX1H6pBzyHLgjvpBD6vgSExnpSvnn64q2KwBsO8+Pu1c+CCtoZZllY5BzryFvsnb8uw0Ey6rkxQ+85ln9ZDWdRtfu82KSXRAlIwR5zMpQT19laea79DbmNw63mAzCNvI04GZLLaGho1yR53/J0ELOZgd96kNRaGxneTeEE/eCDeCUPpetKY6lFuSN/LOMQR9IVyTUIwIXVQrt3WPIR4NF0gwQPQQ0FGQj/DQvUCYoxDDBdchWJBw5vKZo/FZZ0aiuwF40uyvuXtRuhebh/1Kek7/4yiMMU3HunxzXlBE47bik4nuMJoSPnVsf30 X-MS-TrafficTypeDiagnostic: PAXPR01MB9074:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: E7iz2FQXHcB3o0Vob2p8xuNI+45ZMsIzpmtU5d5Ce1re5wTjK3YCdiJtyZfOgAmWbZY+1db3aF6NuvR5cT037u1RF7u1Omqgroy/Mhs6NipVdKN2aUPsdtEhiK8zTqbp6HK7QF0fRHYtORYaD8+fL/znL00hp7lW//Mi8WzBQPC+rM0IEEtX7NIT09Fw6p9R1HcPfzbyc6D7knQfuyxtILv1i9u/1msqw1qfOc48dwsQJKoQGJdktvq9HqiU4ecTNDKNgJrUDAdZNwNu6Hqte75Vvdh0rgfsCKZxQSC4TH+hHDDN1tJPsgD626RDetV4sWPXUeoc62/rl9o0sYspzsb6GKbV5sImB8T5EbnSAFBg38EE68XrUek6Zzng9jfL74E7sz1KZL/qLqFmpX9W9GPTmH3puiwxkrNf1hRmYOMLXKjwTW+Cc3/ORjxlWZqKjfM6Mf66xEx5q1NznnVaszeQCDynITdmXuojPgzfUn6tIuxRY5nYEc0bGylkgnqzOhhm4bt+KztrCVMzol5CGhvJNiy8awZuFCK6ouHfoSlHQZNu3Itxsw2J9pXEKFxU9AKtBtiQZFAqT9ViqNTPp2MVwHPhBVOosUZnz1KsBMwB4wi2XFgMoUedh0F5ehyv X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?+kFFn09xS5DAL+6TkchQ/7V9j44VzdDfwljoa7ZPirWXVpIiGa06hgUrkDMO?= =?us-ascii?Q?HXABt0EwQN01uK+kBSw6O3dR0pAH0WqKGWn+ta11G2+ToKWANuc79FbATlad?= =?us-ascii?Q?22rmj9h5FWk8Q8jm0N/7NuHhVqLku9J9ON32syoguwJpg7+pFYvj5Sydu1eN?= =?us-ascii?Q?dvUoDovAlheGQ78Ag1QoggcErziCaRpf0iodw1d6j7VMYEEijS8gg9bRlkl7?= =?us-ascii?Q?57izStPWg6seEf5EHWOVqpJtC122AolQaFLZP8jgqXW2cf1FPHcSxUF6o/Gp?= =?us-ascii?Q?by3lK5S8u16l1FHg2vydpmqTAZD5ACVAt62Vru140V+pzq9kZUabeXvRri9V?= =?us-ascii?Q?G7irilxcdJdaAPnJMzLJvjxVXqd//w1/m27ca6DjOhQnS6TtjPoyXx416e7V?= =?us-ascii?Q?ANko2Z9x7ZEhViiprPuxJZ8o8bWAHk7dcdasjvUrQJkjG26fmk7g96H3XYWz?= =?us-ascii?Q?msBckpVz+/AY0dbFO29bHrwf1Ox8OtsCVg7H8kT+VjXkDzCBLMUyzUwpShXU?= =?us-ascii?Q?lXVV6YAyf2DmhAzoJlU/Z7eES+c2tmNP48c7YNv1SzLZtsFJ1bEOTsbaX+ai?= =?us-ascii?Q?9Imh24aaeFVLlT3owpM+dTGYllpQiOCxJN57vphoxu5UrUIYDMr1nXcJCmMH?= =?us-ascii?Q?JUInX6829nNkXu2wVZU4KiuwaVLtL4fbDQjYuPcflwPIEgujH2uAXjF8n7eV?= =?us-ascii?Q?HYDM1GOyHuBjajSEExwouYFfEP7oAA7mJZbiluYTZPvAtgYZDNf/Cks76Y/p?= =?us-ascii?Q?862h+0u34Gh5v9tcS2J431cYBauumRIvVH3h95W4ym/AB0iGmGIru5V4MzjC?= =?us-ascii?Q?cg6/7bLiUm2B4Ra9K+71seTKcSunUFGCdPre3eD7XazW7+uSBIoMgHXNy9UD?= =?us-ascii?Q?y4G8EOb6DknaATzmm/CoCdirHuXZ1hyfCrl7MklA2S8M91vd/dGvBAkvQBYZ?= =?us-ascii?Q?kz7kU9vSsNJuAIEMGna3I0DhGoNU6SkHSivpXTs38TCYF74hQJs4MUbZgCUH?= =?us-ascii?Q?4dX7+UYsZgCHJKL1LZT77nB0QWJoI2HpY8swDEJgOolcb+uUW7XPtOe6/sGv?= =?us-ascii?Q?Qe3lVrFT11WbiTWZREePIio4vfiLDlyi+R7TB4iN6pkbTk9Qx+sl3bQxMoy2?= =?us-ascii?Q?ZVRaparUPG8OlGwltyn2we1lufrr6rLUs2GmszqEFRDH0Kl04M5nFmnwFzDa?= =?us-ascii?Q?/OJ9ZwJJWDw3LLTxX+Aqi+e/+Rp3xYquremCA8u64aXHJxvw4hXTZVevLFAq?= =?us-ascii?Q?cLijEwLYsGgpVHTcFNldGOnwsCU/6cobVv+2nhC1CjHCecytfs3cgpS2VK7q?= =?us-ascii?Q?QnSV4pDRZIwEvvc8BfrUvVYEOpKeD50XTLDSfMYE146btbNhSVt0JdTqWQj5?= =?us-ascii?Q?gBWUbtCJdqNyXr128zQN4aTi6AoP1uwrLht6H7/hJcW/SBGGRIxNb3kEcZWB?= =?us-ascii?Q?fyrlFxrcqhKD2zxC4tEncKpNVbERUlxJR9ptmLSuRWaB0FIWGBYweQ=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0a708a2e-8171-4bfa-6234-08da532e94cf X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2022 02:34:35.9066 (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: PAXPR01MB9074 Subject: [FFmpeg-devel] [PATCH 5/6] avformat/matroskaenc: Improve handling of AV1 extradata 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: Up until now, only the first four bytes (the ones preceding the OBU) were written because not enough space has been reserved for the complete CodecPrivate. This commit changes this by increasing the space reserved for the CodecPrivate (it is big enough for every sane sequence header plus something extra); the code falls back to writing four bytes in case the increased space turns out to be insufficient. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 37 +++++++++++++------------------------ 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 250015419f..b240ca0a06 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -56,6 +56,7 @@ #include "libavutil/samplefmt.h" #include "libavutil/stereo3d.h" +#include "libavcodec/av1.h" #include "libavcodec/xiph.h" #include "libavcodec/mpeg4audio.h" @@ -1117,7 +1118,7 @@ static int mkv_assemble_native_codecprivate(AVFormatContext *s, AVIOContext *dyn return ff_isom_write_av1c(dyn_cp, extradata, extradata_size, 1); else - *size_to_reserve = 4; + *size_to_reserve = (AV1_SANE_SEQUENCE_HEADER_MAX_BITS + 7) / 8 + 100; break; #if CONFIG_MATROSKA_MUXER case AV_CODEC_ID_FLAC: @@ -1263,7 +1264,7 @@ static void mkv_put_codecprivate(AVIOContext *pb, unsigned max_payload_size, static int mkv_update_codecprivate(AVFormatContext *s, MatroskaMuxContext *mkv, uint8_t *side_data, int side_data_size, AVCodecParameters *par, AVIOContext *pb, - mkv_track *track) + mkv_track *track, unsigned alternative_size) { AVIOContext *const dyn_bc = mkv->tmp_bc; uint8_t *codecpriv; @@ -1275,9 +1276,12 @@ static int mkv_update_codecprivate(AVFormatContext *s, MatroskaMuxContext *mkv, &codecpriv, &codecpriv_size, &max_payload_size); if (ret < 0) goto fail; - if (codecpriv_size > track->codecpriv_size) { + if (codecpriv_size > track->codecpriv_size && !alternative_size) { ret = AVERROR(ENOSPC); goto fail; + } else if (codecpriv_size > track->codecpriv_size) { + av_assert1(alternative_size < track->codecpriv_size); + codecpriv_size = alternative_size; } avio_seek(pb, track->codecpriv_offset, SEEK_SET); mkv_put_codecprivate(pb, track->codecpriv_size, @@ -2702,7 +2706,7 @@ static int mkv_check_new_extra_data(AVFormatContext *s, const AVPacket *pkt) if (!output_sample_rate) output_sample_rate = track->sample_rate; // Space is already reserved, so it's this or a void element. ret = mkv_update_codecprivate(s, mkv, side_data, side_data_size, - par, mkv->track.bc, track); + par, mkv->track.bc, track, 0); if (ret < 0) return ret; avio_seek(mkv->track.bc, track->sample_rate_offset, SEEK_SET); @@ -2722,7 +2726,7 @@ static int mkv_check_new_extra_data(AVFormatContext *s, const AVPacket *pkt) return AVERROR(EINVAL); } ret = mkv_update_codecprivate(s, mkv, side_data, side_data_size, - par, mkv->track.bc, track); + par, mkv->track.bc, track, 0); if (ret < 0) return ret; } @@ -2732,27 +2736,12 @@ static int mkv_check_new_extra_data(AVFormatContext *s, const AVPacket *pkt) // See https://bugs.chromium.org/p/aomedia/issues/detail?id=2012 case AV_CODEC_ID_AV1: if (side_data_size && mkv->track.bc && !par->extradata_size) { - AVIOContext *dyn_cp; - uint8_t *codecpriv; - int codecpriv_size; - ret = avio_open_dyn_buf(&dyn_cp); - if (ret < 0) - return ret; - ff_isom_write_av1c(dyn_cp, side_data, side_data_size, 1); - codecpriv_size = avio_get_dyn_buf(dyn_cp, &codecpriv); - if ((ret = dyn_cp->error) < 0 || - !codecpriv_size && (ret = AVERROR_INVALIDDATA)) { - ffio_free_dyn_buf(&dyn_cp); - return ret; - } - avio_seek(mkv->track.bc, track->codecpriv_offset, SEEK_SET); - // Do not write the OBUs as we don't have space saved for them - put_ebml_binary(mkv->track.bc, MATROSKA_ID_CODECPRIVATE, codecpriv, 4); - ffio_free_dyn_buf(&dyn_cp); - ret = ff_alloc_extradata(par, side_data_size); + // If the reserved space doesn't suffice, only write + // the first four bytes of the av1C. + ret = mkv_update_codecprivate(s, mkv, side_data, side_data_size, + par, mkv->track.bc, track, 4); if (ret < 0) return ret; - memcpy(par->extradata, side_data, side_data_size); } else if (!par->extradata_size) return AVERROR_INVALIDDATA; break; -- 2.34.1 _______________________________________________ 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".