From patchwork Thu Apr 21 13:55:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: MCC CS X-Patchwork-Id: 35368 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp224538pzh; Thu, 21 Apr 2022 06:55:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwFmM5sdrqU6osZ1Xz/MwUt9f3IfkyzTRtBW5WeJis1qBybE14FD2P5Ak+J/ss7VyiKMYwr X-Received: by 2002:a05:6402:5191:b0:423:fa7f:f4c2 with SMTP id q17-20020a056402519100b00423fa7ff4c2mr16718116edd.9.1650549328858; Thu, 21 Apr 2022 06:55:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650549328; cv=none; d=google.com; s=arc-20160816; b=AtLBBRyzr6H3DdB4oRdbMSeAynn2a12k3/RO/2F/SeKHU0pDRuJ26nlhwOXK/oIZyD eXoEx4pHziKiUq82T7qTrBmEA0n0vCXc5ErZITWImkaQyM0gX+bUT0lyCK9K0GUuyZz5 z2rKCdLeRRTcVLd+D4c8QsmZYJSQ5IeKOQZJmRv99b61hIcHhEo+r+EvZtm/pJgGDauU WwH+OsdQciRfyJBCGZJQf8riH6FjEOFCpLmOGJ8a+LPql3TLybrPB8lJhmgqY7p3201z CAmEWGuiDi3IRGln+Xfs9CZfr09K9xBJzNc3+vWLzdA7FVCO9zj3rppzRUXg0ufAzlkl ksrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:references:in-reply-to:sensitivity:importance :date:to:from:message-id:mime-version:dkim-signature:delivered-to; bh=Rr3V0Zzupoi/lL+L8x/AqNWx4Gn6LQ+mB6dJBlulNH0=; b=Ah6Qjay/itZoGfDQ7SDdNfeKqqCnqMf/4a096LJLjzBjnUK5KJiRh4XFwyYCdLNX7v NafG6W31/CKkyiwMlsJPEoFY4I6bMV9syHHMDJ6OONRw6zgECDA2+RXuSCtACZ02igIA gb150sSVLC5CxL/N/hmELPr/wcbEo3dgy1hfpKLmX6UNLQam7fJV7mWZD1Jr1BKoeuDX R83x4a8FtHuVlc9fhDlxamjdBZWUOoQLIgdCuDl8Y26k81CJqMRiEx37NJXNVGUF6Xuu w8yrrwCXHPulEpjfK8e1E4MuwaR+J0zNL2nP8Q2nFDUatuzbrDk1KJRdpQ+egIMlGkt0 7AMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmx.net header.s=badeba3b8450 header.b=VZSipW2n; 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=NONE dis=NONE) header.from=gmx.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t12-20020a1709067c0c00b006e8c412ccc4si4347892ejo.296.2022.04.21.06.55.27; Thu, 21 Apr 2022 06:55:28 -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=@gmx.net header.s=badeba3b8450 header.b=VZSipW2n; 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=NONE dis=NONE) header.from=gmx.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EBA2168B3AD; Thu, 21 Apr 2022 16:55:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CF8A468A34B for ; Thu, 21 Apr 2022 16:55:16 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1650549316; bh=n6WlZ+eoPVMa5V0+bcV94Z9djiQbuTLT3vGeWQXYYeU=; h=X-UI-Sender-Class:From:To:Subject:Date:In-Reply-To:References; b=VZSipW2nYJesyuBkPL9Apv/r2m7sZWskN9VpeoUNogI6ajurl2dpd5gfQclSdJ+17 xzvc9BJZn3jvNsZrCdpYa6GbIkT2GbK6DZsijsd1bzt37pItjUHPuwPGvDbP9yzV1V skAnpa0944+xftmFyIvWcNi5Q39LFpbOdHAtfjRw= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [178.17.250.34] ([178.17.250.34]) by web-mail.gmx.net (3c-app-mailcom-bs05.server.lan [172.19.170.173]) (via HTTP); Thu, 21 Apr 2022 15:55:15 +0200 MIME-Version: 1.0 Message-ID: From: MCC CS To: ffmpeg-devel@ffmpeg.org Date: Thu, 21 Apr 2022 15:55:15 +0200 Importance: normal Sensitivity: Normal In-Reply-To: References: X-UI-Message-Type: mail X-Priority: 3 X-Provags-ID: V03:K1:xacJ680ty2trwD6X6mzuKQdM1j2YrJmfT4rx0+4hyh5wd+7/JnPe/cMnNy3B7i/1fNsgM 51XdMy4scbDNZTgpBWNN0ykQo5cfJTOIZTf+LclLkjEighjfRf+8syL0BLAw6sdQ1pYtaCYn6gxL jMa/DK5FiBp1sy8w5KPtaLCsXTZCiQnFX3/lTt9ETkBqbf+o3MH58UXtbydmpqepJuuVrBIhM6vT /K4Xeo9TyJzo+hSbvSUaLFIeF8gbN6f1c2HrgCxsOJVYBv4Xg/GVKVI3E8Xd352GI0c83lkAMNXN /A= X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:Jk6JTR1bjxU=:+AYEEtlrGQc7MbsaQknxW4 IZ3unQtE9hEG1yh0rVkm9mGct76rl35V/xsQ5SDclWxv0FIeNjagJ22KujENr1RbP4mTSEckh 2n9YmsG45fKMNL3Rugl7h0dCEFO0aHgoQM5bVanMhboscIe0zPlfH8Q7LUnnpqk9TvRzIh2rw NE6xr6ILLRZuJ0ssdY+d7Ur1lDPHBXwKvXe0WcNYo/BRwrAV8bkEKV12olb1EeQohUxHrH3jZ gMx8TdIqMT/SydHBEVTnLS8BHyFHMI4oSLGYLnKsH7eGqkzE7ErPrJ6p+r5HgoDlLpC2Mtx31 82GUmmoDH9RfaG3Vp462YnlovgjiGI4Y8+4hATplz8hUu/MtVd32ovbHNUgPnkEIIWFRye+0o Upi0KFkVY4yXLDFAcl1DcIAqiKkRENZnMaQ650tv7En74L7zl6mWnix3SDuobePtaXZzgn69M NC6D4KcYawUmjx46y9mzPWnrBMFlB3b81dcopHbX1vbW4g+tIKm0d1dPcbHxQIJDVhdIomnWC tpiYDiS13ecQrIyriFkA93zM7E5RtEGBZLRWjjW3zDs8ICzoVRlnD9vUNc9iM9L32KoFEoRGj 000a9e9Sa6EJkZbasGg3f9AogA72BMfcixXZxYJT8peD/i4NCtnaS9VrmDr0NZzOg1aNW3Hpn I1uAqotzLUQlr1Gq2kUhYSrQGIAO/Zu+gFHeRNL6uDTWjUdyPTigi7dfZ8J+HG535uOvy7GeG Ty5r2OI4aRBQC7ao57nkeM3dyzaz1GHEytSEAi4GI/2XaITOP+Rlj6kJ0YlbyPM5gUPT3U4Ou qjzm96h Subject: [FFmpeg-devel] 2nd ping 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: E+8Kdjc2z1aE It would be great if anyone who reads this could review this small patch (original: https://ffmpeg.org/pipermail/ffmpeg-devel/2022-April/295351.html): This is a repost of the patch by Chris Snowhill who originally sent this patch on 31 December - which didn't receive any replies. As you can see on https://trac.ffmpeg.org/ticket/9564 the patch is needed and works perfectly. I have rebased it and recompiled it. Original commit description: Monterey needs mBytesPerFrame and mBytesPerPacket to be set, and I'm surprised this didn't break any previous system versions. Fixes bug #9564: Cannot decode xHE-AAC with audiotoolbox (aac_at) on Mac OS Monterey. Fixes likely bug that none of the AudioToolbox decoders work on Monterey. --- libavcodec/audiotoolboxdec.c | 5 +++++ 1 file changed, 5 insertions(+) -- 2.35.1 diff --git a/libavcodec/audiotoolboxdec.c b/libavcodec/audiotoolboxdec.c index b8d0e868f7..daccf4abf8 100644 --- a/libavcodec/audiotoolboxdec.c +++ b/libavcodec/audiotoolboxdec.c @@ -375,6 +375,11 @@ static av_cold int ffat_create_decoder(AVCodecContext *avctx, avctx->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; avctx->ch_layout.nb_channels = out_format.mChannelsPerFrame = in_format.mChannelsPerFrame; + out_format.mBytesPerFrame = + out_format.mChannelsPerFrame * (out_format.mBitsPerChannel / 8); + out_format.mBytesPerPacket = + out_format.mBytesPerFrame * out_format.mFramesPerPacket; + if (avctx->codec_id == AV_CODEC_ID_ADPCM_IMA_QT) in_format.mFramesPerPacket = 64;