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 DB1A3494F8 for ; Mon, 12 Feb 2024 10:53:33 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E338068D139; Mon, 12 Feb 2024 12:53:31 +0200 (EET) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01olkn2093.outbound.protection.outlook.com [40.92.64.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0EF9A68CF92 for ; Mon, 12 Feb 2024 12:53:25 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AwSPQFtE8sN1PoGwSI3Opqu2OPBju4Ryju3hKyf/IWsJL0+g6oF1hRu29o2SPci3e9COalTe+W9kozY5tK2c/Kicai3GI+V/MnSSekVObN6nGAe6wP0pB3IA72Ia8rgCsBdDA4vJGAZN7ccf/DcgXIuKjTPLgmuAxnCkNQzgiVUd5xiddQw9VXMZ3PKRXvOlOQzi2tgB2uuVUdIz7c4u0PIkyTUz7VmGEUCfgFvYojN52cJcuMa3ZKlrMJMBWRcNuuuE+n76ILN5lWu4dmXEwsbKcyEL/BgYkeAqXvIRvG3/dM5GQyUNidquN/YSWXgMBxRb2dPoE2u2u0LTEYMqrw== 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=Jr01PjWUY4YYdNbvLAym2Op6g6LlXCIOfYAAYYrBMb0=; b=QT2vsSlKQ9N5Qey7ZvZZdCGVImMAWLidiSomkuDdnk+NXynyF3y2V/Q3uVWaYGKf7ZvddAb2WcL5VN6KR5OdvO6jUFbgEIClAQQK/VPFkpcHb1PBQK40viQtNkxTqUetc7nEcstvFzrs8lWQ0S9Nrr6k4ZCaX0dAAqcRhv+qzNfnOaKUYvwS5azUClWHfpEt10puG9vEkvPgvAGRM7Wxb5OzSyWstFdP7xCwIBpSu2KjPaQuvtDzxEIlRVkXktGnI0WBs9R7ML1cU82cQNz88j6NlzsQBsyFceH2iseMnKjDvkzHQkpDtiuCr5T6RxPtEbCGJs+TI7VjyoFR6tJ3bg== 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=Jr01PjWUY4YYdNbvLAym2Op6g6LlXCIOfYAAYYrBMb0=; b=Omw88U+BGP1KzejOQg3OMZAdizTnTB1+o7b0UNO/gnlEUBz3tp2U/JBoooyf6oIyjJ6tO67P4ORQipQ8xMw2iL6iBcxLGYHGR8jkSHs9wlZD9Q/9cAe1KTajPZtZcysyR/0eSRyNxF50sxYfKmQVV4pDm9uRiGyryAfIe27RcAjxiCYFX9/i0qLxtsKAS9pZZ/mNQ6omoT9Bccq4IH1eZr13D83oE0kzEumnhSKhG5OX53DdEVWgNiy5cyylkbG/HhsVdA6PkFN9wx0uulnp0TvewR3CbgWnFZxqrzweBTDALFLb6dTgkL6DZhTp2KXuQt52hwaLixnrG/EtUvDCag== Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) by PAXP250MB0423.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:288::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.32; Mon, 12 Feb 2024 10:53:21 +0000 Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::db07:87f6:7c75:38cc]) by DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::db07:87f6:7c75:38cc%3]) with mapi id 15.20.7270.036; Mon, 12 Feb 2024 10:53:21 +0000 Message-ID: Date: Mon, 12 Feb 2024 11:55:14 +0100 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: X-TMN: [85w1UnpHJGovHkkUS5I9qmRarw6agBni3FUonF6DibI=] X-ClientProxiedBy: ZR0P278CA0005.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::15) To DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0P250MB0747:EE_|PAXP250MB0423:EE_ X-MS-Office365-Filtering-Correlation-Id: a656b357-5604-409f-8a01-08dc2bb8d31b X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnqgSBg2hFQ8Wwf9M/xr7LaV2UoTjUx/bGmDyiFrI+0VqmALMh1XEae4ucuH9AzdVViaea+CrJLBHJUuuTcsrm0IYYp9WcjuyiibNCkUrqQgqJFtS0GPZJJhVYN90kLCikru6FcuhRClS23nfvqtG4Zk8ce8w0+xbZBRwdukUMCm4jpukY7PyVM6HE3WTX7jMyxVIttvwXonSSPBbAq7ETh+JCAkARpJIVf2SeK3dX7MscwCn2RbOLoZT4kfb60MXauplisTsflSmuOnJDRJJOUq8fHGKx5s6VKNeq5eEyRFeSKulItEJAvGRtKzYgQKPaS+zNoa2zyotxjo16plbxBEzou2EbST6KjaG9hCU76Yl+4IOky3zWmnzPojjbXH03oXGJxMdsk+L/aXJ5sppQo/UhU2Ngqglhkfw73yRQSbTWMbR4OhFa1TpEI6CLcHpNWsXDxbWISDEZZ8AsLGLcOJIrPDYgRm/khIn8EJ0uMSq1tgZElV3s1HkllYq1h0YgSmpdWiY06jFUzXR/ytnF/mVm7/0wJ4rT4e2fwfcluHf1DKFEjFBNiUq50Skzx3LChwFQoLmSlSrfLKz2GYP96MMB/DbMPRhkoMvVdY5kPxASBHaUwiOYYFIJRGNX9jB5mNR+XqE0JxDngtC3w5M/n1nKlmhrn2yTdRokGdA6jV7PMhWyAnOG9ds+Z1VuqEbprlVmPfGwmxtye77ci5hbQE5O8rbRZlnNyACdfVRcWGQ5Y6mZva/bpSlEqXTDYRkT0= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 48BchO+jj6aBoCNTgEoQmawU+Qz6XN0bCVuIUWtcKW7Yybexif+HzRZFh3ZKP6ALM+GWiMSENnMuBy6Z4WEwT52Nf+aE17ZfO8q5qIXE9assB/LfN/wHBb+DwNNqfsuj7CSPw5KXPo+oA5AeaUr7voSVLv1b/MtZK+PjSFIqvW1PDp9+P72eE64DXpI1D5IQQNw3awx+OFSHU4Ms/tQcwObrA/SM+K3v/Y1R8YfBI+l/MyFJzGfRz2saxgsMucw7egfB/ylZ/muVafgcd2l62L5Ha7ZyjQ560syp7N98bgBhYnvKIWWa5OiUrWiYvIhTzxLZAtMH+wxbOZiJakTI6iVn/IiHanRMxSeC69vaHpGi/ZtsQw1ARRz8cjQPqho6zsrEX546sKGQ7Ycpe9q4rGZ8WlHvBV1hp8GgiTGcAS2MvnSMbALpEkZmiMp2bS3QHyfeifdiKA+BBE8lSKHvFvft8iKhCTISPCD6ZTSO592RsqjHb6KbH6jnbr6lWULXoVaCjGT4WOQ7oQwqAZ8vp7QC9FCsUGEQGs8anQlYYC+Bi75rvGB0Y943TxgoE5gN X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZmwwOEdRSjA4Qk9vcWpScU9zWTE0MHpqeGlERWwvbEZlNWMxTjJmd2JLcWJR?= =?utf-8?B?K0NUek43NWdDV29YWU80aHIvWm1FOXoyYlVMN2NpNi9lYktsMlZrZDZxNnpC?= =?utf-8?B?WGYwMWw3RlVueE9XU29TYmtPMUorUytzSlhBako1SXJPYVM5Yk9uR1JDcncy?= =?utf-8?B?aVdTejNwOFJVbmxkSmdrL3huMmx0UmZoM05GdTRYNU5qR0xsWXVjTm5pVE12?= =?utf-8?B?azlCdHdKSUx6WGQyaHdkS0NvVTY1cGI5NUpGMzVuOThmblhlbzVoWVAzcHBC?= =?utf-8?B?Mjl0VmoyNmJoMytLakN2NWlLdlZPN21aU21PYWtiQXREd0k5aksvTjluVWtD?= =?utf-8?B?c0RpTmpHaFdUc2MzdWM2YUIxaWwxVkZhbzluTDJqT1pqVm9GSThjNjNieml1?= =?utf-8?B?eVBFZkVxV04wNGxuWDlvb2g0SHMxd0twcG0xVENJMUtHeEl3VnhsSmdTNkJE?= =?utf-8?B?UWt0QWJWSkRUL2huREpaNkZyYVdGS01WMnkzMkdRSkxENkFBSmh4OFMzTFBp?= =?utf-8?B?VGpwek5MakY0VHZ2ek1JZjlnMy90M1N0U0NIbGlXOHhvb0FxWFF4RmxOaEtz?= =?utf-8?B?U25XZGZ4MEZoS05BMjlnMU4rRVhaUVkwcHhtNk9mT2ZKYndtVFArS3RsRzVa?= =?utf-8?B?Wjdqd0crRDlTWlBZN2l3MFE0c0cwK2UzV2FkN25CZ3VCU0dXeHdMc2NUeTZP?= =?utf-8?B?cFl0aHkzTTdqZ0NCWlZMbnYzZXR0THJVTzdOamFROXNsL1U4WEd4blZQMDhF?= =?utf-8?B?eTVUdzBoUWNIQ214QmR0K3lhNVNJN2pLZWY5YS80VVVKRmplaU5qc2lTamVX?= =?utf-8?B?Rm1uZ0x2eHJIY2pSckZ6T2lwQXl3dWJPdDhDbEU4ZWhHSkxsSkowcSs2dklU?= =?utf-8?B?Yk5CNjdBaXQ0M1VDT0ZPc1dGTWdzZ1QzVm5kekY3WXdsNzFSeWJrUmxHTURI?= =?utf-8?B?OHJpS05BSnhYWGRCMGRrNEp6cVR3QUthbkJKSEpveFlSY0ZCMk1IYitid25j?= =?utf-8?B?MTNSVlUyNzV6R01BY2pmT0x1YnpmUjBIYzVUa0k1U2xkYmNzcHJ0QStKUDZH?= =?utf-8?B?UHJYRVZMMFpZVE5xZ2ZXSkhGdk1ZS2ppS091bVZVSU1sLzF3THExeFVDNU5H?= =?utf-8?B?RzMrWmhNK3E3UkhoM3VHWVNWK2UxanI2YVlMZCsrM2UyeFBtYnhOS01ra0Fq?= =?utf-8?B?VDRtRlhybFRuM0orWGhvbUkvb21sZ25IbTdDeG1IYmtzK2lvYXFOc2JldDhZ?= =?utf-8?B?b3pna1lrcmI4Z2ttSHFPcDA1Q0xWNWdNbEFZZis4QTJ3OEJhS2dpOXEzRldz?= =?utf-8?B?OWliYmI1RE4yaFlQSWxsY296MmdXV1FpMStYTGZhZC9hSXY1YW42YTB0MTNw?= =?utf-8?B?dmFzcGNNTkIrV05NN2JOWDhzNFc0NHFBZS9FU0pwbloxQ3FHaDRSTTFPdUc0?= =?utf-8?B?QStLU0dTcXZLd2VoZWRybi9XUUF4dkwveUdiTXJEMCtEMnpCcGVqdFFsM2FV?= =?utf-8?B?OEhVcU1RczVPck10UHhCb2FJdG1XSUlSN1VPV3U3SnIvYlRqdC9XaEpjaVRT?= =?utf-8?B?T253Uks3cWlSNmRyalMwOHdIQmZuTlF4dVJldXR6UklQaGNvTmE3M0FlMEd5?= =?utf-8?B?U0xOaGZVeDEyak90QTljbk0vczFKdmtzUG9seGJ6VHljVnh2RXEvUDBVOVVW?= =?utf-8?B?MFl3U0VLeFhoRnZmVitMRDBrZi9BeG1BNXdBQnBNRk5oME9TTTR1YVRRPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a656b357-5604-409f-8a01-08dc2bb8d31b X-MS-Exchange-CrossTenant-AuthSource: DU0P250MB0747.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2024 10:53:20.9309 (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: PAXP250MB0423 Subject: Re: [FFmpeg-devel] [PATCH] avformat/matroska: Add support for A_ATRAC/AT1 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: asivery via ffmpeg-devel: > I apologize for not having responded earlier. > I've attached the updated patch. > > > From 68c77320954e44a7f02e95537fc9a6436da7549c Mon Sep 17 00:00:00 2001 > From: asivery > Date: Sun, 11 Feb 2024 23:13:07 +0100 > Subject: [PATCH] avformat/matroska: Add support for A_ATRAC/AT1 > > Signed-off-by: asivery > --- Send your patch either via git send-email or as an attachment; if you have comments for your patch (that are not supposed to be part of the eventual commit and not its commit message), then put them here, in between the --- and the affected files. > libavformat/matroska.c | 1 + > libavformat/matroskadec.c | 8 ++++++++ > libavformat/matroskaenc.c | 1 + > 3 files changed, 10 insertions(+) > > diff --git a/libavformat/matroska.c b/libavformat/matroska.c > index 5878594e68..ae9ecc8207 100644 > --- a/libavformat/matroska.c > +++ b/libavformat/matroska.c > @@ -53,6 +53,7 @@ const CodecTags ff_mkv_codec_tags[]={ > {"A_REAL/ATRC" , AV_CODEC_ID_ATRAC3}, > {"A_REAL/COOK" , AV_CODEC_ID_COOK}, > {"A_REAL/SIPR" , AV_CODEC_ID_SIPR}, > + {"A_ATRAC/AT1" , AV_CODEC_ID_ATRAC1}, This audio part of this list is ordered by the Matroska CodecID (i.e. the string on the left). Please keep it that way. > {"A_TRUEHD" , AV_CODEC_ID_TRUEHD}, > {"A_TTA1" , AV_CODEC_ID_TTA}, > {"A_VORBIS" , AV_CODEC_ID_VORBIS}, > diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c > index 8f000f86be..1bb6e8605a 100644 > --- a/libavformat/matroskadec.c > +++ b/libavformat/matroskadec.c > @@ -2779,6 +2779,14 @@ static int mka_parse_audio_codec(MatroskaTrack *track, AVCodecParameters *par, > return AVERROR(ENOMEM); > break; > } > + case AV_CODEC_ID_ATRAC1: > + /* ATRAC1 uses a constant frame size. > + * Typical ATRAC1 streams are either mono or stereo. > + * At most, ATRAC1 was used to store 8 channels of audio. */ > + if (track->audio.channels > 8) > + return AVERROR_INVALIDDATA; > + par->block_align = track->audio.channels * 212; > + break; > case AV_CODEC_ID_FLAC: > if (track->codec_priv.size) { > ret = matroska_parse_flac(s, track, extradata_offset); > diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c > index 1457a6890c..aa25657f8f 100644 > --- a/libavformat/matroskaenc.c > +++ b/libavformat/matroskaenc.c > @@ -3483,6 +3483,7 @@ static const AVCodecTag additional_audio_tags[] = { > { AV_CODEC_ID_QDM2, 0xFFFFFFFF }, > { AV_CODEC_ID_RA_144, 0xFFFFFFFF }, > { AV_CODEC_ID_TRUEHD, 0xFFFFFFFF }, > + { AV_CODEC_ID_ATRAC1, 0xFFFFFFFF }, Please keep this list sorted alphabetically. > { AV_CODEC_ID_NONE, 0xFFFFFFFF } > }; > _______________________________________________ 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".